Merge branch 'main' into feat-codegen-dev-mode

Author: ken-kost

CHANGELOG.md

@@ -5,6 +5,21 @@ See [Conventional Commits](https://www.conventionalcommits.org) for commit guide
 
 <!-- changelog -->
 
+## [v2.5.7](https://github.com/ash-project/ash_postgres/compare/v2.5.6...v2.5.7) (2025-03-04)
+
+
+
+
+### Bug Fixes:
+
+* handle errors from identities in polymorphic resources properly (#497)
+
+* Use exclusion_constraint instead of check_constraint in add_exclusion_constraints (#495)
+
+* check for stale record errors on destroy
+
+* don't rely on private function from `Ecto.Repo` (#492)
+
 ## [v2.5.6](https://github.com/ash-project/ash_postgres/compare/v2.5.5...v2.5.6) (2025-02-25)
 
 

lib/data_layer.ex

@@ -1964,7 +1964,17 @@ defmodule AshPostgres.DataLayer do
       end
     rescue
       e ->
-        changeset = Ash.Changeset.new(resource)
+        changeset =
+          case source do
+            {table, resource} ->
+              resource
+              |> Ash.Changeset.new()
+              |> Ash.Changeset.put_context(:data_layer, %{table: table})
+
+            resource ->
+              resource
+              |> Ash.Changeset.new()
+          end
 
         handle_raised_error(
           e,
@@ -2555,13 +2565,13 @@ defmodule AshPostgres.DataLayer do
         {key, name} ->
           case repo.default_constraint_match_type(:check, name) do
             {:regex, regex} ->
-              Ecto.Changeset.check_constraint(changeset, key,
+              Ecto.Changeset.exclusion_constraint(changeset, key,
                 name: regex,
                 match: :exact
               )
 
             match ->
-              Ecto.Changeset.check_constraint(changeset, key,
+              Ecto.Changeset.exclusion_constraint(changeset, key,
                 name: name,
                 match: match
               )
@@ -2570,14 +2580,14 @@ defmodule AshPostgres.DataLayer do
         {key, name, message} ->
           case repo.default_constraint_match_type(:check, name) do
             {:regex, regex} ->
-              Ecto.Changeset.check_constraint(changeset, key,
+              Ecto.Changeset.exclusion_constraint(changeset, key,
                 name: regex,
                 message: message,
                 match: :exact
               )
 
             match ->
-              Ecto.Changeset.check_constraint(changeset, key,
+              Ecto.Changeset.exclusion_constraint(changeset, key,
                 name: name,
                 message: message,
                 match: match

mix.exs

@@ -5,7 +5,7 @@ defmodule AshPostgres.MixProject do
   The PostgreSQL data layer for Ash Framework
   """
 
-  @version "2.5.6"
+  @version "2.5.7"
 
   def project do
     [

test/aggregate_test.exs

@@ -65,6 +65,35 @@ defmodule AshSql.AggregateTest do
     assert read_post.count_of_comments == 1
   end
 
+  test "nested filters on aggregates works" do
+    org =
+      Organization
+      |> Ash.Changeset.for_create(:create, %{name: "match"})
+      |> Ash.create!()
+
+    post =
+      Post
+      |> Ash.Changeset.for_create(:create, %{title: "match"})
+      |> Ash.Changeset.manage_relationship(:organization, org, type: :append_and_remove)
+      |> Ash.create!()
+
+    post2 =
+      Post
+      |> Ash.Changeset.for_create(:create, %{title: "match"})
+      |> Ash.create!()
+
+    Comment
+    |> Ash.Changeset.for_create(:create, %{title: "match"})
+    |> Ash.Changeset.manage_relationship(:post, post2, type: :append_and_remove)
+    |> Ash.create!()
+
+    assert [%{count_of_comments_matching_org_name: 1}] =
+             Post
+             |> Ash.Query.load(:count_of_comments_matching_org_name)
+             |> Ash.Query.filter(id == ^post.id)
+             |> Ash.read!()
+  end
+
   describe "Context Multitenancy" do
     alias AshPostgres.MultitenancyTest.{Org, Post, User}
 

test/support/resources/post.ex

@@ -850,6 +850,13 @@ defmodule AshPostgres.Test.Post do
       filter(title: "match")
     end
 
+    count :count_of_comments_matching_org_name, [
+      :posts_with_matching_title,
+      :comments
+    ] do
+      filter(expr(parent(organization.name) == title))
+    end
+
     count(:count_of_comments_containing_title, :comments_containing_title)
 
     first :first_comment, :comments, :title do