diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-03-16 15:17:32 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-03-22 16:22:00 -0700 |
| commit | f84cf418f607c69d3e71fc6e7a161d224fc7fb86 (patch) | |
| tree | c160d530ecb624f7ff890ce5a9056a2703b719a7 /activerecord/lib/active_record/connection_adapters | |
| parent | d43edf6718e4b0fe2eb144adc6c2c39f15fcd92f (diff) | |
| download | rails-f84cf418f607c69d3e71fc6e7a161d224fc7fb86.tar.gz rails-f84cf418f607c69d3e71fc6e7a161d224fc7fb86.tar.bz2 rails-f84cf418f607c69d3e71fc6e7a161d224fc7fb86.zip | |
there is no reason to check for an already defined column
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 2 |
1 files changed, 1 insertions, 1 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 fe381bcf01..922a544e81 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -218,7 +218,7 @@ module ActiveRecord raise ArgumentError, "you can't redefine the primary key column '#{name}'. To define a custom primary key, pass { id: false } to create_table." end - @columns_hash[name] ||= new_column_definition(name, type, options) + @columns_hash[name] = new_column_definition(name, type, options) self end |