aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/adapters
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-03-27 15:21:45 +0900
committerRyuta Kamizono <kamipo@gmail.com>2019-03-27 15:26:29 +0900
commit3c2f3010785d8061415dbb3bac04be312123b931 (patch)
treef47eb3b4d0525adab1d9e5cc8556e991bddd4017 /activerecord/test/cases/adapters
parent7fe7e7417112a9e8e0f1b0b81f31047ab01a1096 (diff)
downloadrails-3c2f3010785d8061415dbb3bac04be312123b931.tar.gz
rails-3c2f3010785d8061415dbb3bac04be312123b931.tar.bz2
rails-3c2f3010785d8061415dbb3bac04be312123b931.zip
Don't change `collation_connection` in the current connection
We have a test case for `collation_connection` session variable, so it should not be changed in any other test. Fixes #35458.
Diffstat (limited to 'activerecord/test/cases/adapters')
-rw-r--r--activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb b/activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb
index a5b53f76b4..6ade2eec24 100644
--- a/activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb
@@ -200,7 +200,7 @@ class Mysql2AdapterTest < ActiveRecord::Mysql2TestCase
def test_doesnt_error_when_a_set_query_is_called_while_preventing_writes
@conn.while_preventing_writes do
- assert_nil @conn.execute("SET NAMES utf8")
+ assert_nil @conn.execute("SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci")
end
end