mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #16196 from yahonda/mysql_restrict_test
Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode"
This commit is contained in:
commit
0a5be1da2f
2 changed files with 6 additions and 8 deletions
|
@ -134,12 +134,11 @@ class MysqlConnectionTest < ActiveRecord::TestCase
|
|||
assert_equal [["STRICT_ALL_TABLES"]], result.rows
|
||||
end
|
||||
|
||||
def test_mysql_strict_mode_disabled_dont_override_global_sql_mode
|
||||
def test_mysql_strict_mode_disabled
|
||||
run_without_connection do |orig_connection|
|
||||
ActiveRecord::Base.establish_connection(orig_connection.merge({:strict => false}))
|
||||
global_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@GLOBAL.sql_mode"
|
||||
session_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
|
||||
assert_equal global_sql_mode.rows, session_sql_mode.rows
|
||||
result = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
|
||||
assert_equal [['']], result.rows
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -60,12 +60,11 @@ class MysqlConnectionTest < ActiveRecord::TestCase
|
|||
assert_equal [["STRICT_ALL_TABLES"]], result.rows
|
||||
end
|
||||
|
||||
def test_mysql_strict_mode_disabled_dont_override_global_sql_mode
|
||||
def test_mysql_strict_mode_disabled
|
||||
run_without_connection do |orig_connection|
|
||||
ActiveRecord::Base.establish_connection(orig_connection.merge({:strict => false}))
|
||||
global_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@GLOBAL.sql_mode"
|
||||
session_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
|
||||
assert_equal global_sql_mode.rows, session_sql_mode.rows
|
||||
result = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
|
||||
assert_equal [['']], result.rows
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue