Merge pull request #13478 from schneems/schneems/fix-mysql

Move mysql2 test for when adapter will be loaded
This commit is contained in:
Guillermo Iguaran 2013-12-25 12:21:38 -08:00
commit 278bbfd7df
2 changed files with 7 additions and 7 deletions

View File

@ -23,13 +23,6 @@ module ActiveRecord
end
end
def test_bad_connection_mysql2
assert_raise ActiveRecord::NoDatabaseError do
connection = ActiveRecord::Base.mysql2_connection(adapter: "mysql2", database: "should_not_exist-cinco-dog-db")
connection.exec_query('drop table if exists ex')
end
end
def test_valid_column
column = @conn.columns('ex').find { |col| col.name == 'id' }
assert @conn.valid_type?(column.type)

View File

@ -13,6 +13,13 @@ class MysqlConnectionTest < ActiveRecord::TestCase
super
end
def test_bad_connection
assert_raise ActiveRecord::NoDatabaseError do
connection = ActiveRecord::Base.mysql2_connection(adapter: "mysql2", database: "should_not_exist-cinco-dog-db")
connection.exec_query('drop table if exists ex')
end
end
def test_no_automatic_reconnection_after_timeout
assert @connection.active?
@connection.update('set @@wait_timeout=1')