TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #370 from joshk/unrolled_map.

Browse Source 
favor map over each in mysql* adapters
This commit is contained in:
Aaron Patterson 2011-05-02 15:44:57 -07:00
commit fa77665a34
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -411,11 +411,9 @@ def collation
end end
def tables(name = nil) def tables(name = nil)
tables = [] execute("SHOW TABLES", 'SCHEMA').collect do |field|
execute("SHOW TABLES", 'SCHEMA').each do |field| field.first
tables << field.first
end end
tables
end end
def drop_table(table_name, options = {}) def drop_table(table_name, options = {})

6
activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
View File

@ -560,9 +560,8 @@ def collation
end end
def tables(name = nil, database = nil) #:nodoc: def tables(name = nil, database = nil) #:nodoc:
tables = []
result = execute(["SHOW TABLES", database].compact.join(' IN '), 'SCHEMA') result = execute(["SHOW TABLES", database].compact.join(' IN '), 'SCHEMA')
result.each { |field| tables << field[0] } tables = result.collect { |field| field[0] }
result.free result.free
tables tables
end end
@ -607,9 +606,8 @@ def indexes(table_name, name = nil)#:nodoc:
# Returns an array of +MysqlColumn+ objects for the table specified by +table_name+. # Returns an array of +MysqlColumn+ objects for the table specified by +table_name+.
def columns(table_name, name = nil)#:nodoc: def columns(table_name, name = nil)#:nodoc:
sql = "SHOW FIELDS FROM #{quote_table_name(table_name)}" sql = "SHOW FIELDS FROM #{quote_table_name(table_name)}"
columns = []
result = execute(sql, 'SCHEMA') result = execute(sql, 'SCHEMA')
result.each { |field| columns << MysqlColumn.new(field[0], field[4], field[1], field[2] == "YES") } columns = result.collect { |field| MysqlColumn.new(field[0], field[4], field[1], field[2] == "YES") }
result.free result.free
columns columns
end end