diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-30 11:06:49 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-30 11:06:49 -0700 |
commit | 7c1b61e50ee44abd4f6440067ec11f7ccd01df3c (patch) | |
tree | 9500acc572eb8c9f8cc52b60b028cb5083251712 /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | |
parent | 9ed62ade5f2972cfc978cf2744cdd81215f8ff8f (diff) | |
parent | 576d7007ddff889d502a77e4868b35d4b0dcc6c7 (diff) | |
download | rails-7c1b61e50ee44abd4f6440067ec11f7ccd01df3c.tar.gz rails-7c1b61e50ee44abd4f6440067ec11f7ccd01df3c.tar.bz2 rails-7c1b61e50ee44abd4f6440067ec11f7ccd01df3c.zip |
Merge pull request #6386 from kennyj/fix_logs_name_consistency
Fix logs name consistency.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 8 |
1 files changed, 4 insertions, 4 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 9794c5663e..692473abc5 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -313,10 +313,10 @@ module ActiveRecord sql = "SHOW TABLES" end - select_all(sql).map { |table| + select_all(sql, 'SCHEMA').map { |table| table.delete('Table_type') sql = "SHOW CREATE TABLE #{quote_table_name(table.to_a.first.last)}" - exec_without_stmt(sql).first['Create Table'] + ";\n\n" + exec_without_stmt(sql, 'SCHEMA').first['Create Table'] + ";\n\n" }.join end @@ -508,7 +508,7 @@ module ActiveRecord # SHOW VARIABLES LIKE 'name' def show_variable(name) - variables = select_all("SHOW VARIABLES LIKE '#{name}'") + variables = select_all("SHOW VARIABLES LIKE '#{name}'", 'SCHEMA') variables.first['Value'] unless variables.empty? end @@ -630,7 +630,7 @@ module ActiveRecord raise ActiveRecordError, "No such column: #{table_name}.#{column_name}" end - current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'")["Type"] + current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'", 'SCHEMA')["Type"] rename_column_sql = "CHANGE #{quote_column_name(column_name)} #{quote_column_name(new_column_name)} #{current_type}" add_column_options!(rename_column_sql, options) rename_column_sql |