diff options
| author | kennyj <kennyj@gmail.com> | 2012-09-12 01:37:18 +0900 |
|---|---|---|
| committer | kennyj <kennyj@gmail.com> | 2012-09-12 01:37:18 +0900 |
| commit | 96304855e6057944d8f5913e541f39c23e20088e (patch) | |
| tree | e07685ac9b802a3c7f1956687e9c05e7f17f4d90 /activerecord | |
| parent | 924ad60151db70a3a63889a156c4d9f9cfeda431 (diff) | |
| download | rails-96304855e6057944d8f5913e541f39c23e20088e.tar.gz rails-96304855e6057944d8f5913e541f39c23e20088e.tar.bz2 rails-96304855e6057944d8f5913e541f39c23e20088e.zip | |
Backported #7572 to 3-2-stable. Use config['encoding'], because database configuration use not charset but encoding.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 6 | ||||
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 6e6dac5773..22d66acc1b 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,4 +1,10 @@ ## Rails 3.2.9 (unreleased) +* Use config['encoding'] instead of config['charset'] when executing + databases.rake in the mysql/mysql2. A correct option for a database.yml + is 'encoding'. + + *kennyj* + * Fix ConnectionAdapters::Column.type_cast_code integer conversion, to always convert values to integer calling #to_i. Fixes #7509. diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 83d9126ccb..aabd0d0bdb 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -44,7 +44,7 @@ db_namespace = namespace :db do def mysql_creation_options(config) @charset = ENV['CHARSET'] || 'utf8' @collation = ENV['COLLATION'] || 'utf8_unicode_ci' - {:charset => (config['charset'] || @charset), :collation => (config['collation'] || @collation)} + {:charset => (config['encoding'] || @charset), :collation => (config['collation'] || @collation)} end def create_database(config) @@ -96,8 +96,8 @@ db_namespace = namespace :db do ActiveRecord::Base.establish_connection(config) else $stderr.puts sqlerr.error - $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{config['charset'] || @charset}, collation: #{config['collation'] || @collation}" - $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset'] + $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{config['encoding'] || @charset}, collation: #{config['collation'] || @collation}" + $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['encoding'] end end when /postgresql/ |