Fixed issue with migration running on empty db (bigbluebutton#812)

springviet · Oct 10, 2019 · c14f4dc · c14f4dc
1 parent 4a791ae
commit c14f4dc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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