Skip to content

Commit 62a820d

Browse files
committed
Remove deprecated test
1 parent d26c3f0 commit 62a820d

1 file changed

Lines changed: 50 additions & 27 deletions

File tree

test/ecto/repo_test.exs

Lines changed: 50 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -717,23 +717,28 @@ defmodule Ecto.RepoTest do
717717
query = from s in MySchema, select: s
718718
TestRepo.insert_all(MySchema, query)
719719

720-
assert_received {:insert_all, %{source: "my_schema", header: header}, {%Ecto.Query{}, _params}}
720+
assert_received {:insert_all, %{source: "my_schema", header: header},
721+
{%Ecto.Query{}, _params}}
722+
721723
assert header == [:id, :x, :yyy, :z, :array, :map]
722724
end
723725

724726
test "takes query selecting on source with join" do
725727
query = from p in MyParent, join: a in MySchemaWithAssoc, on: true, select: a
726728
TestRepo.insert_all(MySchemaWithAssoc, query)
727729

728-
assert_received {:insert_all, %{source: "my_schema", header: header}, {%Ecto.Query{}, _params}}
730+
assert_received {:insert_all, %{source: "my_schema", header: header},
731+
{%Ecto.Query{}, _params}}
732+
729733
assert header == [:id, :n, :parent_id]
730734
end
731735

732736
test "takes query selecting on source with literal update" do
733737
query = from s in MySchema, select: %{s | x: "x"}
734738
TestRepo.insert_all(MySchema, query)
735739

736-
assert_received {:insert_all, %{source: "my_schema", header: header}, {%Ecto.Query{} = query, _params}}
740+
assert_received {:insert_all, %{source: "my_schema", header: header},
741+
{%Ecto.Query{} = query, _params}}
737742

738743
unchanged_fields = [:id, :yyy, :z, :array, :map]
739744
updated_fields = [:x]
@@ -747,7 +752,8 @@ defmodule Ecto.RepoTest do
747752
query = from s in MySchema, select: %{s | x: ^"x"}
748753
TestRepo.insert_all(MySchema, query)
749754

750-
assert_received {:insert_all, %{source: "my_schema", header: header}, {%Ecto.Query{} = query, _params}}
755+
assert_received {:insert_all, %{source: "my_schema", header: header},
756+
{%Ecto.Query{} = query, _params}}
751757

752758
unchanged_fields = [:id, :yyy, :z, :array, :map]
753759
updated_fields = [:x]
@@ -758,10 +764,13 @@ defmodule Ecto.RepoTest do
758764
end
759765

760766
test "takes query selecting on source with join column update" do
761-
query = from p in MyParent, join: a in MySchemaWithAssoc, on: true, select: %{p | id: a.parent_id}
767+
query =
768+
from p in MyParent, join: a in MySchemaWithAssoc, on: true, select: %{p | id: a.parent_id}
769+
762770
TestRepo.insert_all(MySchemaWithAssoc, query)
763771

764-
assert_received {:insert_all, %{source: "my_schema", header: header}, {%Ecto.Query{} = query, _params}}
772+
assert_received {:insert_all, %{source: "my_schema", header: header},
773+
{%Ecto.Query{} = query, _params}}
765774

766775
unchanged_fields = [:n]
767776
updated_fields = [:id]
@@ -818,7 +827,8 @@ defmodule Ecto.RepoTest do
818827
query = from s in MySchema, select: %{map(s, [:id, :x, :z]) | x: "x"}
819828
TestRepo.insert_all(MySchema, query)
820829

821-
assert_received {:insert_all, %{source: "my_schema", header: header}, {%Ecto.Query{} = query, _params}}
830+
assert_received {:insert_all, %{source: "my_schema", header: header},
831+
{%Ecto.Query{} = query, _params}}
822832

823833
unchanged_fields = [:id, :z]
824834
updated_fields = [:x]
@@ -1563,7 +1573,9 @@ defmodule Ecto.RepoTest do
15631573
assert schema = TestRepo.get(MySchemaWithNonStringPrefix, 123, prefix: %{key: :public})
15641574
assert schema.__meta__.prefix == %{key: :private}
15651575

1566-
assert schema = TestRepo.get_by(MySchemaWithNonStringPrefix, [id: 123], prefix: %{key: :public})
1576+
assert schema =
1577+
TestRepo.get_by(MySchemaWithNonStringPrefix, [id: 123], prefix: %{key: :public})
1578+
15671579
assert schema.__meta__.prefix == %{key: :private}
15681580

15691581
assert schema = TestRepo.one(MySchemaWithNonStringPrefix, prefix: %{key: :public})
@@ -1572,7 +1584,9 @@ defmodule Ecto.RepoTest do
15721584
assert [schema] = TestRepo.all(MySchemaWithNonStringPrefix, prefix: %{key: :public})
15731585
assert schema.__meta__.prefix == %{key: :private}
15741586

