diff options
| author | Lauro Caetano <laurocaetano1@gmail.com> | 2014-04-11 19:51:38 -0300 |
|---|---|---|
| committer | Lauro Caetano <laurocaetano1@gmail.com> | 2014-04-12 11:00:33 -0300 |
| commit | 24052f925f5f52f74646610a843eb3b98845ac77 (patch) | |
| tree | 8063f7b714d7257dec98fcace27b2944e3f8e49d /activerecord/lib | |
| parent | d6840f914a32bff4d73f23c3f5c64c5397f8b400 (diff) | |
| download | rails-24052f925f5f52f74646610a843eb3b98845ac77.tar.gz rails-24052f925f5f52f74646610a843eb3b98845ac77.tar.bz2 rails-24052f925f5f52f74646610a843eb3b98845ac77.zip | |
Make the comparison between 'Relation' and 'AssociationRelation'
consistent.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/association_relation.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/association_relation.rb b/activerecord/lib/active_record/association_relation.rb index ef9650d482..45f1b07f69 100644 --- a/activerecord/lib/active_record/association_relation.rb +++ b/activerecord/lib/active_record/association_relation.rb @@ -17,6 +17,10 @@ module ActiveRecord @association.empty? end + def ==(other) + other == to_a + end + private def exec_queries diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 4adc8a3862..709edbee88 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -569,7 +569,7 @@ module ActiveRecord # Compares two relations for equality. def ==(other) case other - when Associations::CollectionProxy + when Associations::CollectionProxy, AssociationRelation self == other.to_a when Relation other.to_sql == to_sql |