Maybe paren for expr inside fragment (#702)

Author: dkuku

lib/ecto/adapters/myxql/connection.ex

@@ -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

lib/ecto/adapters/postgres/connection.ex

@@ -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

lib/ecto/adapters/tds/connection.ex

@@ -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

test/ecto/adapters/myxql_test.exs

@@ -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

test/ecto/adapters/postgres_test.exs

@@ -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

test/ecto/adapters/tds_test.exs

@@ -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