aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2015-10-22 09:54:04 +0100
committerAndrew White <pixeltrix@users.noreply.github.com>2015-10-22 09:54:04 +0100
commitf66b68173a11d0ef8f4bb6253386c15d031017ba (patch)
treec4e46cd8ae0b38303133f15965d46efb4c64110a /activerecord/CHANGELOG.md
parent94db9b6f1dc0f03b36fda37b7ee914c594105e66 (diff)
parent4f21d42faaf12955fa0116306966d4ef09e62462 (diff)
downloadrails-f66b68173a11d0ef8f4bb6253386c15d031017ba.tar.gz
rails-f66b68173a11d0ef8f4bb6253386c15d031017ba.tar.bz2
rails-f66b68173a11d0ef8f4bb6253386c15d031017ba.zip
Merge pull request #21950 from rafaelsales/issues/21922-fix-ar-group-by-attribute-lookup
Fix generated projection fields in group by query
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 258b2be899..e1f543c3a1 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,10 @@
+* Queries such as `Computer.joins(:monitor).group(:status).count` will now be
+ interpreted as `Computer.joins(:monitor).group('computers.status').count`
+ so that when `Computer` and `Monitor` have both `status` columns we don't
+ have conflicts in projection.
+
+ *Rafael Sales*
+
* Add ability to default to `uuid` as primary key when generating database migrations
Set `Rails.application.config.active_record.primary_key = :uuid`