1575-
assert [schema] = TestRepo.all_by(MySchemaWithNonStringPrefix, [id: 123], prefix: %{key: :public})
1587+
assert [schema] =
1588+
TestRepo.all_by(MySchemaWithNonStringPrefix, [id: 123], prefix: %{key: :public})
1589+
15761590
assert schema.__meta__.prefix == %{key: :private}
15771591
end
15781592

@@ -1906,15 +1920,13 @@ defmodule Ecto.RepoTest do
19061920

19071921
test "includes conflict target in the field list given to :replace_all_except" do
19081922
fields = [:map, :z, :yyy, :x]
1909-
TestRepo.insert(%MySchema{id: 1}, on_conflict: {:replace_all_except, [:array]}, conflict_target: [:id])
1910-
assert_received {:insert, %{source: "my_schema", on_conflict: {^fields, [], [:id]}}}
1911-
end
19121923

1913-
test "excludes conflict target from the field list given to :replace" do
1914-
fields = [:id, :map, :z, :x]
1915-
TestRepo.insert(%MySchema{id: 1}, on_conflict: {:replace, fields}, conflict_target: [:id])
1916-
expected_fields = fields -- [:id]
1917-
assert_received {:insert, %{source: "my_schema", on_conflict: {^expected_fields, [], [:id]}}}
1924+
TestRepo.insert(%MySchema{id: 1},
1925+
on_conflict: {:replace_all_except, [:array]},
1926+
conflict_target: [:id]
1927+
)
1928+
1929+
assert_received {:insert, %{source: "my_schema", on_conflict: {^fields, [], [:id]}}}
19181930
end
19191931

19201932
test "excludes conflict target from :replace_all" do
@@ -2323,9 +2335,11 @@ defmodule Ecto.RepoTest do
23232335

23242336
update_query = from w in MySchemaWritable, update: [set: [insert: 10]]
23252337

2326-
assert_raise Ecto.QueryError, ~r/cannot update non-updatable field `:insert` in query/, fn ->
2327-
TestRepo.update_all(update_query, [])
2328-
end
2338+
assert_raise Ecto.QueryError,
2339+
~r/cannot update non-updatable field `:insert` in query/,
2340+
fn ->
2341+
TestRepo.update_all(update_query, [])
2342+
end
23292343
end
23302344

23312345
test "insert only saves changes for writable: :always/:insert" do
@@ -2351,19 +2365,25 @@ defmodule Ecto.RepoTest do
23512365
# conflict query
23522366
on_conflict = from w in MySchemaWritable, update: [set: [insert: 10]]
23532367

2354-
assert_raise Ecto.QueryError, ~r/cannot update non-updatable field `:insert` in query/, fn ->
2355-
TestRepo.insert(%MySchemaWritable{}, on_conflict: on_conflict)
2356-
end
2368+
assert_raise Ecto.QueryError,
2369+
~r/cannot update non-updatable field `:insert` in query/,
2370+
fn ->
2371+
TestRepo.insert(%MySchemaWritable{}, on_conflict: on_conflict)
2372+
end
23572373

23582374
# conflict keyword
23592375
assert_raise Ecto.QueryError, ~r/cannot update non-updatable field `:never` in query/, fn ->
23602376
TestRepo.insert(%MySchemaWritable{}, on_conflict: [set: [never: 10]])
23612377
end
23622378

23632379
# conflict replace
2364-
assert_raise ArgumentError, ~r/cannot replace non-updatable field `:never` in :on_conflict option/, fn ->
2365-
TestRepo.insert(%MySchemaWritable{}, on_conflict: {:replace, [:always, :never]})
2366-
end
2380+
assert_raise ArgumentError,
2381+
~r/cannot replace non-updatable field `:never` in :on_conflict option/,
2382+
fn ->
2383+
TestRepo.insert(%MySchemaWritable{},
2384+
on_conflict: {:replace, [:always, :never]}
2385+
)
2386+
end
23672387
end
23682388

23692389
test "insert with on_conflict = replace_all and returning" do
@@ -2389,7 +2409,10 @@ defmodule Ecto.RepoTest do
23892409
msg = "cannot select unwritable field `:never` for insert_all"
23902410

23912411
assert_raise ArgumentError, msg, fn ->
2392-
query = from w in MySchemaWritable, select: %{always: w.always, insert: w.insert, never: w.insert}
2412+
query =
2413+
from w in MySchemaWritable,
2414+
select: %{always: w.always, insert: w.insert, never: w.insert}
2415+
23932416
TestRepo.insert_all(MySchemaWritable, query)
23942417
end
23952418

0 commit comments

Comments
 (0)