From c4f4a46d7002e3b4321bb6cd7c22b0a608d481bf Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 5 Feb 2024 12:45:19 +0000
Subject: [PATCH] Quick fix based on testing.

---
 .../server/src/api/controllers/row/alias.ts   |  7 +++++-
 packages/server/src/integrations/base/sql.ts  |  1 -
 .../server/src/integrations/tests/sql.spec.ts | 17 -------------
 .../src/integrations/tests/sqlAlias.spec.ts   | 25 +++++++++++++++++++
 4 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 packages/server/src/integrations/tests/sqlAlias.spec.ts

diff --git a/packages/server/src/api/controllers/row/alias.ts b/packages/server/src/api/controllers/row/alias.ts
index 589431cc1a..6533e51728 100644
--- a/packages/server/src/api/controllers/row/alias.ts
+++ b/packages/server/src/api/controllers/row/alias.ts
@@ -113,7 +113,12 @@ export default class AliasTables {
       }
       json.meta.tables = aliasedTables
     }
-    json.tableAliases = this.tableAliases
+    // invert and return
+    const invertedTableAliases: Record<string, string> = {}
+    for (let [key, value] of Object.entries(this.tableAliases)) {
+      invertedTableAliases[value] = key
+    }
+    json.tableAliases = invertedTableAliases
     const response = await getDatasourceAndQuery(json)
     return this.reverse(response)
   }
diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index c9be2e1ae6..cc2e1d94a8 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -499,7 +499,6 @@ class InternalBuilder {
       foundLimit = paginate.limit
     }
     // start building the query
-
     let query = this.knexWithAlias(knex, endpoint, tableAliases)
     query = query.limit(foundLimit)
     if (foundOffset) {
diff --git a/packages/server/src/integrations/tests/sql.spec.ts b/packages/server/src/integrations/tests/sql.spec.ts
index 0e7257242c..cf22064cb7 100644
--- a/packages/server/src/integrations/tests/sql.spec.ts
+++ b/packages/server/src/integrations/tests/sql.spec.ts
@@ -685,20 +685,3 @@ describe("SQL query builder", () => {
     })
   })
 })
-
-describe("Captures of real examples", () => {
-  const limit = 5000
-
-  function getJson(name: string): QueryJson {
-    return require(join(__dirname, "sqlQueryJson", name)) as QueryJson
-  }
-
-  it("should handle filtering by relationship", () => {
-    const queryJson = getJson(`filterByRelationship.json`)
-    let query = new Sql(SqlClient.POSTGRES, limit)._query(queryJson)
-    expect(query).toEqual({
-      bindings: [100, "assembling", limit],
-      sql: `select "a"."productname" as "a.productname", "a"."productid" as "a.productid", "b"."executorid" as "b.executorid", "b"."taskname" as "b.taskname", "b"."taskid" as "b.taskid", "b"."completed" as "b.completed", "b"."qaid" as "b.qaid" from (select * from "products" as "a" order by "a"."productname" asc limit $1) as "a" left join "products_tasks" as "c" on "a"."productid" = "c"."productid" left join "tasks" as "b" on "b"."taskid" = "c"."taskid" where "b"."taskname" = $2 order by "a"."productname" asc limit $3`,
-    })
-  })
-})
diff --git a/packages/server/src/integrations/tests/sqlAlias.spec.ts b/packages/server/src/integrations/tests/sqlAlias.spec.ts
new file mode 100644
index 0000000000..cfd82cfd01
--- /dev/null
+++ b/packages/server/src/integrations/tests/sqlAlias.spec.ts
@@ -0,0 +1,25 @@
+import { QueryJson } from "@budibase/types"
+import { join } from "path"
+import Sql from "../base/sql"
+import { SqlClient } from "../utils"
+
+describe("Captures of real examples", () => {
+  const limit = 5000
+
+  function getJson(name: string): QueryJson {
+    return require(join(__dirname, "sqlQueryJson", name)) as QueryJson
+  }
+
+  it("should handle basic retrieval", () => {
+    const queryJson = getJson("")
+  })
+
+  it("should handle filtering by relationship", () => {
+    const queryJson = getJson("filterByRelationship.json")
+    let query = new Sql(SqlClient.POSTGRES, limit)._query(queryJson)
+    expect(query).toEqual({
+      bindings: [100, "assembling", limit],
+      sql: `select "a"."productname" as "a.productname", "a"."productid" as "a.productid", "b"."executorid" as "b.executorid", "b"."taskname" as "b.taskname", "b"."taskid" as "b.taskid", "b"."completed" as "b.completed", "b"."qaid" as "b.qaid" from (select * from "products" as "a" order by "a"."productname" asc limit $1) as "a" left join "products_tasks" as "c" on "a"."productid" = "c"."productid" left join "tasks" as "b" on "b"."taskid" = "c"."taskid" where "b"."taskname" = $2 order by "a"."productname" asc limit $3`,
+    })
+  })
+})