Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/data_layer.ex
Original file line number Diff line number Diff line change
Expand Up @@ -639,13 +639,13 @@ defmodule AshPostgres.DataLayer do

[]
|> AshPostgres.Mix.Helpers.repos!(args)
|> Enum.all?(&(not has_tenant_migrations?(&1)))
|> Enum.any?(&has_tenant_migrations?(&1))
|> case do
true ->
false ->
:ok

_ ->
Mix.Task.run("ash_postgres.migrate", ["--tenant" | args])
Mix.Task.rerun("ash_postgres.migrate", ["--tenants" | args])
end
end

Expand All @@ -660,6 +660,7 @@ defmodule AshPostgres.DataLayer do
|> Path.join("**/*.exs")
|> Path.wildcard()
|> Enum.empty?()
|> Kernel.not()
end

import Ecto.Query, only: [from: 2, subquery: 1]
Expand Down
7 changes: 6 additions & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,12 @@ defmodule AshPostgres.MixProject do
"test.migrate": "ash_postgres.migrate",
"test.rollback": "ash_postgres.rollback",
"test.create": "ash_postgres.create",
"test.reset": ["test.drop", "test.create", "test.migrate", "ash_postgres.migrate --tenants"],
"test.reset": [
"test.drop",
"test.create",
"test.migrate",
fn args -> Mix.Task.rerun("ash_postgres.migrate", ["--tenants" | args]) end
],
"test.drop": "ash_postgres.drop"
]
end
Expand Down
64 changes: 64 additions & 0 deletions test/data_layer_setup_test.exs
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# SPDX-FileCopyrightText: 2019 ash_postgres contributors <https://github.com/ash-project/ash_postgres/graphs/contributors>
#
# SPDX-License-Identifier: MIT

defmodule Mix.Tasks.AshPostgres.SetupProbe do
@moduledoc false
use Mix.Task

@impl true
def run(args) do
send(:ash_postgres_setup_probe, {:ash_postgres_setup_probe, args})
:ok
end
end

defmodule AshPostgres.DataLayerSetupTest do
@moduledoc false
use ExUnit.Case, async: false

describe "has_tenant_migrations?/1" do
test "TestRepo has tenant migration files, so setup takes the tenant pass" do
files =
[]
|> AshPostgres.Mix.Helpers.tenant_migrations_path(AshPostgres.TestRepo)
|> Path.join("**/*.exs")
|> Path.wildcard()

refute Enum.empty?(files)
end
end

describe "ash_postgres.migrate switches" do
test "rejects --tenant (singular), which is what setup used to pass" do
assert_raise Mix.Error, fn ->
Mix.Task.rerun("ash_postgres.migrate", ["--tenant"])
end
end
end

describe "Mix.Task.run/2 vs Mix.Task.rerun/2" do
setup do
Process.register(self(), :ash_postgres_setup_probe)
Mix.Task.reenable("ash_postgres.setup_probe")

on_exit(fn ->
if Process.whereis(:ash_postgres_setup_probe) == self() do
Process.unregister(:ash_postgres_setup_probe)
end
end)

:ok
end

test "a second Mix.Task.run of the same task is a no-op; Mix.Task.rerun is not" do
Mix.Task.run("ash_postgres.setup_probe", ["first"])
Mix.Task.run("ash_postgres.setup_probe", ["second"])
Mix.Task.rerun("ash_postgres.setup_probe", ["third"])

assert_received {:ash_postgres_setup_probe, ["first"]}
refute_received {:ash_postgres_setup_probe, ["second"]}
assert_received {:ash_postgres_setup_probe, ["third"]}
end
end
end
Loading