From baf6072e4550cf2cf5e52240d0192a56dbe8e949 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sun, 9 Apr 2017 17:25:43 +0900 Subject: Convert `AssociationQueryValue` to PORO queries --- .../active_record/relation/predicate_builder.rb | 28 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'activerecord/lib/active_record/relation/predicate_builder.rb') diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb index fca914aedd..58d30b801c 100644 --- a/activerecord/lib/active_record/relation/predicate_builder.rb +++ b/activerecord/lib/active_record/relation/predicate_builder.rb @@ -20,7 +20,6 @@ module ActiveRecord register_handler(RangeHandler::RangeWithBinds, RangeHandler.new) register_handler(Relation, RelationHandler.new) register_handler(Array, ArrayHandler.new(self)) - register_handler(AssociationQueryValue, AssociationQueryHandler.new(self)) register_handler(PolymorphicArrayValue, PolymorphicArrayHandler.new(self)) end @@ -83,11 +82,10 @@ module ActiveRecord end def create_binds_for_hash(attributes) - result = attributes.dup + result = {} binds = [] attributes.each do |column_name, value| - binds.concat(value.bound_attributes) if value.is_a?(Relation) case when value.is_a?(Hash) && !table.has_column?(column_name) attrs, bvs = associated_predicate_builder(column_name).create_binds_for_hash(value) @@ -99,7 +97,24 @@ module ActiveRecord # # For polymorphic relationships, find the foreign key and type: # PriceEstimate.where(estimate_of: treasure) - result[column_name] = AssociationQueryHandler.value_for(table, column_name, value) + associated_table = table.associated_table(column_name) + if associated_table.polymorphic_association? + case value.is_a?(Array) ? value.first : value + when Base, Relation + binds.concat(value.bound_attributes) if value.is_a?(Relation) + value = [value] unless value.is_a?(Array) + klass = PolymorphicArrayValue + end + end + + if klass + result[column_name] = klass.new(associated_table, value) + else + queries = AssociationQueryValue.new(associated_table, value).queries + attrs, bvs = create_binds_for_hash(queries) + result.merge!(attrs) + binds.concat(bvs) + end when value.is_a?(Range) && !table.type(column_name).respond_to?(:subtype) first = value.begin last = value.end @@ -115,9 +130,12 @@ module ActiveRecord result[column_name] = RangeHandler::RangeWithBinds.new(first, last, value.exclude_end?) else if can_be_bound?(column_name, value) - result[column_name] = Arel::Nodes::BindParam.new binds << build_bind_param(column_name, value) + value = Arel::Nodes::BindParam.new + elsif value.is_a?(Relation) + binds.concat(value.bound_attributes) end + result[column_name] = value end end -- cgit v1.2.3 From 8170bcd99ad3ee4ac4ddf9e28a7c2a5fb93f1b0c Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sun, 9 Apr 2017 19:24:33 +0900 Subject: Convert `PolymorphicArrayValue` to PORO queries --- activerecord/lib/active_record/relation/predicate_builder.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'activerecord/lib/active_record/relation/predicate_builder.rb') diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb index 58d30b801c..f2e719363c 100644 --- a/activerecord/lib/active_record/relation/predicate_builder.rb +++ b/activerecord/lib/active_record/relation/predicate_builder.rb @@ -20,7 +20,6 @@ module ActiveRecord register_handler(RangeHandler::RangeWithBinds, RangeHandler.new) register_handler(Relation, RelationHandler.new) register_handler(Array, ArrayHandler.new(self)) - register_handler(PolymorphicArrayValue, PolymorphicArrayHandler.new(self)) end def build_from_hash(attributes) @@ -101,14 +100,17 @@ module ActiveRecord if associated_table.polymorphic_association? case value.is_a?(Array) ? value.first : value when Base, Relation - binds.concat(value.bound_attributes) if value.is_a?(Relation) value = [value] unless value.is_a?(Array) klass = PolymorphicArrayValue end end if klass - result[column_name] = klass.new(associated_table, value) + result[column_name] = klass.new(associated_table, value).queries.map do |query| + attrs, bvs = create_binds_for_hash(query) + binds.concat(bvs) + attrs + end else queries = AssociationQueryValue.new(associated_table, value).queries attrs, bvs = create_binds_for_hash(queries) -- cgit v1.2.3 From eae0ab97b2f8fdb3f7d62fa14642c54421edc4ff Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Mon, 10 Apr 2017 02:59:23 +0900 Subject: `AssociationQueryValue#queries` returns an array for more concise association handling --- .../lib/active_record/relation/predicate_builder.rb | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'activerecord/lib/active_record/relation/predicate_builder.rb') diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb index f2e719363c..133b3d837c 100644 --- a/activerecord/lib/active_record/relation/predicate_builder.rb +++ b/activerecord/lib/active_record/relation/predicate_builder.rb @@ -81,7 +81,7 @@ module ActiveRecord end def create_binds_for_hash(attributes) - result = {} + result = attributes.dup binds = [] attributes.each do |column_name, value| @@ -105,17 +105,11 @@ module ActiveRecord end end - if klass - result[column_name] = klass.new(associated_table, value).queries.map do |query| - attrs, bvs = create_binds_for_hash(query) - binds.concat(bvs) - attrs - end - else - queries = AssociationQueryValue.new(associated_table, value).queries - attrs, bvs = create_binds_for_hash(queries) - result.merge!(attrs) + klass ||= AssociationQueryValue + result[column_name] = klass.new(associated_table, value).queries.map do |query| + attrs, bvs = create_binds_for_hash(query) binds.concat(bvs) + attrs end when value.is_a?(Range) && !table.type(column_name).respond_to?(:subtype) first = value.begin @@ -132,12 +126,11 @@ module ActiveRecord result[column_name] = RangeHandler::RangeWithBinds.new(first, last, value.exclude_end?) else if can_be_bound?(column_name, value) + result[column_name] = Arel::Nodes::BindParam.new binds << build_bind_param(column_name, value) - value = Arel::Nodes::BindParam.new elsif value.is_a?(Relation) binds.concat(value.bound_attributes) end - result[column_name] = value end end -- cgit v1.2.3