aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-01 12:57:48 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-01 12:58:41 -0300
commitaafa00f4c10a6791e6470112f0f1fbe5f2c3f649 (patch)
treeeba2b5554545cc2a84933f443763a28d9f4c0a8f /activerecord/CHANGELOG.md
parent36938b410e7c7396ee5934246fddc048b898f7ef (diff)
downloadrails-aafa00f4c10a6791e6470112f0f1fbe5f2c3f649.tar.gz
rails-aafa00f4c10a6791e6470112f0f1fbe5f2c3f649.tar.bz2
rails-aafa00f4c10a6791e6470112f0f1fbe5f2c3f649.zip
Unify the collation API for the database adpters
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 73f9212371..84fffb3d17 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -16,7 +16,7 @@
*Brian Cardarella*
-* Add `collate` and `ctype` support to PostgreSQL. These are available for PostgreSQL 8.4 or later.
+* Add `collation` and `ctype` support to PostgreSQL. These are available for PostgreSQL 8.4 or later.
Example:
development:
@@ -26,7 +26,7 @@
username: foo
password: bar
encoding: UTF8
- collate: ja_JP.UTF8
+ collation: ja_JP.UTF8
ctype: ja_JP.UTF8
*kennyj*