Merge branch 'main' of https://github.com/m0rt3nlund/ash_postgres into Partitioning-support

Author: [email protected]

.github/dependabot.yml

@@ -1,13 +1,14 @@
-version: 2
+---
 updates:
-  - package-ecosystem: mix
-    directory: "/"
-    versioning-strategy: lockfile-only
-    schedule:
-      interval: weekly
-      day: thursday
+  - directory: /
     groups:
-      production-dependencies:
-        dependency-type: production
       dev-dependencies:
         dependency-type: development
+      production-dependencies:
+        dependency-type: production
+    package-ecosystem: mix
+    schedule:
+      day: thursday
+      interval: monthly
+    versioning-strategy: lockfile-only
+version: 2

CHANGELOG.md

@@ -5,6 +5,66 @@ See [Conventional Commits](https://www.conventionalcommits.org) for commit guide
 
 <!-- changelog -->
 
+## [v2.6.17](https://github.com/ash-project/ash_postgres/compare/v2.6.16...v2.6.17) (2025-08-31)
+
+
+
+
+### Bug Fixes:
+
+* resolve a typo in pending dev migration error message (#608) by Sheharyar Naseer
+
+## [v2.6.16](https://github.com/ash-project/ash_postgres/compare/v2.6.15...v2.6.16) (2025-08-21)
+
+
+
+
+### Improvements:
+
+* Unrelated aggregates (#606) by Zach Daniel
+
+## [v2.6.15](https://github.com/ash-project/ash_postgres/compare/v2.6.14...v2.6.15) (2025-08-07)
+
+
+
+
+### Bug Fixes:
+
+* Use new attribute source in down migration (#604) by Anatolij Werle
+
+* always set disable_async, and remove log level config by Zach Daniel
+
+## [v2.6.14](https://github.com/ash-project/ash_postgres/compare/v2.6.13...v2.6.14) (2025-07-29)
+
+
+
+
+### Bug Fixes:
+
+* deduplicate identity keys by Zach Daniel
+
+## [v2.6.13](https://github.com/ash-project/ash_postgres/compare/v2.6.12...v2.6.13) (2025-07-27)
+
+
+
+
+### Bug Fixes:
+
+* ensure tenant prefix is set only for resources with context multitenancy (#600) by Emad Shaaban
+
+## [v2.6.12](https://github.com/ash-project/ash_postgres/compare/v2.6.11...v2.6.12) (2025-07-25)
+
+
+
+
+### Bug Fixes:
+
+* ensure tenant is set on query for updates by Zach Daniel
+
+### Improvements:
+
+* do not create snapshots for resources that have no attributes  #571 (#599) by horberlan
+
 ## [v2.6.11](https://github.com/ash-project/ash_postgres/compare/v2.6.10...v2.6.11) (2025-07-17)
 
 

lib/data_layer.ex

@@ -747,6 +747,7 @@ defmodule AshPostgres.DataLayer do
       when type in [:count, :sum, :first, :list, :avg, :max, :min, :exists, :custom],
       do: true
 
+  def can?(_, {:aggregate, :unrelated}), do: true
   def can?(_, :aggregate_filter), do: true
   def can?(_, :aggregate_sort), do: true
   def can?(_, :calculate), do: true
@@ -919,8 +920,12 @@ defmodule AshPostgres.DataLayer do
   end
 
   @impl true
-  def set_tenant(_resource, query, tenant) do
-    {:ok, Map.put(Ecto.Query.put_query_prefix(query, to_string(tenant)), :__tenant__, tenant)}
+  def set_tenant(resource, query, tenant) do
+    if Ash.Resource.Info.multitenancy_strategy(resource) == :context do
+      {:ok, Map.put(Ecto.Query.put_query_prefix(query, to_string(tenant)), :__tenant__, tenant)}
+    else
+      {:ok, query}
+    end
   end
 
   @impl true
@@ -3165,6 +3170,14 @@ defmodule AshPostgres.DataLayer do
         changeset.context
       )
       |> pkey_filter(changeset.data)
+      |> then(fn query ->
+        if changeset.tenant do
+          set_tenant(resource, query, changeset.tenant)
+          |> elem(1)
+        else
+          query
+        end
+      end)
       |> then(fn query ->
         Map.put(
           query,

lib/migration_generator/migration_generator.ex

@@ -460,8 +460,8 @@ defmodule AshPostgres.MigrationGenerator do
 
               You have migrations remaining that were generated with the --dev flag.
 
-              Run `mix ash.codegen <name>` to remove the dev migraitons and replace them
-              with production ready migrations.
+              Run `mix ash.codegen <name>` to remove the dev migrations and replace them
+              with production-ready migrations.
               """)
 
               exit({:shutdown, 1})
@@ -1989,6 +1989,17 @@ defmodule AshPostgres.MigrationGenerator do
     end)
   end
 
+  defp resource_has_meaningful_content?(snapshot) do
+    [
+      snapshot.attributes,
+      snapshot.identities,
+      snapshot.custom_indexes,
+      snapshot.custom_statements,
+      snapshot.check_constraints
+    ]
+    |> Enum.any?(&Enum.any?/1)
+  end
+
   defp do_fetch_operations(snapshot, existing_snapshot, opts, acc \\ [])
 
   defp do_fetch_operations(
@@ -2002,35 +2013,45 @@ defmodule AshPostgres.MigrationGenerator do
   end
 
   defp do_fetch_operations(snapshot, nil, opts, acc) do
-    empty_snapshot = %{
-      attributes: [],
-      identities: [],
-      schema: nil,
-      custom_indexes: [],
-      custom_statements: [],
-      check_constraints: [],
-      table: snapshot.table,
-      repo: snapshot.repo,
-      base_filter: nil,
-      empty?: true,
-      multitenancy: %{
-        attribute: nil,
-        strategy: nil,
-        global: nil
-      }
-    }
-
-    do_fetch_operations(snapshot, empty_snapshot, opts, [
-      %Operation.CreateTable{
+    if resource_has_meaningful_content?(snapshot) do
+      empty_snapshot = %{
+        attributes: [],
+        identities: [],
+        schema: nil,
+        custom_indexes: [],
+        custom_statements: [],
+        check_constraints: [],
         table: snapshot.table,
-        schema: snapshot.schema,
         repo: snapshot.repo,
-        multitenancy: snapshot.multitenancy,
-        old_multitenancy: empty_snapshot.multitenancy,
-        partitioning: snapshot.partitioning
+        base_filter: nil,
+        empty?: true,
+        multitenancy: %{
+          attribute: nil,
+          strategy: nil,
+          global: nil
+        }
       }
-      | acc
-    ])
+
+      do_fetch_operations(snapshot, empty_snapshot, opts, [
+        %Operation.CreateTable{
+          table: snapshot.table,
+          schema: snapshot.schema,
+          repo: snapshot.repo,
+          multitenancy: snapshot.multitenancy,
+          old_multitenancy: empty_snapshot.multitenancy,
+          partitioning: snapshot.partitioning
+        }
+        | acc
+      ])
+    else
+      if !opts.quiet do
+        Logger.info(
+          "Skipping migration for empty resource: #{snapshot.table} (no attributes, identities, indexes, statements, or constraints)"
+        )
+      end
+
+      acc
+    end
   end
 
   defp do_fetch_operations(snapshot, old_snapshot, opts, acc) do

lib/migration_generator/operation.ex

@@ -130,7 +130,7 @@ defmodule AshPostgres.MigrationGenerator.Operation do
 
     def index_keys(keys, all_tenants?, multitenancy) do
       if multitenancy.strategy == :attribute and not all_tenants? do
-        [multitenancy.attribute | keys]
+        Enum.uniq([multitenancy.attribute | keys])
       else
         keys
       end
@@ -752,7 +752,7 @@ defmodule AshPostgres.MigrationGenerator.Operation do
       up(%{
         op
         | old_attribute: op.new_attribute,
-          new_attribute: op.old_attribute,
+          new_attribute: Map.put(op.old_attribute, :source, op.new_attribute.source),
           old_multitenancy: op.multitenancy,
           multitenancy: op.old_multitenancy
       })

lib/mix/tasks/ash_postgres.install.ex

@@ -341,9 +341,8 @@ if Code.ensure_loaded?(Igniter) do
           Ecto.Adapters.SQL.Sandbox
         )
         |> Igniter.Project.Config.configure_new("test.exs", otp_app, [repo, :pool_size], 10)
-        |> Igniter.Project.Config.configure_new("test.exs", :ash, [:disable_async?], true)
-        |> Igniter.Project.Config.configure_new("test.exs", :logger, [:level], :warning)
       end
+      |> Igniter.Project.Config.configure_new("test.exs", :ash, [:disable_async?], true)
     end
 
     defp setup_data_case(igniter) do

mix.exs

@@ -5,7 +5,7 @@ defmodule AshPostgres.MixProject do
   The PostgreSQL data layer for Ash Framework
   """
 
-  @version "2.6.11"
+  @version "2.6.17"
 
   def project do
     [
@@ -166,8 +166,8 @@ defmodule AshPostgres.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:ash, ash_version("~> 3.5 and >= 3.5.13")},
-      {:ash_sql, ash_sql_version("~> 0.2 and >= 0.2.72")},
+      {:ash, ash_version("~> 3.5 and >= 3.5.35")},
+      {:ash_sql, ash_sql_version("~> 0.2 and >= 0.2.90")},
       {:igniter, "~> 0.6 and >= 0.6.14", optional: true},
       {:ecto_sql, "~> 3.13"},
       {:ecto, "~> 3.13"},