aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-16 13:45:25 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-16 13:45:25 -0300
commitae297710dd526a95bae99bd143e2bb185466cc23 (patch)
tree0114e070dbd19a6efd8dc19f611b1816bbd4f643 /activerecord/CHANGELOG.md
parent678fdda54f391a7fec92e2c0d2a94b6e889c220c (diff)
parentfbbb6c87fd5e8fcd913c0dbf518024edd7538072 (diff)
downloadrails-ae297710dd526a95bae99bd143e2bb185466cc23.tar.gz
rails-ae297710dd526a95bae99bd143e2bb185466cc23.tar.bz2
rails-ae297710dd526a95bae99bd143e2bb185466cc23.zip
Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scope
Collapse where constraints to the Arel::Nodes::And node Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 0cf50c512e..a2e2fed75f 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,11 @@
+* Fix: joins association, with defined in the scope block constraints by using several
+ where constraints and at least of them is not `Arel::Nodes::Equality`,
+ generates invalid SQL expression.
+
+ Fixes: #11963
+
+ *Paul Nikitochkin*
+
* Deprecate the delegation of Array bang methods for associations.
To use them, instead first call `#to_a` on the association to access the
array to be acted on.