Skip to content

feat: render the range expressions to their Postgres operators #248

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
zachdaniel merged 2 commits into from
Aug 20, 2026
Merged

feat: render the range expressions to their Postgres operators #248

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d45b52
feat: render the range expressions to their Postgres operators
matt-beanland Aug 19, 2026
22bcd05
Merge remote-tracking branch 'upstream/main' into feat/range-expressions
matt-beanland Aug 20, 2026
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
121 changes: 121 additions & 0 deletions lib/expr.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ defmodule AshSql.Expr do
Lazy,
Length,
Now,
RangeAdjacent,
RangeContains,
RangeLower,
RangeOverlaps,
RangeUpper,
Rem,
Round,
StartOfDay,
Expand Down Expand Up @@ -1167,6 +1172,114 @@ defmodule AshSql.Expr do
end
end

defp default_dynamic_expr(
query,
%RangeOverlaps{arguments: [left, right], embedded?: pred_embedded?},
bindings,
embedded?,
acc,
_type
) do
{[left_type, right_type], _type} =
determine_types(bindings.sql_behaviour, RangeOverlaps, [left, right], :boolean)

{left_expr, acc} =
range_operand(query, left, left_type, bindings, pred_embedded? || embedded?, acc)

{right_expr, acc} =
range_operand(query, right, right_type, bindings, pred_embedded? || embedded?, acc)

{Ecto.Query.dynamic(fragment("(? && ?)", ^left_expr, ^right_expr)), acc}
end

defp default_dynamic_expr(
query,
%RangeContains{arguments: [left, right], embedded?: pred_embedded?},
bindings,
embedded?,
acc,
_type
) do
{[left_type, right_type], _type} =
determine_types(bindings.sql_behaviour, RangeContains, [left, right], :boolean)

{left_expr, acc} =
range_operand(query, left, left_type, bindings, pred_embedded? || embedded?, acc)

{right_expr, acc} =
range_operand(query, right, right_type, bindings, pred_embedded? || embedded?, acc)

{Ecto.Query.dynamic(fragment("(? @> ?)", ^left_expr, ^right_expr)), acc}
end

defp default_dynamic_expr(
query,
%RangeAdjacent{arguments: [left, right], embedded?: pred_embedded?},
bindings,
embedded?,
acc,
_type
) do
{[left_type, right_type], _type} =
determine_types(bindings.sql_behaviour, RangeAdjacent, [left, right], :boolean)

{left_expr, acc} =
range_operand(query, left, left_type, bindings, pred_embedded? || embedded?, acc)

{right_expr, acc} =
range_operand(query, right, right_type, bindings, pred_embedded? || embedded?, acc)

{Ecto.Query.dynamic(fragment("(? -|- ?)", ^left_expr, ^right_expr)), acc}
end

defp default_dynamic_expr(
query,
%RangeLower{arguments: [range], embedded?: pred_embedded?},
bindings,
embedded?,
acc,
type
) do
{[determined_type], type} =
determine_types(bindings.sql_behaviour, RangeLower, [range], type)

{range_expr, acc} =
do_dynamic_expr(
query,
range,
set_location(bindings, :sub_expr),
pred_embedded? || embedded?,
acc,
determined_type || type
)

{Ecto.Query.dynamic(fragment("lower(?)", ^range_expr)), acc}
end

defp default_dynamic_expr(
query,
%RangeUpper{arguments: [range], embedded?: pred_embedded?},
bindings,
embedded?,
acc,
type
) do
{[determined_type], type} =
determine_types(bindings.sql_behaviour, RangeUpper, [range], type)

{range_expr, acc} =
do_dynamic_expr(
query,
range,
set_location(bindings, :sub_expr),
pred_embedded? || embedded?,
acc,
determined_type || type
)

{Ecto.Query.dynamic(fragment("upper(?)", ^range_expr)), acc}
end

defp default_dynamic_expr(
query,
%Length{arguments: [list], embedded?: pred_embedded?},
Expand Down Expand Up @@ -3205,6 +3318,14 @@ defmodule AshSql.Expr do
end
end

defp range_operand(query, operand, nil, bindings, embedded?, acc) do
do_dynamic_expr(query, operand, set_location(bindings, :sub_expr), embedded?, acc, nil)
end

defp range_operand(query, operand, type, bindings, embedded?, acc) do
maybe_type_expr(query, operand, set_location(bindings, :sub_expr), embedded?, acc, type)
end

defp extract_list_value(value) when is_list(value), do: {:ok, value}
defp extract_list_value(%MapSet{} = value), do: {:ok, value}

Expand Down
Loading