diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-01-31 00:20:05 -0800 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-01-31 00:20:05 -0800 |
| commit | 920030b3d58b0fa1e5600e9573d82d561f22aff1 (patch) | |
| tree | ddd94504e166f7c5508da7d0b0e1cf77ef993e19 /activerecord/lib/active_record/connection_adapters | |
| parent | 49e69237c40a819d3f2404931d1b08c7defc974e (diff) | |
| parent | 1a1d9e687a488fb44fdcb8d02c982fbb7bd52909 (diff) | |
| download | rails-920030b3d58b0fa1e5600e9573d82d561f22aff1.tar.gz rails-920030b3d58b0fa1e5600e9573d82d561f22aff1.tar.bz2 rails-920030b3d58b0fa1e5600e9573d82d561f22aff1.zip | |
Merge pull request #4763 from kennyj/fix_4754
[MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index 201c05d8f5..9d9dbcc355 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -505,7 +505,7 @@ module ActiveRecord execute_and_free("SHOW CREATE TABLE #{quote_table_name(table)}", 'SCHEMA') do |result| create_table = each_hash(result).first[:"Create Table"] if create_table.to_s =~ /PRIMARY KEY\s+\((.+)\)/ - keys = $1.split(",").map { |key| key.gsub(/`/, "") } + keys = $1.split(",").map { |key| key.gsub(/[`"]/, "") } keys.length == 1 ? [keys.first, nil] : nil else nil |