Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/ecto/adapters/myxql/connection.ex
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@ if Code.ensure_loaded?(MyXQL) do
defp fragment_expr(parts, sources, query) do
Enum.map(parts, fn
{:raw, part} -> part
{:expr, expr} -> expr(expr, sources, query)
{:expr, expr} -> op_to_binary(expr, sources, query)
end)
|> parens_for_select()
end
Expand Down
2 changes: 1 addition & 1 deletion lib/ecto/adapters/postgres/connection.ex
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,7 @@ if Code.ensure_loaded?(Postgrex) do
defp fragment_expr(parts, sources, query) do
Enum.map(parts, fn
{:raw, part} -> part
{:expr, expr} -> expr(expr, sources, query)
{:expr, expr} -> maybe_paren(expr, sources, query)
end)
|> parens_for_select()
end
Expand Down
2 changes: 1 addition & 1 deletion lib/ecto/adapters/tds/connection.ex
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,7 @@ if Code.ensure_loaded?(Tds) do
defp fragment_expr(parts, sources, query) do
Enum.map(parts, fn
{:raw, part} -> part
{:expr, expr} -> expr(expr, sources, query)
{:expr, expr} -> op_to_binary(expr, sources, query)
end)
|> parens_for_select()
end
Expand Down
6 changes: 6 additions & 0 deletions test/ecto/adapters/myxql_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,12 @@ defmodule Ecto.Adapters.MyXQLTest do
assert_raise Ecto.QueryError, fn ->
all(query)
end

query = Schema |> select([r], fragment("CAST(? AS INT)", r.x and r.y)) |> plan()
assert all(query) == ~s{SELECT CAST((s0.`x` AND s0.`y`) AS INT) FROM `schema` AS s0}

query = Schema |> select([r], fragment("CAST(? AS INT)", r.x or r.y)) |> plan()
assert all(query) == ~s{SELECT CAST((s0.`x` OR s0.`y`) AS INT) FROM `schema` AS s0}
end

test "literals" do
Expand Down
6 changes: 6 additions & 0 deletions test/ecto/adapters/postgres_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,12 @@ defmodule Ecto.Adapters.PostgresTest do
assert_raise Ecto.QueryError, fn ->
all(query)
end

query = Schema |> select([r], fragment("?::integer", r.x and r.y)) |> plan()
assert all(query) == ~s{SELECT (s0."x" AND s0."y")::integer FROM "schema" AS s0}

query = Schema |> select([r], fragment("?::integer", r.x or r.y)) |> plan()
assert all(query) == ~s{SELECT (s0."x" OR s0."y")::integer FROM "schema" AS s0}
end

test "literals" do
Expand Down
6 changes: 6 additions & 0 deletions test/ecto/adapters/tds_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,12 @@ defmodule Ecto.Adapters.TdsTest do
fn ->
all(query)
end

query = Schema |> select([r], fragment("CAST(? AS INT)", r.x and r.y)) |> plan()
assert all(query) == ~s{SELECT CAST((s0.[x] AND s0.[y]) AS INT) FROM [schema] AS s0}

query = Schema |> select([r], fragment("CAST(? AS INT)", r.x or r.y)) |> plan()
assert all(query) == ~s{SELECT CAST((s0.[x] OR s0.[y]) AS INT) FROM [schema] AS s0}
end

test "literals" do
Expand Down
Loading