diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-12 09:34:55 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-12 09:34:55 -0700 |
| commit | f568280ba49e95c05bfa5e27fa75f0cf6029cd09 (patch) | |
| tree | e07685ac9b802a3c7f1956687e9c05e7f17f4d90 /activerecord/CHANGELOG.md | |
| parent | 924ad60151db70a3a63889a156c4d9f9cfeda431 (diff) | |
| parent | 96304855e6057944d8f5913e541f39c23e20088e (diff) | |
| download | rails-f568280ba49e95c05bfa5e27fa75f0cf6029cd09.tar.gz rails-f568280ba49e95c05bfa5e27fa75f0cf6029cd09.tar.bz2 rails-f568280ba49e95c05bfa5e27fa75f0cf6029cd09.zip | |
Merge pull request #7603 from kennyj/fix_charset_vs_encoding_32
Backported #7572 to 3-2-stable. Use config['encoding'], because database configuration use not charset but encoding.
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 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. |