diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-06-01 05:47:45 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-01 05:47:45 +0900 |
| commit | d3e87efedb8cf9d072584bc8703841a80c07648f (patch) | |
| tree | 5102de3183abbaead0c75926cbbb9499a07ef02b /activerecord/lib | |
| parent | 06ae49d99c4bc6263a913529ca969d5505fcfdbe (diff) | |
| parent | 5f2bc3a6a00a2277481de7241f7a2066e886b84d (diff) | |
| download | rails-d3e87efedb8cf9d072584bc8703841a80c07648f.tar.gz rails-d3e87efedb8cf9d072584bc8703841a80c07648f.tar.bz2 rails-d3e87efedb8cf9d072584bc8703841a80c07648f.zip | |
Merge pull request #36373 from guigs/fix-table-comment-also-being-applied-to-the-primary-key-column
Fix table comment also being applied to the primary key column
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 107d1ce855..bec22c9b03 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -302,7 +302,7 @@ module ActiveRecord if pk.is_a?(Array) td.primary_keys pk else - td.primary_key pk, options.fetch(:id, :primary_key), options + td.primary_key pk, options.fetch(:id, :primary_key), options.except(:comment) end end |