diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-11 12:47:31 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-11 16:52:33 -0300 |
| commit | 0215faf472aa22a0e57147cc529fe91ee3117926 (patch) | |
| tree | 700ef62f9434ea049599739cdedd04e4536795a9 /activerecord | |
| parent | 057b159a7b6d91e8658d065060a61dc162976c63 (diff) | |
| download | rails-0215faf472aa22a0e57147cc529fe91ee3117926.tar.gz rails-0215faf472aa22a0e57147cc529fe91ee3117926.tar.bz2 rails-0215faf472aa22a0e57147cc529fe91ee3117926.zip | |
Merge pull request #10572 from nertzy/dont-modify-options-hash-in-primary-key
Don't modify args in TableDefinition#primary_key
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 3 |
1 files changed, 1 insertions, 2 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 566550cbe2..aabedf15e9 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -65,8 +65,7 @@ module ActiveRecord # Appends a primary key definition to the table definition. # Can be called multiple times, but this is probably not a good idea. def primary_key(name, type = :primary_key, options = {}) - options[:primary_key] = true - column(name, type, options) + column(name, type, options.merge(:primary_key => true)) end # Returns a ColumnDefinition for the column with name +name+. |