From 5d53e64360f9832cfee92521d6305b94aff42299 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 23 Aug 2024 18:45:13 +0100
Subject: [PATCH] Getting fields from all relationships loading correctly.

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

diff --git a/packages/backend-core/src/sql/sql.ts b/packages/backend-core/src/sql/sql.ts
index 1c87abf5ae..74678a79b5 100644
--- a/packages/backend-core/src/sql/sql.ts
+++ b/packages/backend-core/src/sql/sql.ts
@@ -761,8 +761,17 @@ class InternalBuilder {
     const { resource, tableAliases: aliases, endpoint } = this.query
     const fields = resource?.fields || []
     const jsonField = (field: string) => {
-      const unAliased = field.split(".").slice(1).join(".")
-      return `'${unAliased}',${field}`
+      const parts = field.split(".")
+      let tableField: string, unaliased: string
+      if (parts.length > 1) {
+        const alias = parts.shift()!
+        unaliased = parts.join(".")
+        tableField = `${this.quote(alias)}.${this.quote(unaliased)}`
+      } else {
+        unaliased = parts.join(".")
+        tableField = this.quote(unaliased)
+      }
+      return `'${unaliased}',${tableField}`
     }
     for (let relationship of relationships) {
       const {