Adding missing files.

packages/server/src/api/controllers/row/alias.ts

@@ -107,57 +107,62 @@ export default class AliasTables {
   }
 
   async queryWithAliasing(json: QueryJson): DatasourcePlusQueryResponse {
-    json = cloneDeep(json)
-    const aliasTable = (table: Table) => ({
-      ...table,
-      name: this.getAlias(table.name),
-    })
-    // run through the query json to update anywhere a table may be used
-    if (json.resource?.fields) {
-      json.resource.fields = json.resource.fields.map(field =>
-        this.aliasField(field)
-      )
-    }
-    if (json.filters) {
-      for (let [filterKey, filter] of Object.entries(json.filters)) {
-        if (typeof filter !== "object") {
-          continue
-        }
-        const aliasedFilters: typeof filter = {}
-        for (let key of Object.keys(filter)) {
-          aliasedFilters[this.aliasField(key)] = filter[key]
-        }
-        json.filters[filterKey as keyof SearchFilters] = aliasedFilters
+    const fieldLength = json.resource?.fields?.length
+    const aliasingEnabled = fieldLength && fieldLength > 0
+    if (aliasingEnabled) {
+      json = cloneDeep(json)
+      const aliasTable = (table: Table) => ({
+        ...table,
+        name: this.getAlias(table.name),
+        originalName: table.name,
+      })
+      // run through the query json to update anywhere a table may be used
+      if (json.resource?.fields) {
+        json.resource.fields = json.resource.fields.map(field =>
+          this.aliasField(field)
+        )
       }
-    }
-    if (json.relationships) {
-      json.relationships = json.relationships.map(relationship => ({
-        ...relationship,
-        aliases: this.aliasMap([
-          relationship.through,
-          relationship.tableName,
-          json.endpoint.entityId,
-        ]),
-      }))
-    }
-    if (json.meta?.table) {
-      json.meta.table = aliasTable(json.meta.table)
-    }
-    if (json.meta?.tables) {
-      const aliasedTables: Record<string, Table> = {}
-      for (let [tableName, table] of Object.entries(json.meta.tables)) {
-        aliasedTables[this.getAlias(tableName)] = aliasTable(table)
+      if (json.filters) {
+        for (let [filterKey, filter] of Object.entries(json.filters)) {
+          if (typeof filter !== "object") {
+            continue
+          }
+          const aliasedFilters: typeof filter = {}
+          for (let key of Object.keys(filter)) {
+            aliasedFilters[this.aliasField(key)] = filter[key]
+          }
+          json.filters[filterKey as keyof SearchFilters] = aliasedFilters
+        }
       }
-      json.meta.tables = aliasedTables
+      if (json.relationships) {
+        json.relationships = json.relationships.map(relationship => ({
+          ...relationship,
+          aliases: this.aliasMap([
+            relationship.through,
+            relationship.tableName,
+            json.endpoint.entityId,
+          ]),
+        }))
+      }
+      if (json.meta?.table) {
+        json.meta.table = aliasTable(json.meta.table)
+      }
+      if (json.meta?.tables) {
+        const aliasedTables: Record<string, Table> = {}
+        for (let [tableName, table] of Object.entries(json.meta.tables)) {
+          aliasedTables[this.getAlias(tableName)] = aliasTable(table)
+        }
+        json.meta.tables = aliasedTables
+      }
+      // invert and return
+      const invertedTableAliases: Record<string, string> = {}
+      for (let [key, value] of Object.entries(this.tableAliases)) {
+        invertedTableAliases[value] = key
+      }
+      json.tableAliases = invertedTableAliases
     }
-    // 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)
-    if (Array.isArray(response)) {
+    if (Array.isArray(response) && aliasingEnabled) {
       return this.reverse(response)
     } else {
       return response

packages/server/src/integrations/base/sql.ts

@@ -9,9 +9,12 @@ import {
   RelationshipsJson,
   SearchFilters,
   SortDirection,
+  Table,
 } from "@budibase/types"
 import environment from "../../environment"
 
+type QueryFunction = (query: Knex.SqlNative, operation: Operation) => any
+
 const envLimit = environment.SQL_MAX_ROWS
   ? parseInt(environment.SQL_MAX_ROWS)
   : null
@@ -117,6 +120,29 @@ function generateSelectStatement(
   })
 }
 
+function disableAliasing(json: QueryJson) {
+  if (json.tableAliases) {
+    json.tableAliases = undefined
+  }
+  const removeTableAlias = (table: Table) => {
+    if (table.originalName) {
+      table.name = table.originalName
+    }
+    return table
+  }
+  if (json.meta?.table) {
+    json.meta.table = removeTableAlias(json.meta.table)
+  }
+  if (json.meta?.tables) {
+    for (let tableName of Object.keys(json.meta.tables)) {
+      json.meta.tables[tableName] = removeTableAlias(
+        json.meta.tables[tableName]
+      )
+    }
+  }
+  return json
+}
+
 class InternalBuilder {
   private readonly client: string
 
@@ -605,10 +631,12 @@ class SqlQueryBuilder extends SqlTableQueryBuilder {
     return query.toSQL().toNative()
   }
 
-  async getReturningRow(queryFn: Function, json: QueryJson) {
+  async getReturningRow(queryFn: QueryFunction, json: QueryJson) {
     if (!json.extra || !json.extra.idFilter) {
       return {}
     }
+    // disable aliasing if it is enabled
+    json = disableAliasing(json)
     const input = this._query({
       endpoint: {
         ...json.endpoint,
@@ -617,7 +645,7 @@ class SqlQueryBuilder extends SqlTableQueryBuilder {
       resource: {
         fields: [],
       },
-      filters: json.extra.idFilter,
+      filters: json.extra?.idFilter,
       paginate: {
         limit: 1,
       },
@@ -646,7 +674,7 @@ class SqlQueryBuilder extends SqlTableQueryBuilder {
   // this function recreates the returning functionality of postgres
   async queryWithReturning(
     json: QueryJson,
-    queryFn: Function,
+    queryFn: QueryFunction,
     processFn: Function = (result: any) => result
   ) {
     const sqlClient = this.getSqlClient()

packages/server/src/integrations/tests/sqlAlias.spec.ts

@@ -4,6 +4,7 @@ import Sql from "../base/sql"
 import { SqlClient } from "../utils"
 import AliasTables from "../../api/controllers/row/alias"
 import { generator } from "@budibase/backend-core/tests"
+import { Knex } from "knex"
 
 function multiline(sql: string) {
   return sql.replace(/\n/g, "").replace(/ +/g, " ")
@@ -160,6 +161,28 @@ describe("Captures of real examples", () => {
     })
   })
 
+  describe("returning (everything bar Postgres)", () => {
+    it("should be able to handle row returning", () => {
+      const queryJson = getJson("createSimple.json")
+      const SQL = new Sql(SqlClient.MS_SQL, limit)
+      let query = SQL._query(queryJson, { disableReturning: true })
+      expect(query).toEqual({
+        sql: "insert into [people] ([age], [name]) values (@p0, @p1)",
+        bindings: [222, "awfawf"],
+      })
+
+      // now check returning
+      let returningQuery: Knex.SqlNative = { sql: "", bindings: [] }
+      SQL.getReturningRow((input: Knex.SqlNative) => {
+        returningQuery = input
+      }, queryJson)
+      expect(returningQuery).toEqual({
+        sql: "select * from (select top (@p0) * from [people] where [people].[name] = @p1 and [people].[age] = @p2 order by [people].[name] asc) as [people]",
+        bindings: [1, "awfawf", 222],
+      })
+    })
+  })
+
   describe("check max character aliasing", () => {
     it("should handle over 'z' max character alias", () => {
       const tableNames = []

packages/server/src/integrations/tests/sqlQueryJson/createSimple.json

@@ -0,0 +1,65 @@
+{
+  "endpoint": {
+    "datasourceId": "datasource_plus_0ed5835e5552496285df546030f7c4ae",
+    "entityId": "people",
+    "operation": "CREATE"
+  },
+  "resource": {
+    "fields": [
+      "a.name",
+      "a.age"
+    ]
+  },
+  "filters": {},
+  "relationships": [],
+  "body": {
+    "name": "awfawf",
+    "age": 222
+  },
+  "extra": {
+    "idFilter": {
+      "equal": {
+        "name": "awfawf",
+        "age": 222
+      }
+    }
+  },
+  "meta": {
+    "table": {
+      "_id": "datasource_plus_0ed5835e5552496285df546030f7c4ae__people",
+      "type": "table",
+      "sourceId": "datasource_plus_0ed5835e5552496285df546030f7c4ae",
+      "sourceType": "external",
+      "primary": [
+        "name",
+        "age"
+      ],
+      "name": "a",
+      "schema": {
+        "name": {
+          "type": "string",
+          "externalType": "varchar",
+          "autocolumn": false,
+          "name": "name",
+          "constraints": {
+            "presence": true
+          }
+        },
+        "age": {
+          "type": "number",
+          "externalType": "int",
+          "autocolumn": false,
+          "name": "age",
+          "constraints": {
+            "presence": false
+          }
+        }
+      },
+      "primaryDisplay": "name",
+      "originalName": "people"
+    }
+  },
+  "tableAliases": {
+    "people": "a"
+  }
+}

packages/types/src/documents/app/table/table.ts

@@ -15,6 +15,7 @@ export interface Table extends Document {
   sourceType: TableSourceType
   views?: { [key: string]: View | ViewV2 }
   name: string
+  originalName?: string
   sourceId: string
   primary?: string[]
   schema: TableSchema