Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expose queries for AssociationQueryValue and PolymorphicArrayValue #28713

Merged
merged 2 commits into from
Apr 9, 2017
Merged

Expose queries for AssociationQueryValue and PolymorphicArrayValue #28713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b78cf9
Avoid to handle polymorphic association for `AssociationQueryHandler`
kamipo Aug 21, 2016
cc0b566
Expose `queries` for `AssociationQueryValue` and `PolymorphicArrayValue`
kamipo Apr 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 20 additions & 37 deletions activerecord/lib/active_record/relation/predicate_builder/association_query_handler.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@ class PredicateBuilder
class AssociationQueryHandler # :nodoc:
def self.value_for(table, column, value)
associated_table = table.associated_table(column)
klass = if associated_table.polymorphic_association? && ::Array === value && value.first.is_a?(Base)
PolymorphicArrayValue
else
AssociationQueryValue
if associated_table.polymorphic_association?
case value.is_a?(Array) ? value.first : value
when Base, Relation
value = [value] unless value.is_a?(Array)
klass = PolymorphicArrayValue
end
end

klass ||= AssociationQueryValue
klass.new(associated_table, value)
end

Expand All @@ -17,15 +20,7 @@ def initialize(predicate_builder)
end

def call(attribute, value)
queries = {}

table = value.associated_table
if value.base_class
queries[table.association_foreign_type.to_s] = value.base_class.name
end

queries[table.association_foreign_key.to_s] = value.ids
predicate_builder.build_from_hash(queries)
predicate_builder.build_from_hash(value.queries)
end

# TODO Change this to private once we've dropped Ruby 2.2 support.
Expand All @@ -43,38 +38,26 @@ def initialize(associated_table, value)
@value = value
end

def ids
case value
when Relation
value.select(primary_key)
when Array
value.map { |v| convert_to_id(v) }
else
convert_to_id(value)
end
end

def base_class
if associated_table.polymorphic_association?
@base_class ||= polymorphic_base_class_from_value
end
def queries
{ associated_table.association_foreign_key.to_s => ids }
end

private

def primary_key
associated_table.association_primary_key(base_class)
end

def polymorphic_base_class_from_value
def ids
case value
when Relation
value.klass.base_class
when Base
value.class.base_class
value.select_values.empty? ? value.select(primary_key) : value
when Array
value.map { |v| convert_to_id(v) }
else
convert_to_id(value)
end
end

def primary_key
associated_table.association_primary_key
end

def convert_to_id(value)
case value
when Base
Expand Down
35 changes: 24 additions & 11 deletions activerecord/lib/active_record/relation/predicate_builder/polymorphic_array_handler.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@ def initialize(predicate_builder)
end

def call(attribute, value)
table = value.associated_table
queries = value.type_to_ids_mapping.map do |type, ids|
{ table.association_foreign_type.to_s => type, table.association_foreign_key.to_s => ids }
end

predicates = queries.map { |query| predicate_builder.build_from_hash(query) }
predicates = value.queries.map { |query| predicate_builder.build_from_hash(query) }

if predicates.size > 1
type_and_ids_predicates = predicates.map { |type_predicate, id_predicate| Arel::Nodes::Grouping.new(type_predicate.and(id_predicate)) }
Expand All @@ -36,23 +31,41 @@ def initialize(associated_table, values)
@values = values
end

def type_to_ids_mapping
default_hash = Hash.new { |hsh, key| hsh[key] = [] }
values.each_with_object(default_hash) { |value, hash| hash[base_class(value).name] << convert_to_id(value) }
def queries
type_to_ids_mapping.map do |type, ids|
{
associated_table.association_foreign_type.to_s => type,
associated_table.association_foreign_key.to_s => ids
}
end
end

private
def type_to_ids_mapping
default_hash = Hash.new { |hsh, key| hsh[key] = [] }
values.each_with_object(default_hash) { |value, hash| hash[base_class(value).name] << convert_to_id(value) }
end

def primary_key(value)
associated_table.association_primary_key(base_class(value))
end

def base_class(value)
value.class.base_class
case value
when Base
value.class.base_class
when Relation
value.klass.base_class
end
end

def convert_to_id(value)
value._read_attribute(primary_key(value))
case value
when Base
value._read_attribute(primary_key(value))
when Relation
value.select(primary_key(value))
end
end
end
end
Expand Down