Skip to content

Commit 6013772

Browse files
v0idpwnv0idpwn
authored
Fix warnings in tests (#509)
Some tests used joins without `:on`, which recently started giving warnings.
1 parent 69b7d54 commit 6013772

3 files changed

Lines changed: 36 additions & 18 deletions

File tree

‎test/ecto/adapters/myxql_test.exs‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ defmodule Ecto.Adapters.MyXQLTest do
265265
from(c in "categories",
266266
as: :parent_category,
267267
left_lateral_join: b in subquery(breadcrumbs_query),
268+
on: true,
268269
select: %{id: c.id, breadcrumbs: b.breadcrumbs}
269270
)
270271
|> plan()
@@ -926,7 +927,7 @@ defmodule Ecto.Adapters.MyXQLTest do
926927

927928
test "join with hints" do
928929
assert Schema
929-
|> join(:inner, [p], q in Schema2, hints: ["USE INDEX FOO", "USE INDEX BAR"])
930+
|> join(:inner, [p], q in Schema2, on: true, hints: ["USE INDEX FOO", "USE INDEX BAR"])
930931
|> select([], true)
931932
|> plan()
932933
|> all() == ~s{SELECT TRUE FROM `schema` AS s0 INNER JOIN `schema2` AS s1 USE INDEX FOO USE INDEX BAR ON TRUE}
@@ -958,7 +959,7 @@ defmodule Ecto.Adapters.MyXQLTest do
958959
~s{INNER JOIN (SELECT sp0.`x` AS `x`, sp0.`y` AS `z` FROM `posts` AS sp0 WHERE (sp0.`title` = ?)) AS s1 ON TRUE}
959960

960961
posts = subquery("posts" |> where(title: parent_as(:comment).subtitle) |> select([r], r.title))
961-
query = "comments" |> from(as: :comment) |> join(:inner, [c], p in subquery(posts)) |> select([_, p], p) |> plan()
962+
query = "comments" |> from(as: :comment) |> join(:inner, [c], p in subquery(posts), on: true) |> select([_, p], p) |> plan()
962963
assert all(query) ==
963964
"SELECT s1.`title` FROM `comments` AS c0 " <>
964965
"INNER JOIN (SELECT sp0.`title` AS `title` FROM `posts` AS sp0 WHERE (sp0.`title` = c0.`subtitle`)) AS s1 ON TRUE"
@@ -976,7 +977,7 @@ defmodule Ecto.Adapters.MyXQLTest do
976977

977978
test "join with fragment" do
978979
query = Schema
979-
|> join(:inner, [p], q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10))
980+
|> join(:inner, [p], q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10), on: true)
980981
|> select([p], {p.id, ^0})
981982
|> where([p], p.id > 0 and p.id < ^100)
982983
|> plan()
@@ -998,14 +999,19 @@ defmodule Ecto.Adapters.MyXQLTest do
998999

9991000
test "join with query interpolation" do
10001001
inner = Ecto.Queryable.to_query(Schema2)
1001-
query = from(p in Schema, left_join: c in ^inner, select: {p.id, c.id}) |> plan()
1002+
query =
1003+
from(p in Schema, left_join: c in ^inner, on: true, select: {p.id, c.id})
1004+
|> plan()
10021005
assert all(query) ==
10031006
"SELECT s0.`id`, s1.`id` FROM `schema` AS s0 LEFT OUTER JOIN `schema2` AS s1 ON TRUE"
10041007
end
10051008

10061009
test "lateral join with fragment" do
10071010
query = Schema
1008-
|> join(:inner_lateral, [p], q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10))
1011+
|> join(:inner_lateral, [p],
1012+
q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10),
1013+
on: true
1014+
)
10091015
|> select([p, q], {p.id, q.z})
10101016
|> where([p], p.id > 0 and p.id < ^100)
10111017
|> plan()

‎test/ecto/adapters/postgres_test.exs‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@ defmodule Ecto.Adapters.PostgresTest do
342342
from(c in "categories",
343343
as: :parent_category,
344344
left_lateral_join: b in subquery(breadcrumbs_query),
345+
on: true,
345346
select: %{id: c.id, breadcrumbs: b.breadcrumbs}
346347
)
347348
|> plan()
@@ -1148,7 +1149,7 @@ defmodule Ecto.Adapters.PostgresTest do
11481149
test "join with hints" do
11491150
assert_raise Ecto.QueryError, ~r/table hints are not supported by PostgreSQL/, fn ->
11501151
Schema
1151-
|> join(:inner, [p], q in Schema2, hints: ["USE INDEX FOO", "USE INDEX BAR"])
1152+
|> join(:inner, [p], q in Schema2, hints: ["USE INDEX FOO", "USE INDEX BAR"], on: true)
11521153
|> select([], true)
11531154
|> plan()
11541155
|> all()
@@ -1181,7 +1182,11 @@ defmodule Ecto.Adapters.PostgresTest do
11811182
~s{INNER JOIN (SELECT sp0."x" AS "x", sp0."y" AS "z" FROM "posts" AS sp0 WHERE (sp0."title" = $1)) AS s1 ON TRUE}
11821183

11831184
posts = subquery("posts" |> where(title: parent_as(:comment).subtitle) |> select([r], r.title))
1184-
query = "comments" |> from(as: :comment) |> join(:inner, [c], p in subquery(posts)) |> select([_, p], p) |> plan()
1185+
query = "comments"
1186+
|> from(as: :comment)
1187+
|> join(:inner, [c], p in subquery(posts), on: true)
1188+
|> select([_, p], p)
1189+
|> plan()
11851190
assert all(query) ==
11861191
~s{SELECT s1."title" FROM "comments" AS c0 } <>
11871192
~s{INNER JOIN (SELECT sp0."title" AS "title" FROM "posts" AS sp0 WHERE (sp0."title" = c0."subtitle")) AS s1 ON TRUE}
@@ -1199,7 +1204,11 @@ defmodule Ecto.Adapters.PostgresTest do
11991204

