Merge pull request #13519 from Budibase/budi-8179/mssql-schema-conflicts

MSSQL schema conflicts

packages/server/scripts/integrations/mssql/docker-compose.yaml

@@ -4,6 +4,7 @@ services:
   # user: sa
   # database: master
   mssql:
+    # platform: linux/amd64
     image: bb/mssql
     build:
       context: .

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

@@ -472,14 +472,13 @@ class InternalBuilder {
   ): Knex.QueryBuilder {
     const tableName = endpoint.entityId
     const tableAlias = aliases?.[tableName]
-    let table: string | Record<string, string> = tableName
-    if (tableAlias) {
-      table = { [tableAlias]: tableName }
-    }
-    let query = knex(table)
-    if (endpoint.schema) {
-      query = query.withSchema(endpoint.schema)
-    }
+
+    const query = knex(
+      this.tableNameWithSchema(tableName, {
+        alias: tableAlias,
+        schema: endpoint.schema,
+      })
+    )
     return query
   }