diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-02-04 18:08:31 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-02-04 18:14:59 -0800 |
| commit | 59f7780a3454a14054d1d33d9b6e31192ab2e58b (patch) | |
| tree | 03f0318134781173b87959dcdd21c1ac0bd4eeda /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | |
| parent | acccb72cb12ab55bb01c3dce32f54f4a59ebec6c (diff) | |
| download | rails-59f7780a3454a14054d1d33d9b6e31192ab2e58b.tar.gz rails-59f7780a3454a14054d1d33d9b6e31192ab2e58b.tar.bz2 rails-59f7780a3454a14054d1d33d9b6e31192ab2e58b.zip | |
adjust query counts to be consistent across databases, make sure database log the same things
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index 15488cee52..cdf1ebfee4 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -537,7 +537,7 @@ module ActiveRecord def columns(table_name, name = nil)#:nodoc: sql = "SHOW FIELDS FROM #{quote_table_name(table_name)}" columns = [] - result = execute(sql, :skip_logging) + result = execute(sql) result.each { |field| columns << MysqlColumn.new(field[0], field[4], field[1], field[2] == "YES") } result.free columns |