Skip to content

Commit 9024f12

Browse files
committed
fix: use tenant from root query when setting lateral join prefix
1 parent c160a6f commit 9024f12

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

lib/query.ex

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,11 @@ defmodule AshSql.Query do
417417

418418
defp set_lateral_join_prefix(ash_query, query) do
419419
if Ash.Resource.Info.multitenancy_strategy(ash_query.resource) == :context do
420-
Ash.Query.set_tenant(ash_query, query.prefix)
420+
tenant = query.prefix || ash_query.to_tenant
421+
422+
ash_query
423+
|> Ash.Query.set_tenant(tenant)
424+
|> Ash.Query.set_context(%{private: %{tenant: tenant}})
421425
else
422426
ash_query
423427
end

0 commit comments

Comments
 (0)