Skip to content

Commit 6c85ef5

Browse files
committed
Remove migrations indirection
1 parent 7d3b683 commit 6c85ef5

File tree

5 files changed

+22
-29
lines changed

5 files changed

+22
-29
lines changed

dev.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ end
145145
defmodule Migration0 do
146146
use Ecto.Migration
147147

148-
def up, do: ErrorTracker.Migrations.up(prefix: "private")
149-
def down, do: ErrorTracker.Migrations.down(prefix: "private")
148+
def up, do: ErrorTracker.Migration.up(prefix: "private")
149+
def down, do: ErrorTracker.Migration.down(prefix: "private")
150150
end
151151

152152
Application.put_env(:phoenix, :serve_endpoints, true)

lib/error_tracker/migration.ex

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
defmodule ErrorTracker.Migrations do
2-
@moduledoc false
3-
4-
defdelegate up(opts \\ []), to: ErrorTracker.Migration
5-
defdelegate down(opts \\ []), to: ErrorTracker.Migration
6-
end
7-
81
defmodule ErrorTracker.Migration do
92
@moduledoc """
103
Create and modify the database tables for the ErrorTracker.
@@ -25,8 +18,8 @@ defmodule ErrorTracker.Migration do
2518
defmodule MyApp.Repo.Migrations.AddErrorTracker do
2619
use Ecto.Migration
2720
28-
def up, do: ErrorTracker.Migrations.up()
29-
def down, do: ErrorTracker.Migrations.down()
21+
def up, do: ErrorTracker.Migration.up()
22+
def down, do: ErrorTracker.Migration.down()
3023
end
3124
```
3225
@@ -51,8 +44,8 @@ defmodule ErrorTracker.Migration do
5144
defmodule MyApp.Repo.Migrations.UpdateErrorTrackerToVN do
5245
use Ecto.Migration
5346
54-
def up, do: ErrorTracker.Migrations.up(version: N)
55-
def down, do: ErrorTracker.Migrations.down(version: N)
47+
def up, do: ErrorTracker.Migration.up(version: N)
48+
def down, do: ErrorTracker.Migration.down(version: N)
5649
end
5750
```
5851
@@ -74,8 +67,8 @@ defmodule ErrorTracker.Migration do
7467
defmodule MyApp.Repo.Migrations.AddErrorTracker do
7568
use Ecto.Migration
7669
77-
def up, do: ErrorTracker.Migrations.up(prefix: "custom_schema")
78-
def down, do: ErrorTracker.Migrations.down(prefix: "custom_schema")
70+
def up, do: ErrorTracker.Migration.up(prefix: "custom_schema")
71+
def down, do: ErrorTracker.Migration.down(prefix: "custom_schema")
7972
end
8073
```
8174
@@ -87,8 +80,8 @@ defmodule ErrorTracker.Migration do
8780
defmodule MyApp.Repo.Migrations.AddErrorTracker do
8881
use Ecto.Migration
8982
90-
def up, do: ErrorTracker.Migrations.up(prefix: "custom_schema", create_schema: false)
91-
def down, do: ErrorTracker.Migrations.down(prefix: "custom_schema")
83+
def up, do: ErrorTracker.Migration.up(prefix: "custom_schema", create_schema: false)
84+
def down, do: ErrorTracker.Migration.down(prefix: "custom_schema")
9285
end
9386
```
9487
@@ -118,7 +111,7 @@ defmodule ErrorTracker.Migration do
118111

119112
defp migrator do
120113
case ErrorTracker.Repo.__adapter__() do
121-
Ecto.Adapters.Postgres -> ErrorTracker.Migrations.Postgres
114+
Ecto.Adapters.Postgres -> ErrorTracker.Migration.Postgres
122115
adapter -> raise "ErrorTracker does not support #{adapter}"
123116
end
124117
end

lib/error_tracker/migrations/postgres.ex renamed to lib/error_tracker/migration/postgres.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule ErrorTracker.Migrations.Postgres do
1+
defmodule ErrorTracker.Migration.Postgres do
22
@moduledoc false
33

44
@behaviour ErrorTracker.Migration

lib/error_tracker/migrations/postgres/v01.ex renamed to lib/error_tracker/migration/postgres/v01.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule ErrorTracker.Migrations.Postgres.V01 do
1+
defmodule ErrorTracker.Migration.Postgres.V01 do
22
@moduledoc false
33

44
use Ecto.Migration

live.exs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Mix.install([
2-
{:phoenix_playground, github: "phoenix-playground/phoenix_playground", ref: "ee6da0fc3b141f78b9f967ce71a4fb015c6764a6"},
2+
{:phoenix_playground,
3+
github: "phoenix-playground/phoenix_playground",
4+
ref: "ee6da0fc3b141f78b9f967ce71a4fb015c6764a6"},
35
{:error_tracker, path: "."}
46
])
57

@@ -11,18 +13,19 @@ end
1113
Application.put_env(:error_tracker, :repo, ErrorTrackerDev.Repo)
1214
Application.put_env(:error_tracker, :application, :error_tracker_dev)
1315
Application.put_env(:error_tracker, :prefix, "private")
14-
Application.put_env(:error_tracker, ErrorTrackerDev.Repo, url: "ecto://postgres:postgres@127.0.0.1/error_tracker_dev")
1516

17+
Application.put_env(:error_tracker, ErrorTrackerDev.Repo,
18+
url: "ecto://postgres:postgres@127.0.0.1/error_tracker_dev"
19+
)
1620

1721
# This migration will set up the database structure
1822
defmodule Migration0 do
1923
use Ecto.Migration
2024

21-
def up, do: ErrorTracker.Migrations.up(prefix: "private")
22-
def down, do: ErrorTracker.Migrations.down(prefix: "private")
25+
def up, do: ErrorTracker.Migration.up(prefix: "private")
26+
def down, do: ErrorTracker.Migration.down(prefix: "private")
2327
end
2428

25-
2629
defmodule DemoLive do
2730
use Phoenix.LiveView
2831

@@ -54,7 +57,6 @@ defmodule DemoLive do
5457
"""
5558
end
5659

57-
5860
def handle_event("inc", _params, socket) do
5961
{:noreply, assign(socket, count: socket.assigns.count + 1)}
6062
end
@@ -71,15 +73,13 @@ defmodule DemoLive do
7173
if params["crash"] == "handle_params" do
7274
raise "Crash on handle_params"
7375
end
76+
7477
{:noreply, socket}
7578
end
7679
end
7780

78-
79-
8081
PhoenixPlayground.start(live: DemoLive, child_specs: [ErrorTrackerDev.Repo])
8182

82-
8383
# Create the database if it does not exist and run migrations if needed
8484
_ = Ecto.Adapters.Postgres.storage_up(ErrorTrackerDev.Repo.config())
8585

0 commit comments

Comments
 (0)