Migration keep :deleted_on as the only only source of truth for disco…

…nnect

Migration keep :deleted_on as the only only source of truth for disconnect

db/migrate/20170530102506_add_deleted_to_containers_tables.rb

@@ -1,25 +1,14 @@
 class AddDeletedToContainersTables < ActiveRecord::Migration[5.0]
   def change
-    add_column :container_definitions, :deleted, :boolean, :default => false, :null => false
-    add_column :container_groups, :deleted, :boolean, :default => false, :null => false
-    add_column :container_images, :deleted, :boolean, :default => false, :null => false
-    add_column :container_projects, :deleted, :boolean, :default => false, :null => false
-    add_column :containers, :deleted, :boolean, :default => false, :null => false
-
-    add_index :container_definitions, :deleted,
-              :name  => "index_container_definitions_on_deleted_false",
-              :where => "NOT deleted"
-    add_index :container_groups, :deleted,
-              :name  => "container_groups_on_deleted_false",
-              :where => "NOT deleted"
-    add_index :container_images, :deleted,
-              :name  => "index_container_images_on_deleted_false",
-              :where => "NOT deleted"
-    add_index :container_projects, :deleted,
-              :name  => "index_container_projects_on_deleted_false",
-              :where => "NOT deleted"
-    add_index :containers, :deleted,
-              :name  => "index_containers_on_deleted_false",
-              :where => "NOT deleted"
+    add_index :container_definitions, :deleted_on,
+              :name  => "index_container_definitions_on_deleted_on"
+    add_index :container_groups, :deleted_on,
+              :name  => "container_groups_on_deleted_on"
+    add_index :container_images, :deleted_on,
+              :name  => "index_container_images_on_deleted_on"
+    add_index :container_projects, :deleted_on,
+              :name  => "index_container_projects_on_deleted_on"
+    add_index :containers, :deleted_on,
+              :name  => "index_containers_on_deleted_on"
   end
 end

db/migrate/20170530102536_use_deleted_in_containers_tables.rb

@@ -14,11 +14,11 @@ class Container < ActiveRecord::Base
   end
 
   def disconnect_to_soft_delete(model)
-    model.where(:ems_id => nil).update_all("ems_id = old_ems_id, deleted = 't'")
+    model.where.not(:deleted_on => nil).update_all("ems_id = old_ems_id")
   end
 
   def soft_delete_to_disconnect(model)
-    model.where(:deleted => true).update_all(:ems_id => nil, :deleted => false)
+    model.where.not(:deleted_on => nil).update_all(:ems_id => nil)
   end
 
   def up