diff options
| author | Zachary Scott <e@zzak.io> | 2014-12-30 10:43:42 -0800 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2014-12-30 10:43:42 -0800 |
| commit | 97c8b54a77540dfab34d7e92751a17f4a2ee264d (patch) | |
| tree | f612c42086b965cf5b0d35d005ef1497bc1f4c19 | |
| parent | eb9eb42c2b56e4a6ca8c4fd12e0fdffc29167465 (diff) | |
| parent | 6e8f39dcf92fba2edd25fe7b60de552daa18745c (diff) | |
| download | rails-97c8b54a77540dfab34d7e92751a17f4a2ee264d.tar.gz rails-97c8b54a77540dfab34d7e92751a17f4a2ee264d.tar.bz2 rails-97c8b54a77540dfab34d7e92751a17f4a2ee264d.zip | |
Merge branch 'master' of github.com:rails/rails [ci skip]
| -rw-r--r-- | activerecord/CHANGELOG.md | 7 |
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. |