Drop monkey patch that is no longer required

diff --git a/config/initializers/migrate.rb b/config/initializers/migrate.rb
index 787f3d551d58426f77307a76f109deea041c9631..add6aaea9cc76b3feed4c285fbbfc62f09985c3a 100644 (file)
--- a/config/initializers/migrate.rb
+++ b/config/initializers/migrate.rb
@@ -1,14 +1,6 @@
 if defined?(ActiveRecord::ConnectionAdapters::AbstractAdapter)
   module OpenStreetMap
     module ActiveRecord
-      module AbstractAdapter
-        def add_index_options(table_name, column_name, options = {})
-          columns = options.delete(:columns)
-          index_name, index_type, index_columns, index_options, algorithm, using = super(table_name, column_name, options)
-          [index_name, index_type, columns || index_columns, index_options, algorithm, using]
-        end
-      end
-
       module PostgreSQLAdapter
         def quote_column_name(name)
           Array(name).map { |n| super(n) }.join(", ")
@@ -54,6 +46,5 @@ if defined?(ActiveRecord::ConnectionAdapters::AbstractAdapter)
     end
   end
 
-  ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(OpenStreetMap::ActiveRecord::AbstractAdapter)
   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(OpenStreetMap::ActiveRecord::PostgreSQLAdapter)
 end

diff --git a/db/migrate/20111212183945_add_lowercase_user_indexes.rb b/db/migrate/20111212183945_add_lowercase_user_indexes.rb
index df6a48c16beac5eae3f91d8de4ec8681ddffac15..b2c7f6fb179e7a5d45de986883ba8641a827e026 100644 (file)
--- a/db/migrate/20111212183945_add_lowercase_user_indexes.rb
+++ b/db/migrate/20111212183945_add_lowercase_user_indexes.rb
@@ -1,7 +1,7 @@
 class AddLowercaseUserIndexes < ActiveRecord::Migration[4.2]
   def up
-    add_index :users, [], :columns => "LOWER(display_name)", :name => "users_display_name_lower_idx"
-    add_index :users, [], :columns => "LOWER(email)", :name => "users_email_lower_idx"
+    add_index :users, "LOWER(display_name)", :name => "users_display_name_lower_idx"
+    add_index :users, "LOWER(email)", :name => "users_email_lower_idx"
   end
 
   def down

diff --git a/db/migrate/20140115192822_add_text_index_to_note_comments.rb b/db/migrate/20140115192822_add_text_index_to_note_comments.rb
index 1c30450ef6dbbb8c2059b644503ab357efbfe815..2dadfee98d3fbfbadcbfcbaef21b54c36c1d604a 100644 (file)
--- a/db/migrate/20140115192822_add_text_index_to_note_comments.rb
+++ b/db/migrate/20140115192822_add_text_index_to_note_comments.rb
@@ -1,6 +1,6 @@
 class AddTextIndexToNoteComments < ActiveRecord::Migration[4.2]
   def up
-    add_index :note_comments, [], :columns => "to_tsvector('english', body)", :using => "GIN", :name => "index_note_comments_on_body"
+    add_index :note_comments, "to_tsvector('english', body)", :using => "GIN", :name => "index_note_comments_on_body"
   end
 
   def down