diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-09-04 20:22:42 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2017-09-04 20:26:03 +0900 |
| commit | 9551bad98fc7604d460427946183bdfca7a2f8d4 (patch) | |
| tree | 8ffea5e01e19f5c652f4edb7ba19913e4e26a06f /activerecord/lib | |
| parent | 07bac9ef93d98a1e31cd5b2ce2aabc1e57816604 (diff) | |
| download | rails-9551bad98fc7604d460427946183bdfca7a2f8d4.tar.gz rails-9551bad98fc7604d460427946183bdfca7a2f8d4.tar.bz2 rails-9551bad98fc7604d460427946183bdfca7a2f8d4.zip | |
Should quote composite primary key names
Otherwise using reserved words as composite primary key names will be
failed as an invalid SQL.
Fixes #30518.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb index 8bf3879a4c..bd05fb8f6e 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb @@ -62,7 +62,7 @@ module ActiveRecord end def visit_PrimaryKeyDefinition(o) - "PRIMARY KEY (#{o.name.join(', ')})" + "PRIMARY KEY (#{o.name.map { |name| quote_column_name(name) }.join(', ')})" end def visit_ForeignKeyDefinition(o) |