aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@gmail.com>2015-05-30 12:09:23 -0400
committerEileen M. Uchitelle <eileencodes@gmail.com>2015-05-30 12:09:23 -0400
commit50914b918e57359193e873e285bcfe38dff12b81 (patch)
tree6896af1e620ac9398f34083929a6c9fc0b783a07
parenteefd4c0d28daf3d71a84996fff6714f8d65a94b0 (diff)
parente5e3ec20851bb336d0efb7956d115a4b4a4bd9b1 (diff)
downloadrails-50914b918e57359193e873e285bcfe38dff12b81.tar.gz
rails-50914b918e57359193e873e285bcfe38dff12b81.tar.bz2
rails-50914b918e57359193e873e285bcfe38dff12b81.zip
Merge pull request #20380 from kamipo/add_changelog_for_17654
Add CHANGELOG entry for #17654
-rw-r--r--activerecord/CHANGELOG.md13
1 files changed, 13 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index edbfe38753..de47660875 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,16 @@
+* Do not set `sql_mode` if `strict: :default` is specified.
+
+ ```
+ # database.yml
+ production:
+ adapter: mysql2
+ database: foo_prod
+ user: foo
+ strict: :default
+ ```
+
+ *Ryuta Kamizono*
+
* SQLite: `:collation` support for string and text columns.
Example: