diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2016-08-16 05:08:06 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-16 05:08:06 -0300 |
commit | 3e9070e645147b1a73013633002d27002b3a1f4f (patch) | |
tree | 7fb47dde8d111b53ae32661788bc617f16437b82 /activerecord/lib/active_record/connection_adapters | |
parent | 3fc0bbf008f0e935ab56559f119c9ea8250bfddd (diff) | |
parent | 9b3f32914af3c419c6869b2adb038b4d248be928 (diff) | |
download | rails-3e9070e645147b1a73013633002d27002b3a1f4f.tar.gz rails-3e9070e645147b1a73013633002d27002b3a1f4f.tar.bz2 rails-3e9070e645147b1a73013633002d27002b3a1f4f.zip |
Merge pull request #26019 from agrobbin/schema-load-unique-column-indices
Support multiple indexes on the same column when loading the schema
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 4 | ||||
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index c10f45937e..c636563e99 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -211,7 +211,7 @@ module ActiveRecord def initialize(name, temporary = false, options = nil, as = nil, comment: nil) @columns_hash = {} - @indexes = {} + @indexes = [] @foreign_keys = [] @primary_keys = nil @temporary = temporary @@ -327,7 +327,7 @@ module ActiveRecord # # index(:account_id, name: 'index_projects_on_account_id') def index(column_name, options = {}) - indexes[column_name] = options + indexes << [column_name, options] end def foreign_key(table_name, options = {}) # :nodoc: 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 af7ac1eeac..da99d00671 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -278,7 +278,7 @@ module ActiveRecord result = execute schema_creation.accept td unless supports_indexes_in_create? - td.indexes.each_pair do |column_name, index_options| + td.indexes.each do |column_name, index_options| add_index(table_name, column_name, index_options) end end |