aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorLauro Caetano <laurocaetano1@gmail.com>2014-04-03 22:07:03 -0300
committerLauro Caetano <laurocaetano1@gmail.com>2014-04-11 20:06:19 -0300
commitd6840f914a32bff4d73f23c3f5c64c5397f8b400 (patch)
treeab8d7cea0dabe701d8acf61916541bfd7096ba11 /activerecord/lib/active_record
parentc8a70660d46343d05c954c8a9b830166aa7335e9 (diff)
downloadrails-d6840f914a32bff4d73f23c3f5c64c5397f8b400.tar.gz
rails-d6840f914a32bff4d73f23c3f5c64c5397f8b400.tar.bz2
rails-d6840f914a32bff4d73f23c3f5c64c5397f8b400.zip
The comparison between `Relation` and `CollectionProxy` should be consistent.
Example: author.posts == Post.where(author_id: author.id) # => true Post.where(author_id: author.id) == author.posts # => true Fixes #13506
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/relation.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index d1764a2bb2..4adc8a3862 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -569,6 +569,8 @@ module ActiveRecord
# Compares two relations for equality.
def ==(other)
case other
+ when Associations::CollectionProxy
+ self == other.to_a
when Relation
other.to_sql == to_sql
when Array