Merge branch 'main' into fix/tenant-migrations-should-honor-module-attributes

* main: (23 commits)
  fix: do not build query filter with or: [] when all records are successfully inserted, for return_skipped_upsert?: true (#659)
  test: load aggregate with select and sort on from_many relationship (#661)
  test: add failing test for expr(has_one.function_calc) nil poisoning in batch (#660)
  test: aggregate with parent ref in relationship filter and sorting on relationship field (#658)
  test: binding error when loading aggregate (#657)
  chore(deps): bump ash_sql in the production-dependencies group (#656)
  test: multi relationship problems (#654)
  chore: release version v2.6.26
  chore: update ash_sql, use new select binding
  test: add complex calculation tests with filtered aggregates (#652)
  improvement: add generator to tsvector type (#655)
  test: add failing test for aggregate filtering on nested first aggregate (#653)
  chore: update ash_sql and add test
  docs: Mention :define_ecto_repo? option of use AshPostgres.Repo macro in getting started guide (#648)
  improvement: verify check constraint attributes at compile time
  chore: update ash
  chore: reuse compliance
  improvement: update deps for bug fixes
  chore: release version v2.6.25
  test: Add failing test for aggregate with parent() + select() + limit() (#644)
  ...

Author: rgraff

CHANGELOG.md

@@ -11,6 +11,43 @@ See [Conventional Commits](https://www.conventionalcommits.org) for commit guide
 
 <!-- changelog -->
 
+## [v2.6.26](https://github.com/ash-project/ash_postgres/compare/v2.6.25...v2.6.26) (2025-11-23)
+
+
+
+
+### Improvements:
+
+* add generator to tsvector type (#655) by Jesse Williams
+
+* verify check constraint attributes at compile time by Zach Daniel
+
+* update deps for bug fixes by Zach Daniel
+
+## [v2.6.25](https://github.com/ash-project/ash_postgres/compare/v2.6.24...v2.6.25) (2025-11-05)
+
+
+
+
+### Bug Fixes:
+
+* add failing test for exists expansnion inside of calculations by Zach Daniel
+
+## [v2.6.24](https://github.com/ash-project/ash_postgres/compare/v2.6.23...v2.6.24) (2025-10-30)
+
+
+
+
+### Bug Fixes:
+
+* handle results that can't be mapped to the changeset in bulk_create (#638) by Barnabas Jovanovics
+
+* handle results that can't be mapped to the changeset in bulk_create by Barnabas Jovanovics
+
+### Improvements:
+
+* remove unused bulk operation metadata function & update ash by Zach Daniel
+
 ## [v2.6.23](https://github.com/ash-project/ash_postgres/compare/v2.6.22...v2.6.23) (2025-10-15)
 
 

documentation/tutorials/get-started-with-ash-postgres.md

@@ -56,6 +56,28 @@ defmodule Helpdesk.Repo do
 end
 ```
 
+If your project already defines its own `Ecto.Repo` (for example, to integrate with third-party libraries such as AppSignal), you can prevent `AshPostgres.Repo` from automatically defining one by setting the `define_ecto_repo?: false` option:
+
+```elixir
+# in lib/helpdesk/repo.ex
+
+defmodule Helpdesk.Repo do
+  use Appsignal.Ecto.Repo,
+    otp_app: :helpdesk,
+    adapter: Ecto.Adapters.Postgres
+
+  use AshPostgres.Repo,
+    define_ecto_repo?: false
+
+  def installed_extensions do
+    ["ash-functions"]
+  end
+end
+```
+
+This lets you keep full control over your existing `Ecto.Repo` definition while still enabling AshPostgres features.
+
+
 Next we will need to create configuration files for various environments. Run the following to create the configuration files we need.
 
 ```bash

lib/data_layer.ex

@@ -417,6 +417,7 @@ defmodule AshPostgres.DataLayer do
     verifiers: [
       AshPostgres.Verifiers.PreventMultidimensionalArrayAggregates,
       AshPostgres.Verifiers.ValidateReferences,
+      AshPostgres.Verifiers.ValidateCheckConstraints,
       AshPostgres.Verifiers.PreventAttributeMultitenancyAndNonFullMatchType,
       AshPostgres.Verifiers.EnsureTableOrPolymorphic,
       AshPostgres.Verifiers.ValidateIdentityIndexNames
@@ -2058,39 +2059,46 @@ defmodule AshPostgres.DataLayer do
               {Map.take(r, keys), r}
             end)
 
-          ash_query =
-            resource
-            |> Ash.Query.do_filter(
-              or:
-                changesets
-                |> Enum.filter(fn changeset ->
-                  not Map.has_key?(
-                    results_by_identity,
-                    Map.take(changeset.attributes, keys)
-                  )
-                end)
-                |> Enum.map(fn changeset ->
-                  changeset.attributes
-                  |> Map.take(keys)
-                  |> Keyword.new()
-                end)
-            )
-            |> then(fn
-              query when is_nil(identity) or is_nil(identity.where) -> query
-              query -> Ash.Query.do_filter(query, identity.where)
+          skipped_filter =
+            changesets
+            |> Enum.filter(fn changeset ->
+              not Map.has_key?(
+                results_by_identity,
+                Map.take(changeset.attributes, keys)
+              )
+            end)
+            |> Enum.map(fn changeset ->
+              changeset.attributes
+              |> Map.take(keys)
+              |> Keyword.new()
             end)
-            |> Ash.Query.set_tenant(changeset.tenant)
 
           skipped_upserts =
-            with {:ok, ecto_query} <- Ash.Query.data_layer_query(ash_query),
-                 {:ok, results} <- run_query(ecto_query, resource) do
-              results
-              |> Enum.map(fn result ->
-                Ash.Resource.put_metadata(result, :upsert_skipped, true)
-              end)
-              |> Enum.reduce(%{}, fn r, acc ->
-                Map.put(acc, Map.take(r, keys), r)
-              end)
+            case skipped_filter do
+              [] ->
+                # No skipped records to query for
+                %{}
+
+              skipped_filter ->
+                ash_query =
+                  resource
+                  |> Ash.Query.do_filter(or: skipped_filter)
+                  |> then(fn
+                    query when is_nil(identity) or is_nil(identity.where) -> query
+                    query -> Ash.Query.do_filter(query, identity.where)
+                  end)
+                  |> Ash.Query.set_tenant(changeset.tenant)
+
+                with {:ok, ecto_query} <- Ash.Query.data_layer_query(ash_query),
+                     {:ok, results} <- run_query(ecto_query, resource) do
+                  results
+                  |> Enum.map(fn result ->
+                    Ash.Resource.put_metadata(result, :upsert_skipped, true)
+                  end)
+                  |> Enum.reduce(%{}, fn r, acc ->
+                    Map.put(acc, Map.take(r, keys), r)
+                  end)
+                end
             end
 
           results =
@@ -2143,8 +2151,8 @@ defmodule AshPostgres.DataLayer do
                     # Compatibility fallback
                     Ash.Resource.put_metadata(
                       result_for_changeset,
-                      :bulk_create_index,
-                      changeset.context[:bulk_create][:index]
+                      :bulk_action_ref,
+                      changeset.context[:bulk_create][:ref]
                     )
                   end
                 end)
@@ -2160,8 +2168,8 @@ defmodule AshPostgres.DataLayer do
                   # Compatibility fallback
                   Ash.Resource.put_metadata(
                     result,
-                    :bulk_create_index,
-                    changeset.context[:bulk_create][:index]
+                    :bulk_action_ref,
+                    changeset.context[:bulk_create][:ref]
                   )
                 end)
               end
@@ -3455,6 +3463,7 @@ defmodule AshPostgres.DataLayer do
   @impl true
   def select(query, select, _resource) do
     query = maybe_subquery_upgrade(query, {:select, select})
+    query = put_in(query.__ash_bindings__[:select], select)
 
     if query.__ash_bindings__.context[:data_layer][:combination_query?] ||
          query.__ash_bindings__.context[:data_layer][:combination_of_queries?] do
@@ -3615,6 +3624,8 @@ defmodule AshPostgres.DataLayer do
             :__ash_bindings__,
             &Map.merge(&1, %{
               already_selected: fieldset,
+              select: query.__ash_bindings__[:select],
+              select_calculations: query.__ash_bindings__[:select_calculations],
               subquery_upgrade?: true,
               sort: query.__ash_bindings__[:sort],
               context: query.__ash_bindings__.context

lib/types/tsvector.ex

@@ -64,4 +64,9 @@ defmodule AshPostgres.Tsvector do
   def cast_stored(_, _) do
     :error
   end
+
+  @impl true
+  def generator(_constraints) do
+    StreamData.constant([])
+  end
 end

lib/verifiers/validate_check_constraints.ex

@@ -0,0 +1,35 @@
+# SPDX-FileCopyrightText: 2019 ash_postgres contributors <https://github.com/ash-project/ash_postgres/graphs.contributors>
+#
+# SPDX-License-Identifier: MIT
+
+defmodule AshPostgres.Verifiers.ValidateCheckConstraints do
+  @moduledoc false
+  use Spark.Dsl.Verifier
+  alias Spark.Dsl.Verifier
+
+  def verify(dsl) do
+    resource = Verifier.get_persisted(dsl, :module)
+
+    dsl
+    |> AshPostgres.DataLayer.Info.check_constraints()
+    |> Enum.each(fn constraint ->
+      constraint.attribute
+      |> List.wrap()
+      |> Enum.each(fn attribute_name ->
+        if is_nil(Ash.Resource.Info.attribute(dsl, attribute_name)) do
+          raise Spark.Error.DslError,
+            path: [:postgres, :check_constraints, constraint.name],
+            module: resource,
+            message: """
+            Check constraint `#{constraint.name}` references attribute `#{attribute_name}`, but no such attribute exists on resource `#{inspect(resource)}`.
+
+            Available attributes: #{dsl |> Ash.Resource.Info.attributes() |> Enum.map(& &1.name) |> inspect()}
+            """,
+            location: Spark.Dsl.Transformer.get_section_anno(dsl, [:postgres, :check_constraints])
+        end
+      end)
+    end)
+
+    :ok
+  end
+end

mix.exs

@@ -9,7 +9,7 @@ defmodule AshPostgres.MixProject do
   The PostgreSQL data layer for Ash Framework
   """
 
-  @version "2.6.23"
+  @version "2.6.26"
 
   def project do
     [
@@ -177,9 +177,9 @@ defmodule AshPostgres.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:ash, ash_version("~> 3.7 and >= 3.7.5")},
+      {:ash, ash_version("~> 3.10")},
       {:spark, "~> 2.3 and >= 2.3.4"},
-      {:ash_sql, ash_sql_version("~> 0.3 and >= 0.3.7")},
+      {:ash_sql, ash_sql_version("~> 0.3 and >= 0.3.14")},
       {:igniter, "~> 0.6 and >= 0.6.29", optional: true},
       {:ecto_sql, "~> 3.13"},
       {:ecto, "~> 3.13"},
@@ -197,7 +197,8 @@ defmodule AshPostgres.MixProject do
       {:credo, ">= 0.0.0", only: [:dev, :test], runtime: false},
       {:mix_audit, ">= 0.0.0", only: [:dev, :test], runtime: false},
       {:dialyxir, ">= 0.0.0", only: [:dev, :test], runtime: false},
-      {:sobelow, ">= 0.0.0", only: [:dev, :test], runtime: false}
+      {:sobelow, ">= 0.0.0", only: [:dev, :test], runtime: false},
+      {:mix_test_interactive, "~> 5.0", only: [:dev, :test]}
     ]
   end