From 70fffaccfc9761498cb50537d8b29c2e5d0585d1 Mon Sep 17 00:00:00 2001 From: Simon Woker Date: Fri, 11 Apr 2014 17:54:03 +0000 Subject: fix exception on polymorphic associations with predicates --- activerecord/lib/active_record/association_relation.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'activerecord/lib/active_record/association_relation.rb') diff --git a/activerecord/lib/active_record/association_relation.rb b/activerecord/lib/active_record/association_relation.rb index 20516bba0c..a17c36ccd9 100644 --- a/activerecord/lib/active_record/association_relation.rb +++ b/activerecord/lib/active_record/association_relation.rb @@ -8,7 +8,15 @@ module ActiveRecord def proxy_association @association end + + def size + @association.size + end + def empty? + @association.empty? + end + private def exec_queries -- cgit v1.2.3 From 8a08f5cb236f4ca5458c6bbf87dbde75bfc667be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Fri, 11 Apr 2014 15:46:04 -0300 Subject: :scissors: --- activerecord/lib/active_record/association_relation.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/association_relation.rb') diff --git a/activerecord/lib/active_record/association_relation.rb b/activerecord/lib/active_record/association_relation.rb index a17c36ccd9..ef9650d482 100644 --- a/activerecord/lib/active_record/association_relation.rb +++ b/activerecord/lib/active_record/association_relation.rb @@ -8,7 +8,7 @@ module ActiveRecord def proxy_association @association end - + def size @association.size end @@ -16,7 +16,7 @@ module ActiveRecord def empty? @association.empty? end - + private def exec_queries -- cgit v1.2.3 From 24052f925f5f52f74646610a843eb3b98845ac77 Mon Sep 17 00:00:00 2001 From: Lauro Caetano Date: Fri, 11 Apr 2014 19:51:38 -0300 Subject: Make the comparison between 'Relation' and 'AssociationRelation' consistent. --- activerecord/lib/active_record/association_relation.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'activerecord/lib/active_record/association_relation.rb') 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 -- cgit v1.2.3