Skip to content

Harden select_for_count #676

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

Open
delynn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Harden select_for_count #676

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
8 changes: 5 additions & 3 deletions lib/mobility/plugins/active_record/query.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,14 +191,16 @@ def order(opts, *rest)
def select_for_count
return super unless klass.respond_to?(:mobility_attribute?)

if select_values.any? { |value| value.right.start_with?(ATTRIBUTE_ALIAS_PREFIX) }
filtered_select_values = select_values.map do |value|
select_nodes = select_values.select { |value| value.respond_to?(:right) && value.respond_to?(:left) }

if select_nodes.any? { |value| value.right.start_with?(ATTRIBUTE_ALIAS_PREFIX) }
filtered_select_nodes = select_nodes.map do |value|
value.right.start_with?(ATTRIBUTE_ALIAS_PREFIX) ? value.left : value
end

# Copied from lib/active_record/relation/calculations.rb
with_connection do |conn|
arel_columns(filtered_select_values).map { |column| conn.visitor.compile(column) }.join(", ")
arel_columns(filtered_select_nodes).map { |column| conn.visitor.compile(column) }.join(", ")
end
else
super
Expand Down