Drop monkey patch that is no longer required
This commit is contained in:
parent
87581f87b6
commit
1ba10fa9ac
3 changed files with 3 additions and 12 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue