Merge branch 'master' into 5383-api-db-current-time

[arvados.git] / services / api / db / migrate / 20150216193428_collection_name_owner_unique_only_non_expired.rb

diff --git a/services/api/db/migrate/20150216193428_collection_name_owner_unique_only_non_expired.rb b/services/api/db/migrate/20150216193428_collection_name_owner_unique_only_non_expired.rb
index 92856882d4cb3ecba2b5620b8232a0294fefbb91..d2c629a2c783289917beba9c9ddf0a879f32aa29 100644 (file)
--- a/services/api/db/migrate/20150216193428_collection_name_owner_unique_only_non_expired.rb
+++ b/services/api/db/migrate/20150216193428_collection_name_owner_unique_only_non_expired.rb
@@ -17,8 +17,7 @@ class CollectionNameOwnerUniqueOnlyNonExpired < ActiveRecord::Migration
   def down
     # it failed during up. is it going to pass now? should we do nothing?
     remove_index :collections, :name => 'collection_owner_uuid_name_unique' if !find_index.empty?
-    # and this is failing ...
-    # add_index(:collections, [:owner_uuid, :name], unique: true,
-    #          name: 'collection_owner_uuid_name_unique')
+    add_index(:collections, [:owner_uuid, :name], unique: true,
+              name: 'collection_owner_uuid_name_unique')
   end
 end