Skip to content

improvement: support the Duration form of ago, from_now, datetime_add… #245

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 1 commit into from
Aug 14, 2026
Merged

improvement: support the Duration form of ago, from_now, datetime_add… #245

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
104 changes: 104 additions & 0 deletions lib/expr.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,27 @@ defmodule AshSql.Expr do
), acc}
end

defp default_dynamic_expr(
query,
%Ago{arguments: [duration], embedded?: pred_embedded?},
bindings,
embedded?,
acc,
_type
) do
{duration, acc} =
do_dynamic_expr(
query,
duration,
set_location(bindings, :sub_expr),
pred_embedded? || embedded?,
acc,
:duration
)

{Ecto.Query.dynamic(fragment("(?::timestamp - ?)", ^DateTime.utc_now(), ^duration)), acc}
end

defp default_dynamic_expr(
query,
%StartOfDay{arguments: [value], embedded?: pred_embedded?},
Expand Down Expand Up @@ -446,6 +467,27 @@ defmodule AshSql.Expr do
), acc}
end

defp default_dynamic_expr(
query,
%FromNow{arguments: [duration], embedded?: pred_embedded?},
bindings,
embedded?,
acc,
_type
) do
{duration, acc} =
do_dynamic_expr(
query,
duration,
set_location(bindings, :sub_expr),
pred_embedded? || embedded?,
acc,
:duration
)

{Ecto.Query.dynamic(fragment("(?::timestamp + ?)", ^DateTime.utc_now(), ^duration)), acc}
end

defp default_dynamic_expr(
query,
%DateTimeAdd{arguments: [datetime, amount, interval], embedded?: pred_embedded?},
Expand Down Expand Up @@ -478,6 +520,36 @@ defmodule AshSql.Expr do
acc}
end

defp default_dynamic_expr(
query,
%DateTimeAdd{arguments: [datetime, duration], embedded?: pred_embedded?},
bindings,
embedded?,
acc,
_type
) do
{datetime, acc} =
do_dynamic_expr(
query,
datetime,
set_location(bindings, :sub_expr),
pred_embedded? || embedded?,
acc
)

{duration, acc} =
do_dynamic_expr(
query,
duration,
set_location(bindings, :sub_expr),
pred_embedded? || embedded?,
acc,
:duration
)

{Ecto.Query.dynamic(fragment("(?::timestamp + ?)", ^datetime, ^duration)), acc}
end

defp default_dynamic_expr(
query,
%DateAdd{arguments: [date, amount, interval], embedded?: pred_embedded?},
Expand Down Expand Up @@ -509,6 +581,38 @@ defmodule AshSql.Expr do
{Ecto.Query.dynamic(fragment("(?)", date_add(^date, ^amount, ^to_string(interval)))), acc}
end

defp default_dynamic_expr(
query,
%DateAdd{arguments: [date, duration], embedded?: pred_embedded?},
bindings,
embedded?,
acc,
_type
) do
{date, acc} =
do_dynamic_expr(
query,
date,
set_location(bindings, :sub_expr),
pred_embedded? || embedded?,
acc
)

{duration, acc} =
do_dynamic_expr(
query,
duration,
set_location(bindings, :sub_expr),
pred_embedded? || embedded?,
acc,
:duration
)

# `date + interval` is a timestamp in Postgres, so cast back, as Ecto's own
# `date_add/3` does.
{Ecto.Query.dynamic(fragment("((?::date + ?)::date)", ^date, ^duration)), acc}
end

defp default_dynamic_expr(
query,
%GetPath{
Expand Down
Loading