12001205
test "join with fragment" do
12011206
query = Schema
1202-
|> join(:inner, [p], q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10))
1207+
|> join(:inner,
1208+
[p],
1209+
q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10),
1210+
on: true
1211+
)
12031212
|> select([p], {p.id, ^0})
12041213
|> where([p], p.id > 0 and p.id < ^100)
12051214
|> plan()
@@ -1221,14 +1230,14 @@ defmodule Ecto.Adapters.PostgresTest do
12211230

12221231
test "join with query interpolation" do
12231232
inner = Ecto.Queryable.to_query(Schema2)
1224-
query = from(p in Schema, left_join: c in ^inner, select: {p.id, c.id}) |> plan()
1233+
query = from(p in Schema, left_join: c in ^inner, on: true, select: {p.id, c.id}) |> plan()
12251234
assert all(query) ==
12261235
"SELECT s0.\"id\", s1.\"id\" FROM \"schema\" AS s0 LEFT OUTER JOIN \"schema2\" AS s1 ON TRUE"
12271236
end
12281237

12291238
test "lateral join with fragment" do
12301239
query = Schema
1231-
|> join(:inner_lateral, [p], q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10))
1240+
|> join(:inner_lateral, [p], q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10), on: true)
12321241
|> select([p, q], {p.id, q.z})
12331242
|> where([p], p.id > 0 and p.id < ^100)
12341243
|> plan()

‎test/ecto/adapters/tds_test.exs‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ defmodule Ecto.Adapters.TdsTest do
188188
query =
189189
"comments"
190190
|> from(as: :comment)
191-
|> join(:inner, [c], p in subquery(posts))
191+
|> join(:inner, [c], p in subquery(posts), on: true)
192192
|> select([_, p], p)
193193
|> plan()
194194

@@ -337,7 +337,7 @@ defmodule Ecto.Adapters.TdsTest do
337337
|> select([:id, :parent_id])
338338

339339
cte_query = initial_query |> union_all(^iteration_query)
340-
340+
341341
breadcrumbs_query =
342342
"tree"
343343
|> recursive_ctes(true)
@@ -348,6 +348,7 @@ defmodule Ecto.Adapters.TdsTest do
348348
from(c in "categories",
349349
as: :parent_category,
350350
left_lateral_join: b in subquery(breadcrumbs_query),
351+
on: true,
351352
select: %{id: c.id, breadcrumbs: b.breadcrumbs}
352353
)
353354
|> plan()
@@ -978,7 +979,7 @@ defmodule Ecto.Adapters.TdsTest do
978979

979980
test "join with hints" do
980981
assert Schema
981-
|> join(:inner, [p], q in Schema2, hints: ["USE INDEX FOO", "USE INDEX BAR"])
982+
|> join(:inner, [p], q in Schema2, hints: ["USE INDEX FOO", "USE INDEX BAR"], on: true)
982983
|> select([], true)
983984
|> plan()
984985
|> all() ==
@@ -1018,7 +1019,8 @@ defmodule Ecto.Adapters.TdsTest do
10181019
|> join(
10191020
:inner,
10201021
[p],
1021-
q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10)
1022+
q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10),
1023+
on: true
10221024
)
10231025
|> select([p], {p.id, ^0})
10241026
|> where([p], p.id > 0 and p.id < ^100)
@@ -1040,7 +1042,8 @@ defmodule Ecto.Adapters.TdsTest do
10401042
SELECT *
10411043
FROM schema2 AS s2
10421044
WHERE s2.id = ? AND s2.field = ?
1043-
""", p.x, ^10)
1045+
""", p.x, ^10),
1046+
on: true
10441047
)
10451048
|> select([p], {p.id, ^0})
10461049
|> where([p], p.id > 0 and p.id < ^100)
@@ -1056,7 +1059,7 @@ defmodule Ecto.Adapters.TdsTest do
10561059

10571060
test "inner lateral join with fragment" do
10581061
query = Schema
1059-
|> join(:inner_lateral, [p], q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10))
1062+
|> join(:inner_lateral, [p], q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10), on: true)
10601063
|> select([p, q], {p.id, q.z})
10611064
|> where([p], p.id > 0 and p.id < ^100)
10621065
|> plan()
@@ -1068,7 +1071,7 @@ defmodule Ecto.Adapters.TdsTest do
10681071

10691072
test "left lateral join with fragment" do
10701073
query = Schema
1071-
|> join(:left_lateral, [p], q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10))
1074+
|> join(:left_lateral, [p], q in fragment("SELECT * FROM schema2 AS s2 WHERE s2.id = ? AND s2.field = ?", p.x, ^10), on: true)
10721075
|> select([p, q], {p.id, q.z})
10731076
|> where([p], p.id > 0 and p.id < ^100)
10741077
|> plan()
@@ -1091,7 +1094,7 @@ defmodule Ecto.Adapters.TdsTest do
10911094

10921095
test "join with query interpolation" do
10931096
inner = Ecto.Queryable.to_query(Schema2)
1094-
query = from(p in Schema, left_join: c in ^inner, select: {p.id, c.id}) |> plan()
1097+
query = from(p in Schema, left_join: c in ^inner, on: true, select: {p.id, c.id}) |> plan()
10951098

10961099
assert all(query) ==
10971100
"SELECT s0.[id], s1.[id] FROM [schema] AS s0 LEFT OUTER JOIN [schema2] AS s1 ON 1 = 1"

0 commit comments

Comments
 (0)