From c8eebb0d9d9c9894e6490bf913c445f25e0ac6f1 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Fri, 2 Jan 2026 19:27:12 +0500
Subject: [PATCH] Fix relation query (#10346)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 foundations/core/packages/query/src/index.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/foundations/core/packages/query/src/index.ts b/foundations/core/packages/query/src/index.ts
index 1c9b373b32..3babe737be 100644
--- a/foundations/core/packages/query/src/index.ts
+++ b/foundations/core/packages/query/src/index.ts
@@ -1146,9 +1146,20 @@ export class LiveQuery implements WithTx, Client {
         const direct = assoc[1] === 1
         for (const doc of docs) {
           if (doc._id === sourceId) {
-            const docToPush = await this.findOne(direct ? association.classB : association.classA, {
-              _id: targetId
-            })
+            const nestedAssoc = assoc[2]
+            const options: FindOptions<Doc> | undefined =
+              nestedAssoc !== undefined
+                ? {
+                    associations: nestedAssoc
+                  }
+                : undefined
+            const docToPush = await this.findOne(
+              direct ? association.classB : association.classA,
+              {
+                _id: targetId
+              },
+              options
+            )
             if (docToPush === undefined) continue
             if (doc.$associations === undefined) {
               doc.$associations = {}