fix: ensure that tenant is properly used in many-to-many joins

Author: zachdaniel

lib/data_layer.ex

@@ -1247,7 +1247,9 @@ defmodule AshPostgres.DataLayer do
             through_query = Ecto.Query.exclude(through_query, :select)
 
             through_query =
-              if through_query.joins && through_query.joins != [] do
+              if (through_query.joins && through_query.joins != []) ||
+                   (Ash.Resource.Info.multitenancy_strategy(relationship.through) == :context &&
+                      source_query.tenant) do
                 subquery(
                   set_subquery_prefix(
                     through_query,
@@ -1256,7 +1258,7 @@ defmodule AshPostgres.DataLayer do
                   )
                 )
               else
-                through_query
+                set_subquery_prefix(through_query, source_query, relationship.through)
               end
 
             if query.__ash_bindings__[:__order__?] do

mix.exs

@@ -169,8 +169,7 @@ defmodule AshPostgres.MixProject do
       {:ash, ash_version("~> 3.5 and >= 3.5.35")},
       {:spark, "~> 2.3 and >= 2.3.4"},
       # TODO: bump to next ash_sql release
-      # {:ash_sql, ash_sql_version("~> 0.2 and >= 0.2.90")},
-      {:ash_sql, git: "https://github.com/ash-project/ash_sql.git"},
+      {:ash_sql, ash_sql_version(git: "https://github.com/ash-project/ash_sql.git")},
       {:igniter, "~> 0.6 and >= 0.6.14", optional: true},
       {:ecto_sql, "~> 3.13"},
       {:ecto, "~> 3.13"},

test/multitenancy_test.exs

@@ -2,7 +2,16 @@ defmodule AshPostgres.Test.MultitenancyTest do
   use AshPostgres.RepoCase, async: false
 
   require Ash.Query
-  alias AshPostgres.MultitenancyTest.{CompositeKeyPost, NamedOrg, Org, Post, User, NonMultitenantPostMultitenantLink}
+
+  alias AshPostgres.MultitenancyTest.{
+    CompositeKeyPost,
+    NamedOrg,
+    Org,
+    Post,
+    User,
+    NonMultitenantPostMultitenantLink
+  }
+
   alias AshPostgres.Test.Post, as: GlobalPost
 
   setup do
@@ -227,23 +236,27 @@ defmodule AshPostgres.Test.MultitenancyTest do
   end
 
   test "loading non multitenant resource across a many_to_many works", %{org1: org1} do
-    post = Post
+    post =
+      Post
       |> Ash.Changeset.for_create(:create, %{name: "foo"})
       |> Ash.Changeset.set_tenant(org1)
       |> Ash.create!()
 
-    GlobalPost
+    global_post =
+      GlobalPost
       |> Ash.Changeset.for_create(:create, %{title: "fred"})
       |> Ash.create!()
 
     NonMultitenantPostMultitenantLink
-      |> Ash.Changeset.for_create(:create, %{source_id: post.id, dest_id: global_post.id}, tenant: org1)
-      |> Ash.create!()
+    |> Ash.Changeset.for_create(:create, %{source_id: post.id, dest_id: global_post.id},
+      tenant: org1
+    )
+    |> Ash.create!()
 
-    post |> Ash.load!([:linked_non_multitenant_posts_through_multitenant_link], tenant: org1) |> IO.inspect()
+    post
+    |> Ash.load!([:linked_non_multitenant_posts_through_multitenant_link], tenant: org1)
   end
 
-
   test "manage_relationship from context multitenant resource to attribute multitenant resource doesn't raise an error" do
     org = Org |> Ash.Changeset.new() |> Ash.create!()
     user = User |> Ash.Changeset.new() |> Ash.create!()

test/support/multitenancy/resources/non_multitenant_post_multitenant_link.ex

@@ -29,7 +29,7 @@ defmodule AshPostgres.MultitenancyTest.NonMultitenantPostMultitenantLink do
   end
 
   attributes do
-    uuid_primary_key :id
+    uuid_primary_key(:id)
 
     attribute :state, :atom do
       public?(true)
@@ -40,13 +40,13 @@ defmodule AshPostgres.MultitenancyTest.NonMultitenantPostMultitenantLink do
 
   relationships do
     belongs_to :source, AshPostgres.MultitenancyTest.Post do
-      public? true
-      allow_nil? false
+      public?(true)
+      allow_nil?(false)
     end
 
     belongs_to :dest, AshPostgres.Test.Post do
-      public? true
-      allow_nil? false
+      public?(true)
+      allow_nil?(false)
     end
   end
 end

test/support/multitenancy/resources/post.ex

@@ -59,8 +59,9 @@ defmodule AshPostgres.MultitenancyTest.Post do
 
     # has_many(:non_multitenant_post_links, AshPostgres.MultitenancyTest.NonMultitenantPostLink)
 
-    has_many :non_multitenant_post_multitenant_links, AshPostgres.MultitenancyTest.NonMultitenantPostMultitenantLink do
-      destination_attribute :source_id
+    has_many :non_multitenant_post_multitenant_links,
+             AshPostgres.MultitenancyTest.NonMultitenantPostMultitenantLink do
+      destination_attribute(:source_id)
     end
 
     many_to_many :linked_non_multitenant_posts, AshPostgres.Test.Post do