Fix primary key generation for multitenancy

Author: morten.lund@maskon.no

priv/resource_snapshots/test_repo/tenants/composite_key/20250217095820.json

@@ -0,0 +1,40 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": true,
+      "primary_key?": true,
+      "references": null,
+      "size": null,
+      "source": "id",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "title",
+      "type": "text"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "F547F05D353FC4B04CC604B8F2215A512BFB9FAD20B3C1DD2BCBF2455072D958",
+  "identities": [],
+  "multitenancy": {
+    "attribute": null,
+    "global": false,
+    "strategy": "context"
+  },
+  "partitioning": null,
+  "repo": "Elixir.AshPostgres.TestRepo",
+  "schema": null,
+  "table": "composite_key"
+}

priv/resource_snapshots/test_repo/tenants/composite_key/20250217095828.json

@@ -0,0 +1,40 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": true,
+      "primary_key?": true,
+      "references": null,
+      "size": null,
+      "source": "id",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": true,
+      "references": null,
+      "size": null,
+      "source": "title",
+      "type": "text"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "0EA09E46F197BAF8034CBFC7CCEFE46D2CCE9927ACD0991B5E90D5463B9B4AEC",
+  "identities": [],
+  "multitenancy": {
+    "attribute": null,
+    "global": false,
+    "strategy": "context"
+  },
+  "partitioning": null,
+  "repo": "Elixir.AshPostgres.TestRepo",
+  "schema": null,
+  "table": "composite_key"
+}

priv/test_repo/tenant_migrations/20250217095820_migrate_resources5.exs

@@ -0,0 +1,20 @@
+defmodule AshPostgres.TestRepo.TenantMigrations.MigrateResources5 do
+  @moduledoc """
+  Updates resources based on their most recent snapshots.
+
+  This file was autogenerated with `mix ash_postgres.generate_migrations`
+  """
+
+  use Ecto.Migration
+
+  def up do
+    create table(:composite_key, primary_key: false, prefix: prefix()) do
+      add(:id, :bigserial, null: false, primary_key: true)
+      add(:title, :text, null: false)
+    end
+  end
+
+  def down do
+    drop(table(:composite_key, prefix: prefix()))
+  end
+end

priv/test_repo/tenant_migrations/20250217095828_migrate_resources6.exs

@@ -0,0 +1,29 @@
+defmodule AshPostgres.TestRepo.TenantMigrations.MigrateResources6 do
+  @moduledoc """
+  Updates resources based on their most recent snapshots.
+
+  This file was autogenerated with `mix ash_postgres.generate_migrations`
+  """
+
+  use Ecto.Migration
+
+  def up do
+    drop(constraint("composite_key", "composite_key_pkey", prefix: prefix()))
+
+    alter table(:composite_key, prefix: prefix()) do
+      modify(:title, :text)
+    end
+
+    execute("ALTER TABLE \"#{prefix()}\".\"composite_key\" ADD PRIMARY KEY (id, title)")
+  end
+
+  def down do
+    drop(constraint("composite_key", "composite_key_pkey", prefix: prefix()))
+
+    alter table(:composite_key, prefix: prefix()) do
+      modify(:title, :text)
+    end
+
+    execute("ALTER TABLE \"#{prefix()}\".\"composite_key\" ADD PRIMARY KEY (id)")
+  end
+end

test/migration_generator_test.exs

@@ -769,8 +769,12 @@ defmodule AshPostgres.MigrationGeneratorTest do
         migration_path: "test_migration_path",
         tenant_migration_path: "test_tenant_migration_path",
         quiet: false,
+<<<<<<< HEAD
         format: false,
         auto_name: true
+=======
+        format: false
+>>>>>>> 37dd6436 (Fix primary key generation for multitenancy)
       )
 
       assert [_file1, file2] =
@@ -1580,6 +1584,7 @@ defmodule AshPostgres.MigrationGeneratorTest do
       [domain: Domain]
     end
 
+<<<<<<< HEAD
     test "raises an error on pending codegen", %{domain: domain} do
       assert_raise Ash.Error.Framework.PendingCodegen, fn ->
         AshPostgres.MigrationGenerator.generate(domain,
@@ -1589,6 +1594,16 @@ defmodule AshPostgres.MigrationGeneratorTest do
           auto_name: true
         )
       end
+=======
+    test "returns code(1) if snapshots and resources don't fit", %{domain: domain} do
+      assert catch_exit(
+               AshPostgres.MigrationGenerator.generate(domain,
+                 snapshot_path: "test_snapshots_path",
+                 migration_path: "test_migration_path",
+                 check: true
+               )
+             ) == {:shutdown, 1}
+>>>>>>> 37dd6436 (Fix primary key generation for multitenancy)
 
       refute File.exists?(Path.wildcard("test_migration_path2/**/*_migrate_resources*.exs"))
       refute File.exists?(Path.wildcard("test_snapshots_path2/test_repo/posts/*.json"))

test/support/multitenancy/resources/composite_key_post.ex

@@ -27,7 +27,7 @@ defmodule AshPostgres.MultitenancyTest.CompositeKeyPost do
     integer_primary_key(:id)
     attribute(:title, :string, public?: true, allow_nil?: false, primary_key?: true)
   end
-
+  
   relationships do
     belongs_to(:org, AshPostgres.MultitenancyTest.Org) do
       public?(true)