github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove schema noise from logging (TODO: Deprecate/remove the name attribute to all these methods -- will take a pull request!)

Browse Source
This commit is contained in:
David Heinemeier Hansson
2011-05-01 18:22:43 -06:00
parent a8861c8f5b
commit 635abc7194
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
View File

@@ -412,7 +412,7 @@ module ActiveRecord
def tables(name = nil)
tables = []
execute("SHOW TABLES", name).each do |field|
execute("SHOW TABLES", 'SCHEMA').each do |field|
tables << field.first
end
tables
@@ -426,7 +426,7 @@ module ActiveRecord
def indexes(table_name, name = nil)
indexes = []
current_index = nil
result = execute("SHOW KEYS FROM #{quote_table_name(table_name)}", name)
result = execute("SHOW KEYS FROM #{quote_table_name(table_name)}", 'SCHEMA')
result.each(:symbolize_keys => true, :as => :hash) do |row|
if current_index != row[:Key_name]
next if row[:Key_name] == PRIMARY # skip the primary key
@@ -444,7 +444,7 @@ module ActiveRecord
def columns(table_name, name = nil)
sql = "SHOW FIELDS FROM #{quote_table_name(table_name)}"
columns = []
result = execute(sql)
result = execute(sql, 'SCHEMA')
result.each(:symbolize_keys => true, :as => :hash) { |field|
columns << Mysql2Column.new(field[:Field], field[:Default], field[:Type], field[:Null] == "YES")
}
@@ -546,7 +546,7 @@ module ActiveRecord
# Returns a table's primary key and belonging sequence.
def pk_and_sequence_for(table)
keys = []
result = execute("describe #{quote_table_name(table)}")
result = execute("DESCRIBE #{quote_table_name(table)}", 'SCHEMA')
result.each(:symbolize_keys => true, :as => :hash) do |row|
keys << row[:Field] if row[:Key] == "PRI"
end