kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

tweaks tests

Browse source
This commit is contained in:
Ryuta Kamizono 2019-12-23 22:42:54 +09:00
parent c509150136
commit 0b3c710d35
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
activerecord/test/cases/adapters/mysql2/table_options_test.rb
View file

@ -45,19 +45,17 @@ class Mysql2TableOptionsTest < ActiveRecord::Mysql2TestCase
test "schema dump works with NO_TABLE_OPTIONS sql mode" do
skip "As of MySQL 5.7.22, NO_TABLE_OPTIONS is deprecated. It will be removed in a future version of MySQL." if @connection.database_version >= "5.7.22"
old_sql_mode = @connection.exec_query("SELECT @@session.sql_mode").first["@@session.sql_mode"]
new_sql_mode = old_sql_mode.split(",") + ["NO_TABLE_OPTIONS"]
old_sql_mode = @connection.query_value("SELECT @@SESSION.sql_mode")
new_sql_mode = old_sql_mode + ",NO_TABLE_OPTIONS"
begin
@connection.execute("SET @@session.sql_mode=\"#{new_sql_mode.join(",")}\"")
@connection.execute("SET @@SESSION.sql_mode='#{new_sql_mode}'")
@connection.create_table "mysql_table_options", force: true
output = dump_table_schema("mysql_table_options")
output = dump_table_schema("mysql_table_options")
assert_no_match %r{options:}, output
rescue
assert(false, "Changing sql mode failed")
ensure
@connection.execute("SET @@session.sql_mode=\"#{old_sql_mode}\"")
@connection.execute("SET @@SESSION.sql_mode='#{old_sql_mode}'")
end
end
end