Do not assume JoinExpr.on is a QueryExpr

lib/ecto/adapters/myxql/connection.ex

@@ -502,7 +502,7 @@ if Code.ensure_loaded?(MyXQL) do
         end)
 
       wheres =
-        for %JoinExpr{on: %QueryExpr{expr: value} = expr} <- joins,
+        for %JoinExpr{on: %{expr: value} = expr} <- joins,
             value != true,
             do: expr |> Map.put(:__struct__, BooleanExpr) |> Map.put(:op, :and)
 
@@ -513,7 +513,7 @@ if Code.ensure_loaded?(MyXQL) do
 
     defp join(%{joins: joins} = query, sources) do
       Enum.map(joins, fn
-        %JoinExpr{on: %QueryExpr{expr: expr}, qual: qual, ix: ix, source: source, hints: hints} ->
+        %JoinExpr{on: %{expr: expr}, qual: qual, ix: ix, source: source, hints: hints} ->
           {join, name} = get_source(query, sources, ix, source)
 
           [

lib/ecto/adapters/postgres/connection.ex

@@ -705,7 +705,7 @@ if Code.ensure_loaded?(Postgrex) do
       join_clauses = join(%{query | joins: other_joins}, sources)
 
       wheres =
-        for %JoinExpr{on: %QueryExpr{expr: value} = expr} <- inner_joins,
+        for %JoinExpr{on: %{expr: value} = expr} <- inner_joins,
             value != true,
             do: expr |> Map.put(:__struct__, BooleanExpr) |> Map.put(:op, :and)
 
@@ -724,7 +724,7 @@ if Code.ensure_loaded?(Postgrex) do
         end)
 
       wheres =
-        for %JoinExpr{on: %QueryExpr{expr: value} = expr} <- joins,
+        for %JoinExpr{on: %{expr: value} = expr} <- joins,
             value != true,
             do: expr |> Map.put(:__struct__, BooleanExpr) |> Map.put(:op, :and)
 
@@ -738,7 +738,7 @@ if Code.ensure_loaded?(Postgrex) do
         ?\s
         | Enum.map_intersperse(joins, ?\s, fn
             %JoinExpr{
-              on: %QueryExpr{expr: expr},
+              on: %{expr: expr},
               qual: qual,
               ix: ix,
               source: source,

lib/ecto/adapters/tds/connection.ex

@@ -542,7 +542,7 @@ if Code.ensure_loaded?(Tds) do
       [
         ?\s,
         Enum.map_intersperse(joins, ?\s, fn
-          %JoinExpr{on: %QueryExpr{expr: expr}, qual: qual, ix: ix, source: source, hints: hints} ->
+          %JoinExpr{on: %{expr: expr}, qual: qual, ix: ix, source: source, hints: hints} ->
             {join, name} = get_source(query, sources, ix, source)
             qual_text = join_qual(qual, query)
             join = join || ["(", expr(source, sources, query) | ")"]

test/ecto/adapters/myxql_test.exs

@@ -1369,6 +1369,23 @@ defmodule Ecto.Adapters.MyXQLTest do
              "SELECT s0.`id`, s1.`id` FROM `schema` AS s0 LEFT OUTER JOIN `schema2` AS s1 ON TRUE"
   end
 
+  test "update all with interpolated join query" do
+    inner = from(s in Schema2, where: s.z > 10)
+
+    query =
+      from(m in Schema, join: x in ^inner, on: m.x == x.z, update: [set: [x: 0]])
+      |> plan(:update_all)
+
+    assert update_all(query) == ~s{UPDATE `schema` AS s0, `schema2` AS s1 SET s0.`x` = 0 WHERE ((s1.`z` > 10) AND (s0.`x` = s1.`z`))}
+  end
+
+  test "delete all with interpolated join query" do
+    inner = from(s in Schema2, where: s.z > 10)
+    query = from(m in Schema, join: x in ^inner, on: m.x == x.z) |> plan(:delete_all)
+
+    assert delete_all(query) == ~s{DELETE s0.* FROM `schema` AS s0 INNER JOIN `schema2` AS s1 ON (s1.`z` > 10) AND (s0.`x` = s1.`z`)}
+  end
+
   test "lateral join with fragment" do
     query =
       Schema

test/ecto/adapters/postgres_test.exs

@@ -1733,6 +1733,23 @@ defmodule Ecto.Adapters.PostgresTest do
              "SELECT s0.\"id\", s1.\"id\" FROM \"schema\" AS s0 LEFT OUTER JOIN \"schema2\" AS s1 ON TRUE"
   end
 
+  test "update all with interpolated join query" do
+    inner = from(s in Schema2, where: s.z > 10)
+
+    query =
+      from(m in Schema, join: x in ^inner, on: m.x == x.z, update: [set: [x: 0]])
+      |> plan(:update_all)
+
+    assert update_all(query) == ~s{UPDATE "schema" AS s0 SET "x" = 0 FROM "schema2" AS s1 WHERE ((s1."z" > 10) AND (s0."x" = s1."z"))}
+  end
+
+  test "delete all with interpolated join query" do
+    inner = from(s in Schema2, where: s.z > 10)
+    query = from(m in Schema, join: x in ^inner, on: m.x == x.z) |> plan(:delete_all)
+
+    assert delete_all(query) == ~s{DELETE FROM "schema" AS s0 USING "schema2" AS s1 WHERE ((s1."z" > 10) AND (s0."x" = s1."z"))}
+  end
+
   test "lateral join with fragment" do
     query =
       Schema

test/ecto/adapters/tds_test.exs

@@ -1215,6 +1215,23 @@ defmodule Ecto.Adapters.TdsTest do
              "SELECT s0.[id], s1.[id] FROM [schema] AS s0 LEFT OUTER JOIN [schema2] AS s1 ON 1 = 1"
   end
 
+  test "update all with interpolated join query" do
+    inner = from(s in Schema2, where: s.z > 10)
+
+    query =
+      from(m in Schema, join: x in ^inner, on: m.x == x.z, update: [set: [x: 0]])
+      |> plan(:update_all)
+
+    assert update_all(query) == ~s{UPDATE s0 SET s0.[x] = 0 FROM [schema] AS s0 INNER JOIN [schema2] AS s1 ON (s1.[z] > 10) AND (s0.[x] = s1.[z])}
+  end
+
+  test "delete all with interpolated join query" do
+    inner = from(s in Schema2, where: s.z > 10)
+    query = from(m in Schema, join: x in ^inner, on: m.x == x.z) |> plan(:delete_all)
+
+    assert delete_all(query) == ~s{DELETE s0 FROM [schema] AS s0 INNER JOIN [schema2] AS s1 ON (s1.[z] > 10) AND (s0.[x] = s1.[z])}
+  end
+
   test "join produces correct bindings" do
     query = from(p in Schema, join: c in Schema2, on: true)
     query = from(p in query, join: c in Schema2, on: true, select: {p.id, c.id})