github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix remove_index issue when provided :name is a symbol

Browse Source 
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
This commit is contained in:
Tim Connor
2010-09-27 11:56:18 +13:00
committed by Santiago Pastorino
parent 56de4e9a80
commit d6f7b7d353
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
View File

@@ -404,7 +404,7 @@ module ActiveRecord
# as there's no way to determine the correct answer in that case.
def index_name_exists?(table_name, index_name, default)
return default unless respond_to?(:indexes)
indexes(table_name).detect { |i| i.name == index_name }
indexes(table_name).detect { |i| i.name == index_name.to_s }
end
# Returns a string of <tt>CREATE TABLE</tt> SQL statement(s) for recreating the

2
activerecord/test/cases/migration_test.rb
View File

@@ -91,7 +91,7 @@ if ActiveRecord::Base.connection.supports_migrations?
# Oracle adapter is shortening index name when just column list is given
unless current_adapter?(:OracleAdapter)
assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
assert_nothing_raised { Person.connection.remove_index("people", :name => "index_people_on_last_name_and_first_name") }
assert_nothing_raised { Person.connection.remove_index("people", :name => :index_people_on_last_name_and_first_name) }
assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
assert_nothing_raised { Person.connection.remove_index("people", "last_name_and_first_name") }
end