Merge branch 'master' into 3686-sharing-repositories

[arvados.git] / services / api / db / migrate / 20141208164553_owner_uuid_index.rb

diff --git a/services/api/db/migrate/20141208164553_owner_uuid_index.rb b/services/api/db/migrate/20141208164553_owner_uuid_index.rb
index 0859d4681801ac3acbe427f2cbc6b1a1263e3091..e7e38b0716eba4b002f6ac3dcb1bb7db6800dfce 100644 (file)
--- a/services/api/db/migrate/20141208164553_owner_uuid_index.rb
+++ b/services/api/db/migrate/20141208164553_owner_uuid_index.rb
@@ -1,9 +1,9 @@
 class OwnerUuidIndex < ActiveRecord::Migration
   def tables_with_owner_uuid
-    ActiveRecord::Base.connection.tables.select do |table|
-      columns = ActiveRecord::Base.connection.columns(table)
-      columns.collect(&:name).include? 'owner_uuid'
-    end
+    %w{api_clients authorized_keys collections groups humans
+       job_tasks jobs keep_disks keep_services links logs
+       nodes pipeline_instances pipeline_templates repositories
+       specimens traits users virtual_machines}
   end
 
   def up
@@ -14,7 +14,13 @@ class OwnerUuidIndex < ActiveRecord::Migration
 
   def down
     tables_with_owner_uuid.each do |table|
-      remove_index table.to_sym, :owner_uuid
+      indexes = ActiveRecord::Base.connection.indexes(table)
+      owner_uuid_index = indexes.select do |index|
+        index.columns == ['owner_uuid']
+      end
+      if !owner_uuid_index.empty?
+        remove_index table.to_sym, :owner_uuid
+      end
     end
   end
 end