From 1ba10fa9ac6a422a0af9ece42a58bfd6ce28ac62 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 10 May 2021 09:50:41 +0100 Subject: [PATCH] Drop monkey patch that is no longer required --- config/initializers/migrate.rb | 9 --------- db/migrate/20111212183945_add_lowercase_user_indexes.rb | 4 ++-- .../20140115192822_add_text_index_to_note_comments.rb | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/config/initializers/migrate.rb b/config/initializers/migrate.rb index 787f3d551..add6aaea9 100644 --- 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 df6a48c16..b2c7f6fb1 100644 --- 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 1c30450ef..2dadfee98 100644 --- 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 -- 2.39.5