Use configuration['encoding'], because database configuration use not charset but encoding.

1 files changed, 3 insertions, 3 deletions

diff --git a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
index 4e40a2473b..2340f949b7 100644
--- a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
@@ -27,7 +27,7 @@ module ActiveRecord
       rescue error_class => error
         $stderr.puts error.error
         $stderr.puts "Couldn't create database for #{configuration.inspect}, #{creation_options.inspect}"
-        $stderr.puts "(If you set the charset manually, make sure you have a matching collation)" if configuration['charset']
+        $stderr.puts "(If you set the charset manually, make sure you have a matching collation)" if configuration['encoding']
       end
 
       def drop
@@ -75,7 +75,7 @@ module ActiveRecord
 
       def creation_options
         {
-          charset:   (configuration['charset']   || DEFAULT_CHARSET),
+          charset:   (configuration['encoding']   || DEFAULT_CHARSET),
           collation: (configuration['collation'] || DEFAULT_COLLATION)
         }
       end
@@ -116,7 +116,7 @@ IDENTIFIED BY '#{configuration['password']}' WITH GRANT OPTION;
         args = [command]
         args.concat(['--user', configuration['username']]) if configuration['username']
         args << "--password=#{configuration['password']}"  if configuration['password']
-        args.concat(['--default-character-set', configuration['charset']]) if configuration['charset']
+        args.concat(['--default-character-set', configuration['encoding']]) if configuration['encoding']
         configuration.slice('host', 'port', 'socket').each do |k, v|
           args.concat([ "--#{k}", v ]) if v
         end