Skip to content

Commit 9902588

Browse files
author
Sven Riedel
committed
Add Ecto.Query.ByExpr structs for ecto 3.12+ next to the old Ecto.Query.QueryExpr structs
1 parent fb9e4ce commit 9902588

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

lib/mongo_ecto/normalized_query.ex

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -769,19 +769,28 @@ defmodule Mongo.Ecto.NormalizedQuery do
769769

770770
defp order(%Query{order_bys: order_bys} = query, {_coll, _model, pk}) do
771771
order_bys
772-
|> Enum.flat_map(fn %Query.QueryExpr{expr: expr} ->
773-
Enum.map(expr, &order_by_expr(&1, pk, query))
772+
|> Enum.flat_map(fn
773+
%Query.QueryExpr{expr: expr} ->
774+
Enum.map(expr, &order_by_expr(&1, pk, query))
775+
%Query.ByExpr{expr: expr} ->
776+
Enum.map(expr, &order_by_expr(&1, pk, query))
774777
end)
775778
|> map_unless_empty
776779
end
777780

778781
defp command(:update, %Query{updates: updates} = query, params, {_coll, _model, pk}) do
779782
updates
780-
|> Enum.flat_map(fn %Query.QueryExpr{expr: expr} ->
781-
Enum.map(expr, fn {key, value} ->
782-
value = value |> value(params, pk, query, "update clause")
783-
{update_op(key, query), value}
784-
end)
783+
|> Enum.flat_map(fn
784+
%Query.QueryExpr{expr: expr} ->
785+
Enum.map(expr, fn {key, value} ->
786+
value = value |> value(params, pk, query, "update clause")
787+
{update_op(key, query), value}
788+
end)
789+
%Query.ByExpr{expr: expr} ->
790+
Enum.map(expr, fn {key, value} ->
791+
value = value |> value(params, pk, query, "update clause")
792+
{update_op(key, query), value}
793+
end)
785794
end)
786795
|> merge_keys(query, "update clause")
787796
end

0 commit comments

Comments
 (0)