chore: fix tests & don't do normal rollbacks with --tenant option

Author: zachdaniel

lib/data_layer.ex

@@ -453,72 +453,74 @@ defmodule AshPostgres.DataLayer do
           migrations_path = AshPostgres.Mix.Helpers.migrations_path([], repo)
           tenant_migrations_path = AshPostgres.Mix.Helpers.tenant_migrations_path([], repo)
 
-          current_migrations =
-            Ecto.Query.from(row in "schema_migrations",
-              select: row.version
-            )
-            |> repo.all()
-            |> Enum.map(&to_string/1)
+          if "--tenants" not in args do
+            current_migrations =
+              Ecto.Query.from(row in "schema_migrations",
+                select: row.version
+              )
+              |> repo.all()
+              |> Enum.map(&to_string/1)
+
+            files =
+              migrations_path
+              |> Path.join("**/*.exs")
+              |> Path.wildcard()
+              |> Enum.sort()
+              |> Enum.reverse()
+              |> Enum.filter(fn file ->
+                Enum.any?(current_migrations, &String.starts_with?(Path.basename(file), &1))
+              end)
+              |> Enum.take(20)
+              |> Enum.map(&String.trim_leading(&1, migrations_path))
+              |> Enum.map(&String.trim_leading(&1, "/"))
+
+            indexed =
+              files
+              |> Enum.with_index()
+              |> Enum.map(fn {file, index} -> "#{index + 1}: #{file}" end)
+
+            to =
+              Mix.shell().prompt(
+                """
+                How many migrations should be rolled back#{for_repo}? (default: 0)
+
+                Last 20 migration names, with the input you must provide to
+                rollback up to *and including* that migration:
+
+                #{Enum.join(indexed, "\n")}
+                Rollback to:
+                """
+                |> String.trim_trailing()
+              )
+              |> String.trim()
+              |> case do
+                "" ->
+                  nil
 
-          files =
-            migrations_path
-            |> Path.join("**/*.exs")
-            |> Path.wildcard()
-            |> Enum.sort()
-            |> Enum.reverse()
-            |> Enum.filter(fn file ->
-              Enum.any?(current_migrations, &String.starts_with?(Path.basename(file), &1))
-            end)
-            |> Enum.take(20)
-            |> Enum.map(&String.trim_leading(&1, migrations_path))
-            |> Enum.map(&String.trim_leading(&1, "/"))
-
-          indexed =
-            files
-            |> Enum.with_index()
-            |> Enum.map(fn {file, index} -> "#{index + 1}: #{file}" end)
-
-          to =
-            Mix.shell().prompt(
-              """
-              How many migrations should be rolled back#{for_repo}? (default: 0)
-
-              Last 20 migration names, with the input you must provide to
-              rollback up to *and including* that migration:
-
-              #{Enum.join(indexed, "\n")}
-              Rollback to:
-              """
-              |> String.trim_trailing()
-            )
-            |> String.trim()
-            |> case do
-              "" ->
-                nil
-
-              "0" ->
-                nil
-
-              n ->
-                try do
-                  files
-                  |> Enum.at(String.to_integer(n) - 1)
-                rescue
-                  _ ->
-                    reraise "Required an integer value, got: #{n}", __STACKTRACE__
-                end
-                |> String.split("_", parts: 2)
-                |> Enum.at(0)
-                |> String.to_integer()
-            end
+                "0" ->
+                  nil
 
-          if to do
-            Mix.Task.run(
-              "ash_postgres.rollback",
-              args ++ ["-r", inspect(repo), "--to", to_string(to)]
-            )
+                n ->
+                  try do
+                    files
+                    |> Enum.at(String.to_integer(n) - 1)
+                  rescue
+                    _ ->
+                      reraise "Required an integer value, got: #{n}", __STACKTRACE__
+                  end
+                  |> String.split("_", parts: 2)
+                  |> Enum.at(0)
+                  |> String.to_integer()
+              end
 
-            Mix.Task.reenable("ash_postgres.rollback")
+            if to do
+              Mix.Task.run(
+                "ash_postgres.rollback",
+                args ++ ["-r", inspect(repo), "--to", to_string(to)]
+              )
+
+              Mix.Task.reenable("ash_postgres.rollback")
+            end
           end
 
           tenant_files =
@@ -599,7 +601,7 @@ defmodule AshPostgres.DataLayer do
               if to do
                 Mix.Task.run(
                   "ash_postgres.rollback",
-                  args ++ ["--tenants", "-r", inspect(repo), "--to", to]
+                  args ++ ["--tenants", "-r", inspect(repo), "--to", to_string(to)]
                 )
 
                 Mix.Task.reenable("ash_postgres.rollback")

lib/migration_generator/migration_generator.ex

@@ -514,16 +514,6 @@ defmodule AshPostgres.MigrationGenerator do
     end
   end
 
-  if Mix.env() == :test do
-    defp with_repo_not_in_test(repo, fun) do
-      fun.(repo)
-    end
-  else
-    defp with_repo_not_in_test(repo, fun) do
-      Ecto.Migrator.with_repo(repo, fun)
-    end
-  end
-
   defp require_name!(opts) do
     if !opts.name && !opts.dry_run && !opts.check && !opts.snapshots_only && !opts.dev &&
          !opts.auto_name do
@@ -548,7 +538,7 @@ defmodule AshPostgres.MigrationGenerator do
       end)
 
     if tenant? do
-      with_repo_not_in_test(repo, fn repo ->
+      Ecto.Migrator.with_repo(repo, fn repo ->
         for prefix <- repo.all_tenants() do
           {repo, query, opts} = Ecto.Migration.SchemaMigration.versions(repo, [], prefix)
 
@@ -583,7 +573,7 @@ defmodule AshPostgres.MigrationGenerator do
         end
       end)
     else
-      with_repo_not_in_test(repo, fn repo ->
+      Ecto.Migrator.with_repo(repo, fn repo ->
         {repo, query, opts} = Ecto.Migration.SchemaMigration.versions(repo, [], nil)
 
         repo.transaction(fn ->

priv/resource_snapshots/test_repo/authors/20251018130654_dev.json.license

@@ -120,7 +120,7 @@
   "custom_indexes": [],
   "custom_statements": [],
   "has_create_action": true,
-  "hash": "55CFEDA4CB07DD89D2807B080A6F0E14A0370D7EA0C48E67C36ACAC568137D95",
+  "hash": "DEDCEFDB71DE94818B8D624B0BFE438AD7AEDC6279FD05B83C11C216E7A0F991",
   "identities": [],
   "multitenancy": {
     "attribute": null,

priv/resource_snapshots/test_repo/authors/20251018130654_dev.json renamed to priv/resource_snapshots/test_repo/authors/20251020024026.json

@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2019 ash_postgres contributors <https://github.com/ash-project/ash_postgres/graphs.contributors>
-#
-# SPDX-License-Identifier: MIT
-
 defmodule AshPostgres.TestRepo.Migrations.MigrateResources64 do
   @moduledoc """
   Updates resources based on their most recent snapshots.