Skip to content

Commit 85909e8

Browse files
committed
Run formatter
1 parent 7ba0b62 commit 85909e8

File tree

17 files changed

+1327
-752
lines changed

17 files changed

+1327
-752
lines changed

.formatter.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Used by "mix format"
22
[
3-
inputs: ["mix.exs", "{config,lib,test,bench}/**/*.{ex,exs}"]
3+
inputs: ["mix.exs", "{config,lib,test,bench,integration}/**/*.{ex,exs}"]
44
]

config/config.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use Mix.Config
22

3-
if Mix.env == :test do
3+
if Mix.env() == :test do
44
config :ex_unit, :assert_receive_timeout, 1000
55
end

integration/sqlite/all_test.exs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ case System.version() do
44
_ -> :ok
55
end
66

7-
Code.require_file "../../deps/ecto/integration_test/cases/assoc.exs", __DIR__
8-
Code.require_file "../../deps/ecto/integration_test/cases/interval.exs", __DIR__
9-
Code.require_file "../../deps/ecto/integration_test/cases/joins.exs", __DIR__
10-
Code.require_file "../../deps/ecto/integration_test/cases/migrator.exs", __DIR__
11-
Code.require_file "../../deps/ecto/integration_test/cases/preload.exs", __DIR__
12-
Code.require_file "../../deps/ecto/integration_test/cases/repo.exs", __DIR__
13-
Code.require_file "../../deps/ecto/integration_test/cases/type.exs", __DIR__
14-
Code.require_file "../../deps/ecto/integration_test/sql/migration.exs", __DIR__
15-
Code.require_file "../../deps/ecto/integration_test/sql/sandbox.exs", __DIR__
16-
Code.require_file "../../deps/ecto/integration_test/sql/sql.exs", __DIR__
17-
Code.require_file "../../deps/ecto/integration_test/sql/stream.exs", __DIR__
18-
Code.require_file "../../deps/ecto/integration_test/sql/subquery.exs", __DIR__
19-
Code.require_file "../../deps/ecto/integration_test/sql/transaction.exs", __DIR__
7+
Code.require_file("../../deps/ecto/integration_test/cases/assoc.exs", __DIR__)
8+
Code.require_file("../../deps/ecto/integration_test/cases/interval.exs", __DIR__)
9+
Code.require_file("../../deps/ecto/integration_test/cases/joins.exs", __DIR__)
10+
Code.require_file("../../deps/ecto/integration_test/cases/migrator.exs", __DIR__)
11+
Code.require_file("../../deps/ecto/integration_test/cases/preload.exs", __DIR__)
12+
Code.require_file("../../deps/ecto/integration_test/cases/repo.exs", __DIR__)
13+
Code.require_file("../../deps/ecto/integration_test/cases/type.exs", __DIR__)
14+
Code.require_file("../../deps/ecto/integration_test/sql/migration.exs", __DIR__)
15+
Code.require_file("../../deps/ecto/integration_test/sql/sandbox.exs", __DIR__)
16+
Code.require_file("../../deps/ecto/integration_test/sql/sql.exs", __DIR__)
17+
Code.require_file("../../deps/ecto/integration_test/sql/stream.exs", __DIR__)
18+
Code.require_file("../../deps/ecto/integration_test/sql/subquery.exs", __DIR__)
19+
Code.require_file("../../deps/ecto/integration_test/sql/transaction.exs", __DIR__)

integration/sqlite/test_helper.exs

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
11
Logger.configure(level: :info)
2-
ExUnit.start exclude: [:array_type,
3-
:strict_savepoint,
4-
:update_with_join,
5-
:delete_with_join,
6-
:foreign_key_constraint,
7-
:modify_column,
8-
:modify_foreign_key,
9-
:prefix,
10-
:remove_column,
11-
:rename_column,
12-
:right_join,
13-
:unique_constraint,
14-
:uses_usec,
15-
:transaction_isolation,
16-
:insert_cell_wise_defaults,
17-
:modify_foreign_key_on_delete,
18-
:modify_foreign_key_on_update,
19-
:alter_primary_key,
20-
:map_boolean_in_subquery,
21-
:upsert_all,
22-
:with_conflict_target,
23-
:without_conflict_target,
24-
:decimal_type]
2+
3+
ExUnit.start(
4+
exclude: [
5+
:array_type,
6+
:strict_savepoint,
7+
:update_with_join,
8+
:delete_with_join,
9+
:foreign_key_constraint,
10+
:modify_column,
11+
:modify_foreign_key,
12+
:prefix,
13+
:remove_column,
14+
:rename_column,
15+
:right_join,
16+
:unique_constraint,
17+
:uses_usec,
18+
:transaction_isolation,
19+
:insert_cell_wise_defaults,
20+
:modify_foreign_key_on_delete,
21+
:modify_foreign_key_on_update,
22+
:alter_primary_key,
23+
:map_boolean_in_subquery,
24+
:upsert_all,
25+
:with_conflict_target,
26+
:without_conflict_target,
27+
:decimal_type
28+
]
29+
)
2530

