From b278db1d2361656c634c15c94ea981e6d0e327f9 Mon Sep 17 00:00:00 2001 From: Dylan Thacker-Smith Date: Thu, 17 Jan 2019 14:16:13 -0500 Subject: Avoid using yield_self to make it easier to backport --- activerecord/lib/active_record/relation/predicate_builder.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb index b8d64be343..842fb1c54b 100644 --- a/activerecord/lib/active_record/relation/predicate_builder.rb +++ b/activerecord/lib/active_record/relation/predicate_builder.rb @@ -91,12 +91,11 @@ module ActiveRecord elsif table.aggregated_with?(key) mapping = table.reflect_on_aggregation(key).mapping if mapping.length == 1 - mapping.first.yield_self do |field_attr, aggregate_attr| - values = Array.wrap(value).map do |object| - object.respond_to?(aggregate_attr) ? object.send(aggregate_attr) : object - end - build(table.arel_attribute(field_attr), values) + column_name, aggr_attr = mapping.first + values = Array.wrap(value).map do |object| + object.respond_to?(aggr_attr) ? object.send(aggr_attr) : object end + build(table.arel_attribute(column_name), values) else queries = Array.wrap(value).map do |object| mapping.map do |field_attr, aggregate_attr| -- cgit v1.2.3