Skip to content

Commit 1c2e6f0

Browse files
committed
Improve some test formatting
1 parent bd96c23 commit 1c2e6f0

File tree

1 file changed

+39
-13
lines changed

1 file changed

+39
-13
lines changed

test/ecto/adapters/sqlite3/connection_test.exs

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
defmodule Ecto.Adapters.SQLite3.ConnectionTest do
2-
use ExUnit.Case, async: false
2+
use ExUnit.Case, async: true
33

44
import Ecto.Query
55

@@ -621,22 +621,41 @@ defmodule Ecto.Adapters.SQLite3.ConnectionTest do
621621
end
622622

623623
test "fragments" do
624-
query = Schema |> select([r], fragment("now")) |> plan()
624+
query =
625+
Schema
626+
|> select([r], fragment("now"))
627+
|> plan()
628+
625629
assert all(query) == ~s{SELECT now FROM "schema" AS s0}
626630

627-
query = Schema |> select([r], fragment("fun(?)", r)) |> plan()
631+
query =
632+
Schema
633+
|> select([r], fragment("fun(?)", r))
634+
|> plan()
635+
628636
assert all(query) == ~s{SELECT fun(s0) FROM "schema" AS s0}
629637

630-
query = Schema |> select([r], fragment("downcase(?)", r.x)) |> plan()
638+
query =
639+
Schema
640+
|> select([r], fragment("downcase(?)", r.x))
641+
|> plan()
642+
631643
assert all(query) == ~s{SELECT downcase(s0."x") FROM "schema" AS s0}
632644

633645
query =
634-
Schema |> select([r], fragment("? COLLATE ?", r.x, literal(^"es_ES"))) |> plan()
646+
Schema
647+
|> select([r], fragment("? COLLATE ?", r.x, literal(^"es_ES")))
648+
|> plan()
635649

636650
assert all(query) == ~s{SELECT s0."x" COLLATE "es_ES" FROM "schema" AS s0}
637651

638652
value = 13
639-
query = Schema |> select([r], fragment("downcase(?, ?)", r.x, ^value)) |> plan()
653+
654+
query =
655+
Schema
656+
|> select([r], fragment("downcase(?, ?)", r.x, ^value))
657+
|> plan()
658+
640659
assert all(query) == ~s{SELECT downcase(s0."x", ?) FROM "schema" AS s0}
641660

642661
query = Schema |> select([], fragment(title: 2)) |> plan()
@@ -1094,8 +1113,7 @@ defmodule Ecto.Adapters.SQLite3.ConnectionTest do
10941113

10951114
query = from(m in Schema, update: [set: [x: ^0]]) |> plan(:update_all)
10961115

1097-
assert update_all(query) ==
1098-
~s{UPDATE "schema" AS s0 SET "x" = ?}
1116+
assert update_all(query) == ~s{UPDATE "schema" AS s0 SET "x" = ?}
10991117

11001118
query =
11011119
Schema
@@ -1552,11 +1570,13 @@ defmodule Ecto.Adapters.SQLite3.ConnectionTest do
15521570
inner = Ecto.Queryable.to_query(Schema2)
15531571

15541572
query =
1555-
from(p in Schema, left_join: c in ^inner, on: true, select: {p.id, c.id})
1573+
from(p in Schema)
1574+
|> join(:left, [p], c in ^inner, on: true)
1575+
|> select([p, c], {p.id, c.id})
15561576
|> plan()
15571577

15581578
assert all(query) ==
1559-
"SELECT s0.\"id\", s1.\"id\" FROM \"schema\" AS s0 LEFT OUTER JOIN \"schema2\" AS s1 ON 1"
1579+
~s{SELECT s0."id", s1."id" FROM "schema" AS s0 LEFT OUTER JOIN "schema2" AS s1 ON 1}
15601580
end
15611581

15621582
test "lateral join with fragment" do
@@ -1603,15 +1623,21 @@ defmodule Ecto.Adapters.SQLite3.ConnectionTest do
16031623
end
16041624

16051625
test "cross join" do
1606-
query = from(p in Schema, cross_join: c in Schema2, select: {p.id, c.id}) |> plan()
1626+
query =
1627+
from(p in Schema)
1628+
|> join(:cross, [p], c in Schema2)
1629+
|> select([p, c], {p.id, c.id})
1630+
|> plan()
16071631

16081632
assert all(query) ==
1609-
"SELECT s0.\"id\", s1.\"id\" FROM \"schema\" AS s0 CROSS JOIN \"schema2\" AS s1"
1633+
~s{SELECT s0."id", s1."id" FROM "schema" AS s0 CROSS JOIN "schema2" AS s1}
16101634
end
16111635

16121636
test "cross join with fragment" do
16131637
query =
1614-
from(p in Schema, cross_join: fragment("json_each(?)", p.j), select: {p.id})
1638+
from(p in Schema)
1639+
|> join(:cross, [p], fragment("json_each(?)", p.j))
1640+
|> select([p], {p.id})
16151641
|> plan()
16161642

16171643
assert all(query) ==

0 commit comments

Comments
 (0)