Stop the MySQL adapter crashing when views are present. (closes #3782) [Jonathan Viney]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3886 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
e74ec90a07
commit
cee92312cf
|
@ -105,6 +105,8 @@
|
|||
|
||||
* Documentation fixes for :dependent [robby@planetargon.com]
|
||||
|
||||
* Stop the MySQL adapter crashing when views are present. #3782 [Jonathan Viney]
|
||||
|
||||
* Allow set_fixture_class to take Classes instead of strings for a class in a module. Raise FixtureClassNotFound if a fixture can't load. [Rick Olson]
|
||||
|
||||
* Fix quoting of inheritance column for STI eager loading #4098 [Jonathan Viney <jonathan@bluewire.net.nz>]
|
||||
|
|
|
@ -236,7 +236,14 @@ module ActiveRecord
|
|||
# SCHEMA STATEMENTS ========================================
|
||||
|
||||
def structure_dump #:nodoc:
|
||||
select_all("SHOW TABLES").inject("") do |structure, table|
|
||||
if supports_views?
|
||||
sql = "SHOW FULL TABLES WHERE Table_type = 'BASE TABLE'"
|
||||
else
|
||||
sql = "SHOW TABLES"
|
||||
end
|
||||
|
||||
select_all(sql).inject("") do |structure, table|
|
||||
table.delete('Table_type')
|
||||
structure += select_one("SHOW CREATE TABLE #{table.to_a.first.last}")["Create Table"] + ";\n\n"
|
||||
end
|
||||
end
|
||||
|
@ -334,6 +341,14 @@ module ActiveRecord
|
|||
result.free
|
||||
rows
|
||||
end
|
||||
|
||||
def supports_views?
|
||||
version[0] >= 5
|
||||
end
|
||||
|
||||
def version
|
||||
@version ||= @connection.server_info.scan(/^(\d+)\.(\d+)\.(\d+)/).flatten.map { |v| v.to_i }
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue