From 8e297acf69cab6e11744bbcfb293ea5a5d3176a5 Mon Sep 17 00:00:00 2001
From: Rutger <35080130+Rutgerdj@users.noreply.github.com>
Date: Wed, 27 May 2026 08:36:37 +0200
Subject: [PATCH] fix: Filter out empty snapshot directories This fixes an
 issue where you would not get the prompt to rename a table when there's
 already a directory with the same name as the *new* table name

---
 .../migration_generator.ex                    |  2 +-
 test/migration_generator_test.exs             | 83 +++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/lib/migration_generator/migration_generator.ex b/lib/migration_generator/migration_generator.ex
index ff58cbe8..166fda32 100644
--- a/lib/migration_generator/migration_generator.ex
+++ b/lib/migration_generator/migration_generator.ex
@@ -3476,7 +3476,7 @@ defmodule AshPostgres.MigrationGenerator do
       |> File.ls!()
       |> Enum.filter(fn name ->
         path = Path.join(base_folder, name)
-        File.dir?(path) and name != "extensions"
+        File.dir?(path) and name != "extensions" and File.ls!(path) != []
       end)
       |> Enum.map(fn name ->
         if String.contains?(name, ".") do
diff --git a/test/migration_generator_test.exs b/test/migration_generator_test.exs
index 079e0301..5a90b56b 100644
--- a/test/migration_generator_test.exs
+++ b/test/migration_generator_test.exs
@@ -5577,6 +5577,89 @@ defmodule AshPostgres.MigrationGeneratorTest do
       refute latest_migration =~ "create table(:messages_rename_new"
     end
 
+    test "rename table migration is still proposed when new table name has an empty snapshot directory",
+         %{
+           snapshot_path: snapshot_path,
+           migration_path: migration_path
+         } do
+      defresource MessageEmptyDirRename, "messages_empty_dir_rename" do
+        postgres do
+          table "messages_empty_dir_rename"
+          repo(AshPostgres.TestRepo)
+        end
+
+        attributes do
+          uuid_primary_key(:id)
+          attribute(:body, :string, public?: true)
+        end
+
+        actions do
+          defaults([:create, :read, :update, :destroy])
+        end
+      end
+
+      defdomain([MessageEmptyDirRename])
+
+      AshPostgres.MigrationGenerator.generate(Domain,
+        snapshot_path: snapshot_path,
+        migration_path: migration_path,
+        quiet: true,
+        format: false,
+        auto_name: true,
+        name: "add_messages_empty_dir_rename"
+      )
+
+      # Simulate a leftover empty directory with the new table's name in the snapshot folder.
+      # Before the fix, this caused the generator to skip proposing a rename because it
+      # treated the empty directory as an existing snapshot for the target table.
+      empty_dir = Path.join([snapshot_path, "test_repo", "messages_empty_dir_rename_new"])
+      File.mkdir_p!(empty_dir)
+
+      defresource MessageEmptyDirRename, "messages_empty_dir_rename_new" do
+        postgres do
+          table "messages_empty_dir_rename_new"
+          repo(AshPostgres.TestRepo)
+        end
+
+        attributes do
+          uuid_primary_key(:id)
+          attribute(:body, :string, public?: true)
+        end
+
+        actions do
+          defaults([:create, :read, :update, :destroy])
+        end
+      end
+
+      defdomain([MessageEmptyDirRename])
+
+      send(self(), {:mix_shell_input, :yes?, true})
+
+      AshPostgres.MigrationGenerator.generate(Domain,
+        snapshot_path: snapshot_path,
+        migration_path: migration_path,
+        quiet: true,
+        format: false,
+        auto_name: true,
+        name: "rename_messages_empty_dir_table"
+      )
+
+      migration_files =
+        Path.wildcard("#{migration_path}/**/*.exs")
+        |> Enum.reject(&String.contains?(&1, "extensions"))
+        |> Enum.sort()
+
+      latest_migration =
+        migration_files
+        |> List.last()
+        |> File.read!()
+
+      assert latest_migration =~
+               "rename table(:messages_empty_dir_rename), to: table(:messages_empty_dir_rename_new)"
+
+      refute latest_migration =~ "create table(:messages_empty_dir_rename_new"
+    end
+
     test "rename table migration respects schema prefix", %{
       snapshot_path: snapshot_path,
       migration_path: migration_path