Skip to content

Wrap pluck fields with Arel.sql #1190

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

Merged
lgebhardt merged 1 commit into from
Nov 7, 2018
Merged

Wrap pluck fields with Arel.sql #1190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions lib/jsonapi/active_relation_resource_finder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,19 @@ def find_fragments(filters, options = {})
records = find_records(filters, options)

table_name = _model_class.table_name
pluck_fields = ["#{concat_table_field(table_name, _primary_key)} AS #{table_name}_#{_primary_key}"]
pluck_fields = [Arel.sql("#{concat_table_field(table_name, _primary_key)} AS #{table_name}_#{_primary_key}")]

cache_field = attribute_to_model_field(:_cache_field) if options[:cache]
if cache_field
pluck_fields << "#{concat_table_field(table_name, cache_field[:name])} AS #{table_name}_#{cache_field[:name]}"
pluck_fields << Arel.sql("#{concat_table_field(table_name, cache_field[:name])} AS #{table_name}_#{cache_field[:name]}")
end

model_fields = {}
attributes = options[:attributes]
attributes.try(:each) do |attribute|
model_field = attribute_to_model_field(attribute)
model_fields[attribute] = model_field
pluck_fields << "#{concat_table_field(table_name, model_field[:name])} AS #{table_name}_#{model_field[:name]}"
pluck_fields << Arel.sql("#{concat_table_field(table_name, model_field[:name])} AS #{table_name}_#{model_field[:name]}")
end

fragments = {}
Expand Down Expand Up @@ -204,21 +204,21 @@ def find_related_monomorphic_fragments(source_rids, relationship, included_key,
records = related_klass.apply_filters(records, filters, filter_options)

pluck_fields = [
"#{primary_key_field} AS #{_table_name}_#{_primary_key}",
"#{concat_table_field(table_alias, related_klass._primary_key)} AS #{table_alias}_#{related_klass._primary_key}"
Arel.sql("#{primary_key_field} AS #{_table_name}_#{_primary_key}"),
Arel.sql("#{concat_table_field(table_alias, related_klass._primary_key)} AS #{table_alias}_#{related_klass._primary_key}")
]

cache_field = related_klass.attribute_to_model_field(:_cache_field) if options[:cache]
if cache_field
pluck_fields << "#{concat_table_field(table_alias, cache_field[:name])} AS #{table_alias}_#{cache_field[:name]}"
pluck_fields << Arel.sql("#{concat_table_field(table_alias, cache_field[:name])} AS #{table_alias}_#{cache_field[:name]}")
end

model_fields = {}
attributes = options[:attributes]
attributes.try(:each) do |attribute|
model_field = related_klass.attribute_to_model_field(attribute)
model_fields[attribute] = model_field
pluck_fields << "#{concat_table_field(table_alias, model_field[:name])} AS #{table_alias}_#{model_field[:name]}"
pluck_fields << Arel.sql("#{concat_table_field(table_alias, model_field[:name])} AS #{table_alias}_#{model_field[:name]}")
end

rows = records.pluck(*pluck_fields)
Expand Down Expand Up @@ -265,9 +265,9 @@ def find_related_polymorphic_fragments(source_rids, relationship, options = {})
related_type = concat_table_field(_table_name, relationship.polymorphic_type)

pluck_fields = [
"#{primary_key} AS #{_table_name}_#{_primary_key}",
"#{related_key} AS #{_table_name}_#{relationship.foreign_key}",
"#{related_type} AS #{_table_name}_#{relationship.polymorphic_type}"
Arel.sql("#{primary_key} AS #{_table_name}_#{_primary_key}"),
Arel.sql("#{related_key} AS #{_table_name}_#{relationship.foreign_key}"),
Arel.sql("#{related_type} AS #{_table_name}_#{relationship.polymorphic_type}")
]

relations = relationship.polymorphic_relations
Expand Down