2 files changed, 6 insertions, 4 deletions
diff --git a/db/migrate/051_add_track_things_unique_indices.rb b/db/migrate/051_add_track_things_unique_indices.rb
index 77bd3ce13..d8810b670 100644
--- a/db/migrate/051_add_track_things_unique_indices.rb
+++ b/db/migrate/051_add_track_things_unique_indices.rb
@@ -1,11 +1,15 @@
 class AddTrackThingsUniqueIndices < ActiveRecord::Migration
     def self.up
         add_index :track_things, [:tracking_user_id, :track_query], :unique => true
-        execute "create unique index track_things_sent_emails_unique_index on track_things_sent_emails(track_thing_id, coalesce(info_request_event_id, -1), coalesce(user_id, -1), coalesce(public_body_id, -1))"
+        # GRRR - this index confuses Rails migrations, and it makes part of the index but not all
+        # of it for the schema.rb, and hence in test databases, and the test databases fail.
+        # I guess the query in ./activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+        # needs improving to not detect indices with complex components, rather than detect part of them.
+        #execute "create unique index track_things_sent_emails_unique_index on track_things_sent_emails(track_thing_id, coalesce(info_request_event_id, -1), coalesce(user_id, -1), coalesce(public_body_id, -1))"
     end
 
     def self.down
         remove_index :track_things, [:tracking_user_id, :track_query]
-        execute "drop index track_things_sent_emails_unique_index"
+        #execute "drop index track_things_sent_emails_unique_index"
     end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 3a8433f47..5e1982b16 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -140,8 +140,6 @@ ActiveRecord::Schema.define(:version => 51) do
     t.datetime "updated_at"
   end
 
-  add_index "track_things_sent_emails", ["track_thing_id"], :name => "track_things_sent_emails_unique_index", :unique => true
-
   create_table "user_info_request_sent_alerts", :force => true do |t|
     t.integer "user_id",               :null => false
     t.integer "info_request_id",       :null => false