Skip to content

fix: handle removal of :context multitenancy in migrations #752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ryan6794 wants to merge 2 commits into
base: main
Choose a base branch
from
+37 −12
Open

fix: handle removal of :context multitenancy in migrations #752

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efc60cd
fix: handle removal of :context multitenancy in migrations
Ryan6794 May 14, 2026
e63751e
fix: handle removal of :context multitenancy in migrations
Ryan6794 May 14, 2026
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
49 changes: 37 additions & 12 deletions lib/migration_generator/migration_generator.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3109,11 +3109,39 @@ defmodule AshPostgres.MigrationGenerator do
not is_nil(Map.get(attribute, :references)) and
!(attribute.references.multitenancy &&
attribute.references.multitenancy.strategy == :context &&
(is_nil(multitenancy) || multitenancy.strategy == :attribute))
(is_nil(multitenancy) || multitenancy.strategy == :attribute)) and
!(multitenancy && multitenancy.strategy == :context &&
attribute.references.multitenancy &&
attribute.references.multitenancy.strategy == :context)
end

def get_existing_snapshot(snapshot, opts) do
folder = get_snapshot_folder(snapshot, opts)
defp get_snapshot_folder(snapshot, opts) do
base =
opts
|> snapshot_path(snapshot.repo)
|> Path.join(repo_name(snapshot.repo))

if snapshot.multitenancy.strategy == :context do
Path.join(base, "tenants")
else
base
end
end

defp get_alternate_snapshot_folder(snapshot, opts) do
base =
opts
|> snapshot_path(snapshot.repo)
|> Path.join(repo_name(snapshot.repo))

if snapshot.multitenancy.strategy == :context do
base
else
Path.join(base, "tenants")
end
end

defp load_snapshot_from_folder(folder, snapshot, opts) do
snapshot_path = get_snapshot_path(snapshot, folder)

if File.exists?(snapshot_path) do
Expand All @@ -3138,16 +3166,13 @@ defmodule AshPostgres.MigrationGenerator do
end
end

defp get_snapshot_folder(snapshot, opts) do
if snapshot.multitenancy.strategy == :context do
opts
|> snapshot_path(snapshot.repo)
|> Path.join(repo_name(snapshot.repo))
|> Path.join("tenants")
def get_existing_snapshot(snapshot, opts) do
result = load_snapshot_from_folder(get_snapshot_folder(snapshot, opts), snapshot, opts)

if is_nil(result) do
load_snapshot_from_folder(get_alternate_snapshot_folder(snapshot, opts), snapshot, opts)
else
opts
|> snapshot_path(snapshot.repo)
|> Path.join(repo_name(snapshot.repo))
result
end
end

Expand Down