diff options
author | Andrew White <pixeltrix@users.noreply.github.com> | 2015-02-08 13:12:01 +0000 |
---|---|---|
committer | Andrew White <pixeltrix@users.noreply.github.com> | 2015-02-08 13:12:01 +0000 |
commit | 31fafe0a3223b58e214c03c88a33d6ef4435f63c (patch) | |
tree | f21a37bcdb5e16b75cf2e9010269594268aeebd1 /activerecord/test/cases | |
parent | b1e6794238d7eac958cf146134220f6757fe0789 (diff) | |
parent | 0bbff5ee16d2bfe151975e868ddec0d2f0fd1fff (diff) | |
download | rails-31fafe0a3223b58e214c03c88a33d6ef4435f63c.tar.gz rails-31fafe0a3223b58e214c03c88a33d6ef4435f63c.tar.bz2 rails-31fafe0a3223b58e214c03c88a33d6ef4435f63c.zip |
Merge pull request #18602 from kamipo/respect_database_charset_and_collation
Respect the database default charset for `schema_migrations` table.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb b/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb index 06b0cb5515..271b570eb5 100644 --- a/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb +++ b/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb @@ -18,21 +18,29 @@ module ActiveRecord smtn = ActiveRecord::Migrator.schema_migrations_table_name connection.drop_table smtn, if_exists: true - config = connection.instance_variable_get(:@config) - original_encoding = config[:encoding] + database_name = connection.current_database + database_info = connection.select_one("SELECT * FROM information_schema.schemata WHERE schema_name = '#{database_name}'") + + original_charset = database_info["DEFAULT_CHARACTER_SET_NAME"] + original_collation = database_info["DEFAULT_COLLATION_NAME"] + + execute("ALTER DATABASE #{database_name} DEFAULT CHARACTER SET utf8mb4") - config[:encoding] = 'utf8mb4' connection.initialize_schema_migrations_table assert connection.column_exists?(smtn, :version, :string, limit: Mysql2Adapter::MAX_INDEX_LENGTH_FOR_UTF8MB4) ensure - config[:encoding] = original_encoding + execute("ALTER DATABASE #{database_name} DEFAULT CHARACTER SET #{original_charset} COLLATE #{original_collation}") end private def connection @connection ||= ActiveRecord::Base.connection end + + def execute(sql) + connection.execute(sql) + end end end end |