diff options
| author | Michael Koziarski <michael@koziarski.com> | 2007-10-25 18:53:07 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2007-10-25 18:53:07 +0000 |
| commit | 96557eb35b2f28df663f2df6de4288931ee6143a (patch) | |
| tree | dcb6ceb0893dae7a31923f64bee4ab86f7042d63 /activerecord/lib | |
| parent | 11d2a309c5f67c74332b285bf07c98cda6b6ecb1 (diff) | |
| download | rails-96557eb35b2f28df663f2df6de4288931ee6143a.tar.gz rails-96557eb35b2f28df663f2df6de4288931ee6143a.tar.bz2 rails-96557eb35b2f28df663f2df6de4288931ee6143a.zip | |
Remove superfluous code and quote table name. References #9971 [jkit, nzkoz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8015 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index 5242151736..2b79823d04 100755 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -442,9 +442,8 @@ module ActiveRecord # Returns a table's primary key and belonging sequence. def pk_and_sequence_for(table) #:nodoc: - table_desc_result = execute("describe #{table}") keys = [] - execute("describe #{table}").each_hash do |h| + execute("describe #{quote_table_name(table)}").each_hash do |h| keys << h["Field"]if h["Key"] == "PRI" end keys.length == 1 ? [keys.first, nil] : nil |