2631
# Configure Ecto for support and tests
2732
Application.put_env(:ecto, :primary_key_type, :id)
@@ -34,17 +39,17 @@ end
3439

3540
pool =
3641
case System.get_env("ECTO_POOL") || "poolboy" do
37-
"poolboy" -> DBConnection.Poolboy
42+
"poolboy" -> DBConnection.Poolboy
3843
"sojourn_broker" -> DBConnection.Sojourn
3944
end
4045

4146
# Load support files
42-
Code.require_file "../../deps/ecto/integration_test/support/repo.exs", __DIR__
43-
Code.require_file "../../deps/ecto/integration_test/support/schemas.exs", __DIR__
44-
Code.require_file "../../deps/ecto/integration_test/support/migration.exs", __DIR__
47+
Code.require_file("../../deps/ecto/integration_test/support/repo.exs", __DIR__)
48+
Code.require_file("../../deps/ecto/integration_test/support/schemas.exs", __DIR__)
49+
Code.require_file("../../deps/ecto/integration_test/support/migration.exs", __DIR__)
4550

46-
Code.require_file "../../test/support/schemas.exs", __DIR__
47-
Code.require_file "../../test/support/migration.exs", __DIR__
51+
Code.require_file("../../test/support/schemas.exs", __DIR__)
52+
Code.require_file("../../test/support/migration.exs", __DIR__)
4853

4954
# Pool repo for async, safe tests
5055
alias Ecto.Integration.TestRepo
@@ -53,7 +58,8 @@ Application.put_env(:ecto, TestRepo,
5358
adapter: Sqlite.Ecto2,
5459
database: "/tmp/test_repo.db",
5560
pool: Ecto.Adapters.SQL.Sandbox,
56-
ownership_pool: pool)
61+
ownership_pool: pool
62+
)
5763

5864
defmodule Ecto.Integration.TestRepo do
5965
use Ecto.Integration.Repo, otp_app: :ecto
@@ -66,7 +72,8 @@ Application.put_env(:ecto, PoolRepo,
6672
adapter: Sqlite.Ecto2,
6773
pool: DBConnection.Poolboy,
6874
database: "/tmp/test_repo.db",
69-
pool_size: 10)
75+
pool_size: 10
76+
)
7077

7178
defmodule Ecto.Integration.PoolRepo do
7279
use Ecto.Integration.Repo, otp_app: :ecto
@@ -91,15 +98,15 @@ end
9198
{:ok, _} = Sqlite.Ecto2.ensure_all_started(TestRepo, :temporary)
9299

93100
# Load support models and migration
94-
Code.require_file "../../deps/ecto/integration_test/support/schemas.exs", __DIR__
95-
Code.require_file "../../deps/ecto/integration_test/support/migration.exs", __DIR__
101+
Code.require_file("../../deps/ecto/integration_test/support/schemas.exs", __DIR__)
102+
Code.require_file("../../deps/ecto/integration_test/support/migration.exs", __DIR__)
96103

97104
# Load up the repository, start it, and run migrations
98-
_ = Sqlite.Ecto2.storage_down(TestRepo.config)
99-
:ok = Sqlite.Ecto2.storage_up(TestRepo.config)
105+
_ = Sqlite.Ecto2.storage_down(TestRepo.config())
106+
:ok = Sqlite.Ecto2.storage_up(TestRepo.config())
100107

101-
{:ok, _pid} = TestRepo.start_link
102-
{:ok, _pid} = PoolRepo.start_link
108+
{:ok, _pid} = TestRepo.start_link()
109+
{:ok, _pid} = PoolRepo.start_link()
103110

104111
:ok = Ecto.Migrator.up(TestRepo, 0, Ecto.Integration.Migration, log: false)
105112
:ok = Ecto.Migrator.up(TestRepo, 1, Sqlite.Ecto2.Test.Migration, log: false)

0 commit comments

Comments
 (0)