aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-30 15:42:26 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-30 15:42:26 -0300
commit6e8f39dcf92fba2edd25fe7b60de552daa18745c (patch)
treeca6130a42b3b4847658631ed4d9d069af4501268
parent436de495f364672e3ba4dbdf77822058b40c2a4c (diff)
parente2fcaf804fd9bbae45a74ad18e4797d136fa4a22 (diff)
downloadrails-6e8f39dcf92fba2edd25fe7b60de552daa18745c.tar.gz
rails-6e8f39dcf92fba2edd25fe7b60de552daa18745c.tar.bz2
rails-6e8f39dcf92fba2edd25fe7b60de552daa18745c.zip
Merge pull request #18261 from prathamesh-sonpatki/update-changelog
Update CHANGELOG entry for #18070 [ci skip]
-rw-r--r--activerecord/CHANGELOG.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 48c1027460..c78ddd5fe6 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,6 +1,7 @@
-* When table has a composite primary key, the `primary_key` method for
- sqlite3 and postgresql was only returning the first field of the key.
- Ensures that it will return nil instead, as AR dont support composite pks.
+* When a table has a composite primary key, the `primary_key` method for
+ SQLite3 and PostgreSQL adapters was only returning the first field of the key.
+ Ensures that it will return nil instead, as Active Record doesn't support
+ composite primary keys.
Fixes #18070.