From 9551bad98fc7604d460427946183bdfca7a2f8d4 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Mon, 4 Sep 2017 20:22:42 +0900 Subject: Should quote composite primary key names Otherwise using reserved words as composite primary key names will be failed as an invalid SQL. Fixes #30518. --- .../lib/active_record/connection_adapters/abstract/schema_creation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib') 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) -- cgit v1.2.3