From c14f4dc31c79f3573d24d760a87b190016e2ce87 Mon Sep 17 00:00:00 2001 From: Ahmad Farhat Date: Thu, 10 Oct 2019 15:17:52 -0400 Subject: [PATCH] Fixed issue with migration running on empty db (#812) --- app/models/concerns/deleteable.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/deleteable.rb b/app/models/concerns/deleteable.rb index a13985c9..c74a7aa1 100644 --- a/app/models/concerns/deleteable.rb +++ b/app/models/concerns/deleteable.rb @@ -20,8 +20,8 @@ module Deleteable extend ActiveSupport::Concern included do - # By default don't include deleted - default_scope { where(deleted: false) } + # By default don't include deleted if the column has been created + default_scope { where(deleted: false) } if column_names.include? 'deleted' scope :include_deleted, -> { unscope(where: :deleted) } scope :deleted, -> { include_deleted.where(deleted: true) } end