Skip to content

Fix offset-only aggregate queries #2

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

Draft
wtsnz wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix offset-only aggregate queries #2

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
17 changes: 11 additions & 6 deletions lib/aggregate_query.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ defmodule AshSql.AggregateQuery do

{:ok, query} ->
query =
if query.distinct || query.limit do
if query.distinct || query.limit || query.offset do
query =
query
|> Ecto.Query.exclude(:select)
|> Ecto.Query.exclude(:order_by)
|> Map.put(:windows, [])
|> maybe_exclude_subquery_order()

from(row in subquery(query), as: ^query.__ash_bindings__.root_binding, select: %{})
else
Expand Down Expand Up @@ -99,12 +99,12 @@ defmodule AshSql.AggregateQuery do
end

filtered =
if filtered.distinct || filtered.limit do
if filtered.distinct || filtered.limit || filtered.offset do
filtered =
filtered
|> Ecto.Query.exclude(:select)
|> Ecto.Query.exclude(:order_by)
|> Map.put(:windows, [])
|> maybe_exclude_subquery_order()

from(row in subquery(filtered), as: ^query.__ash_bindings__.root_binding, select: %{})
else
Expand Down Expand Up @@ -169,12 +169,12 @@ defmodule AshSql.AggregateQuery do
end

filtered =
if filtered.limit do
if filtered.limit || filtered.offset do
filtered =
filtered
|> Ecto.Query.exclude(:select)
|> Ecto.Query.exclude(:order_by)
|> Map.put(:windows, [])
|> maybe_exclude_subquery_order()

from(row in subquery(filtered), as: ^query.__ash_bindings__.root_binding, select: %{})
else
Expand Down Expand Up @@ -255,4 +255,9 @@ defmodule AshSql.AggregateQuery do
)
end)
end

defp maybe_exclude_subquery_order(%{limit: nil, offset: nil} = query),
do: Ecto.Query.exclude(query, :order_by)

defp maybe_exclude_subquery_order(query), do: query
end