From a959a26d60a4fae91e939382ed447b991577c49d Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Mon, 24 Feb 2025 16:15:59 +0000
Subject: [PATCH] Support filtering relationships by _id

---
 .../src/api/routes/tests/search.spec.ts       | 22 +++++++++++++++++++
 .../server/src/sdk/app/rows/queryUtils.ts     |  7 +++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/api/routes/tests/search.spec.ts b/packages/server/src/api/routes/tests/search.spec.ts
index ee372914d7..ba2b3f0acf 100644
--- a/packages/server/src/api/routes/tests/search.spec.ts
+++ b/packages/server/src/api/routes/tests/search.spec.ts
@@ -3553,6 +3553,28 @@ if (descriptions.length) {
                     limit: 1,
                   }).toContainExactly([row])
                 })
+
+                it("can filter by the related _id", async () => {
+                  await expectSearch({
+                    query: {
+                      equal: { "rel._id": row.rel[0]._id },
+                    },
+                  }).toContainExactly([row])
+
+                  await expectSearch({
+                    query: {
+                      equal: { "rel._id": row.rel[1]._id },
+                    },
+                  }).toContainExactly([row])
+                })
+
+                it("can filter by the related _id and find nothing", async () => {
+                  await expectSearch({
+                    query: {
+                      equal: { "rel._id": "rel_none" },
+                    },
+                  }).toFindNothing()
+                })
               })
 
             !isInternal &&
diff --git a/packages/server/src/sdk/app/rows/queryUtils.ts b/packages/server/src/sdk/app/rows/queryUtils.ts
index ddd32870be..12e724b5d8 100644
--- a/packages/server/src/sdk/app/rows/queryUtils.ts
+++ b/packages/server/src/sdk/app/rows/queryUtils.ts
@@ -69,7 +69,8 @@ export const getQueryableFields = async (
     fromTables: string[],
     opts?: { noRelationships?: boolean }
   ): Promise<string[]> => {
-    const result = []
+    // Querying by _id is always allowed, even if it's never part of the schema
+    const result = ["_id"]
     for (const field of Object.keys(table.schema).filter(
       f => allowedFields.includes(f) && table.schema[f].visible !== false
     )) {
@@ -113,9 +114,7 @@ export const getQueryableFields = async (
     return result
   }
 
-  const result = [
-    "_id", // Querying by _id is always allowed, even if it's never part of the schema
-  ]
+  const result = []
 
   if (fields == null) {
     fields = Object.keys(table.schema)