aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-04-19 22:43:38 -0400
committerGitHub <noreply@github.com>2017-04-19 22:43:38 -0400
commit5816c2028863096b5c41cc463256933b4437f5a9 (patch)
tree3e79453488c58294c22fe1b42bec2443e623b854 /activerecord/test
parentd87d0e34dae7511b234058d374507721843dc8ee (diff)
parenta8ee3e8836fc5467d048a6334e94c198f086a737 (diff)
downloadrails-5816c2028863096b5c41cc463256933b4437f5a9.tar.gz
rails-5816c2028863096b5c41cc463256933b4437f5a9.tar.bz2
rails-5816c2028863096b5c41cc463256933b4437f5a9.zip
Merge pull request #28733 from kamipo/dont_fallback_to_utf8mb3_after_mysql_8.0.0
Don't fallback to utf8mb3 after MySQL 8.0.0
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb b/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb
index 605baa9905..251a50e41e 100644
--- a/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb
@@ -18,7 +18,7 @@ class SchemaMigrationsTest < ActiveRecord::Mysql2TestCase
ActiveRecord::SchemaMigration.create_table
- assert connection.column_exists?(table_name, :version, :string, collation: "utf8_general_ci")
+ assert connection.column_exists?(table_name, :version, :string)
end
end
@@ -29,7 +29,7 @@ class SchemaMigrationsTest < ActiveRecord::Mysql2TestCase
ActiveRecord::InternalMetadata.create_table
- assert connection.column_exists?(table_name, :key, :string, collation: "utf8_general_ci")
+ assert connection.column_exists?(table_name, :key, :string)
end
end