@budibase/server 1.0.219-alpha.12 → 1.0.219-alpha.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.219-alpha.12",
+  "version": "1.0.219-alpha.15",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.219-alpha.12",
-    "@budibase/client": "^1.0.219-alpha.12",
-    "@budibase/pro": "1.0.219-alpha.11",
-    "@budibase/string-templates": "^1.0.219-alpha.12",
-    "@budibase/types": "^1.0.219-alpha.12",
+    "@budibase/backend-core": "^1.0.219-alpha.15",
+    "@budibase/client": "^1.0.219-alpha.15",
+    "@budibase/pro": "1.0.219-alpha.14",
+    "@budibase/string-templates": "^1.0.219-alpha.15",
+    "@budibase/types": "^1.0.219-alpha.15",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "f166ff9ac08ed2fda8623df5484744786560fc56"
+  "gitHead": "66ddcc18b4410188b02023e665eed0b84c7dff39"
 }

package/src/api/routes/tests/query.spec.js

@@ -218,7 +218,6 @@ describe("/queries", () => {
       expect(res.body.schemaFields).toEqual(["a", "b"])
       expect(res.body.rows.length).toEqual(1)
       expect(events.query.previewed).toBeCalledTimes(1)
-      datasource.config = { schema: "public" }
       expect(events.query.previewed).toBeCalledWith(datasource, query)
     })
 

package/src/integrations/base/sql.ts

@@ -99,8 +99,12 @@ function generateSelectStatement(
     const fieldNames = field.split(/\./g)
     const tableName = fieldNames[0]
     const columnName = fieldNames[1]
-    if (columnName && knex.client.config.client === SqlClients.POSTGRES) {
-      const externalType = schema?.[columnName].externalType
+    if (
+      columnName &&
+      schema?.[columnName] &&
+      knex.client.config.client === SqlClients.POSTGRES
+    ) {
+      const externalType = schema[columnName].externalType
       if (externalType?.includes("money")) {
         return knex.raw(
           `"${tableName}"."${columnName}"::money::numeric as "${field}"`

package/src/threads/query.js

@@ -10,6 +10,7 @@ const {
 } = require("@budibase/backend-core/auth")
 const { user: userCache } = require("@budibase/backend-core/cache")
 const { getGlobalIDFromUserMetadataID } = require("../db/utils")
+const { cloneDeep } = require("lodash/fp")
 
 const { isSQL } = require("../integrations/utils")
 const {
@@ -41,20 +42,22 @@ class QueryRunner {
   async execute() {
     let { datasource, fields, queryVerb, transformer } = this
 
-    const Integration = integrations[datasource.source]
+    let datasourceClone = cloneDeep(datasource)
+    let fieldsClone = cloneDeep(fields)
+
+    const Integration = integrations[datasourceClone.source]
     if (!Integration) {
       throw "Integration type does not exist."
     }
 
-    if (datasource.config.authConfigs) {
-      datasource.config.authConfigs = datasource.config.authConfigs.map(
-        config => {
+    if (datasourceClone.config.authConfigs) {
+      datasourceClone.config.authConfigs =
+        datasourceClone.config.authConfigs.map(config => {
           return enrichQueryFields(config, this.ctx)
-        }
-      )
+        })
     }
 
-    const integration = new Integration(datasource.config)
+    const integration = new Integration(datasourceClone.config)
 
     // pre-query, make sure datasource variables are added to parameters
     const parameters = await this.addDatasourceVariables()
@@ -65,19 +68,19 @@ class QueryRunner {
     const enrichedContext = { ...enrichedParameters, ...this.ctx }
 
     // Parse global headers
-    if (datasource.config.defaultHeaders) {
-      datasource.config.defaultHeaders = enrichQueryFields(
-        datasource.config.defaultHeaders,
+    if (datasourceClone.config.defaultHeaders) {
+      datasourceClone.config.defaultHeaders = enrichQueryFields(
+        datasourceClone.config.defaultHeaders,
         enrichedContext
       )
     }
 
     let query
     // handle SQL injections by interpolating the variables
-    if (isSQL(datasource)) {
-      query = interpolateSQL(fields, enrichedParameters, integration)
+    if (isSQL(datasourceClone)) {
+      query = interpolateSQL(fieldsClone, enrichedParameters, integration)
     } else {
-      query = enrichQueryFields(fields, enrichedContext)
+      query = enrichQueryFields(fieldsClone, enrichedContext)
     }
 
     // Add pagination values for REST queries
@@ -116,9 +119,10 @@ class QueryRunner {
         await this.refreshOAuth2(this.ctx)
         // Attempt to refresh the access token from the provider
         this.hasRefreshedOAuth = true
+      } else {
+        this.hasRerun = true
       }
 
-      this.hasRerun = true
       await threadUtils.invalidateDynamicVariables(this.cachedVariables)
       return this.execute()
     }
@@ -187,8 +191,9 @@ class QueryRunner {
     } else {
       // In this event the user may have oAuth issues that
       // could require re-authenticating with their provider.
+      let errorMessage = resp.err.data ? resp.err.data : resp.err.toString()
       throw new Error(
-        "OAuth2 access token could not be refreshed: " + resp.err.toString()
+        "OAuth2 access token could not be refreshed: " + errorMessage
       )
     }