From addd54a8e8baab79811e6f71aab728f32239577b Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 1 Oct 2024 15:39:33 +0100
Subject: [PATCH] Fix generic-sql.spec.ts

---
 packages/backend-core/src/sql/sql.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/backend-core/src/sql/sql.ts b/packages/backend-core/src/sql/sql.ts
index 14e32623e3..0f72eea96e 100644
--- a/packages/backend-core/src/sql/sql.ts
+++ b/packages/backend-core/src/sql/sql.ts
@@ -811,7 +811,10 @@ class InternalBuilder {
     let table: Table
     if (typeof t === "string") {
       if (!this.query.meta.tables?.[t]) {
-        throw new Error(`Table ${t} not found`)
+        // This can legitimately happen in custom queries, where the user is
+        // querying against a table that may not have been imported into
+        // Budibase.
+        return t
       }
       table = this.query.meta.tables[t]
     } else if (t) {
@@ -1547,12 +1550,12 @@ class SqlQueryBuilder extends SqlTableQueryBuilder {
       if (!this._isJsonColumn(field)) {
         continue
       }
-      const fullName = `${tableName}.${name}`
+      const fullName = `${tableName}.${name}` as keyof T
       for (let row of results) {
-        if (typeof row[fullName as keyof T] === "string") {
-          row[fullName as keyof T] = JSON.parse(row[fullName])
+        if (typeof row[fullName] === "string") {
+          row[fullName] = JSON.parse(row[fullName])
         }
-        if (typeof row[name as keyof T] === "string") {
+        if (typeof row[name] === "string") {
           row[name as keyof T] = JSON.parse(row[name])
         }
       }