diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 13 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 18 | ||||
| -rw-r--r-- | activerecord/test/migration_test.rb | 8 |
3 files changed, 28 insertions, 11 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 4c32d8c207..acfae5c82c 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,18 @@ *SVN* +* Migrations: uniquely name multicolumn indexes so you don't have to. [Jeremy Kemper] + # people_active_last_name_index, people_active_deactivated_at_index + add_index :people, [:active, :last_name] + add_index :people, [:active, :deactivated_at] + remove_index :people, [:active, :last_name] + remove_index :people, [:active, :deactivated_at] + + WARNING: backward-incompatibility. Multicolumn indexes created before this + revision were named using the first column name only. Now they're uniquely + named using all indexed columns. + + To remove an old multicolumn index, remove_index :table_name, :first_column + * Fix for deep includes on the same association. [richcollins@gmail.com] * Tweak fixtures so they don't try to use a non-ActiveRecord class. [Kevin Clark] diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb index cd13e264a1..b7f835e747 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -178,14 +178,14 @@ module ActiveRecord # ====== Creating a unique index # add_index(:accounts, [:branch_id, :party_id], :unique => true) # generates - # CREATE UNIQUE INDEX accounts_branch_id_index ON accounts(branch_id, party_id) + # CREATE UNIQUE INDEX accounts_branch_id_party_id_index ON accounts(branch_id, party_id) # ====== Creating a named index # add_index(:accounts, [:branch_id, :party_id], :unique => true, :name => 'by_branch_party') # generates # CREATE UNIQUE INDEX by_branch_party ON accounts(branch_id, party_id) def add_index(table_name, column_name, options = {}) column_names = Array(column_name) - index_name = index_name(table_name, :column => column_names.first) + index_name = index_name(table_name, :column => column_names) if Hash === options # legacy support, since this param was a string index_type = options[:unique] ? "UNIQUE" : "" @@ -199,16 +199,14 @@ module ActiveRecord # Remove the given index from the table. # - # Remove the suppliers_name_index in the suppliers table (legacy support, use the second or third forms). + # Remove the suppliers_name_index in the suppliers table. # remove_index :suppliers, :name - # Remove the index named accounts_branch_id in the accounts table. + # Remove the index named accounts_branch_id_index in the accounts table. # remove_index :accounts, :column => :branch_id + # Remove the index named accounts_branch_id_party_id_index in the accounts table. + # remove_index :accounts, :column => [:branch_id, :party_id] # Remove the index named by_branch_party in the accounts table. # remove_index :accounts, :name => :by_branch_party - # - # You can remove an index on multiple columns by specifying the first column. - # add_index :accounts, [:username, :password] - # remove_index :accounts, :username def remove_index(table_name, options = {}) execute "DROP INDEX #{quote_column_name(index_name(table_name, options))} ON #{table_name}" end @@ -216,14 +214,14 @@ module ActiveRecord def index_name(table_name, options) #:nodoc: if Hash === options # legacy support if options[:column] - "#{table_name}_#{options[:column]}_index" + "#{table_name}_#{Array(options[:column]).join('_')}_index" elsif options[:name] options[:name] else raise ArgumentError, "You must specify the index name" end else - "#{table_name}_#{options}_index" + index_name(table_name, :column => options) end end diff --git a/activerecord/test/migration_test.rb b/activerecord/test/migration_test.rb index 649ee54439..b0cb34d938 100644 --- a/activerecord/test/migration_test.rb +++ b/activerecord/test/migration_test.rb @@ -58,7 +58,13 @@ if ActiveRecord::Base.connection.supports_migrations? assert_nothing_raised { Person.connection.remove_index("people", "last_name") } assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) } - assert_nothing_raised { Person.connection.remove_index("people", "last_name") } + assert_nothing_raised { Person.connection.remove_index("people", :column => ["last_name", "first_name"]) } + assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) } + assert_nothing_raised { Person.connection.remove_index("people", :name => "people_last_name_first_name_index") } + assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) } + assert_nothing_raised { Person.connection.remove_index("people", "last_name_first_name") } + assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) } + assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) } # quoting # Note: changed index name from "key" to "key_idx" since "key" is a Firebird reserved word |