8000 Fix issue with macro expansion in `over` clause's `order_by` by Gigitsu · Pull Request #4630 · elixir-ecto/ecto · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix issue with macro expansion in over clause's order_by #4630

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
merged 2 commits into from
Jun 23, 2025
Merged

Fix issue with macro expansion in over clause's order_by #4630

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
5bf41cd
fix macro expansion in over order_by
Gigitsu Jun 23, 2025
bacdf73
move macros inside `select_test` file
Gigitsu Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
8000 Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/ecto/query/builder/order_by.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ defmodule Ecto.Query.Builder.OrderBy do

defp do_escape({dir, expr}, params_acc, kind, vars, env) do
fun = &escape_expansion(kind, &1, &2, &3, &4, &5)
{ast, params_acc} = Builder.escape(expr, :any, params_acc, vars, {env, fun})
{ast, params_acc} = Builder.escape(expr, :any, params_acc, vars, {get_env(env), fun})
{[{quoted_dir!(kind, dir), ast}], params_acc}
end

defp do_escape(expr, params_acc, kind, vars, env) do
fun = &escape_expansion(kind, &1, &2, &3, &4, &5)
{ast, params_acc} = Builder.escape(expr, :any, params_acc, vars, {env, fun})
{ast, params_acc} = Builder.escape(expr, :any, params_acc, vars, {get_env(env), fun})

if is_list(ast) do
{ast, params_acc}
Expand All @@ -90,6 +90,9 @@ defmodule Ecto.Query.Builder.OrderBy do
end
end

defp get_env({env, _}), do: env
defp get_env(env), do: env

defp escape_expansion(kind, expr, _type, params_acc, vars, env) when is_list(expr) do
escape(kind, expr, params_acc, vars, env)
end
Expand Down
47 changes: 47 additions & 0 deletions test/ecto/query/builder/select_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,53 @@ defmodule Ecto.Query.Builder.SelectTest do
assert %{alias: _} = query.select.aliases
end

defmacro my_custom_field(p) do
quote do
fragment("lower(?)", unquote(p).title)
end
end

defmacro my_complex_order(p) do
quote do
[desc: unquote(p).id, asc: my_custom_field(unquote(p)), asc: nth_value(unquote(p).links, 1)]
end
end

test "supports macro expansion in over/2" do
query = from p in "posts", select: %{row_number: over(row_number(), order_by: [desc: my_custom_field(p)])}

assert {:%{}, [],
[
row_number:
{:over, [],
[
{:row_number, [], []},
[
order_by: [
desc: {:fragment, [], [raw: "lower(", expr: _, raw: ")"]}
]
]
]}
]} = query.select.expr

query = from p in "posts", select: %{row_number: over(row_number(), order_by: my_complex_order(p))}
assert {:%{}, [],
[
row_number:
{:over, [],
[
{:row_number, [], []},
[
order_by: [
desc: _,
asc: {:fragment, [], [raw: "lower(", expr: _, raw: ")"]},
asc: {:nth_value, [], _}
]
]
]}
]} = query.select.expr
end

test "raises if name given to selected_as/2 is not an atom" do
message = "expected literal atom or interpolated value in selected_as/2, got: `\"ident\"`"

Expand Down
Loading
0