@budibase/server 1.0.193 → 1.0.196

package/dist/utilities/rowProcessor/utils.js

@@ -54,3 +54,26 @@ exports.processFormulas = (table, rows, { dynamic, contextRows } = { dynamic: tr
     }
     return single ? rows[0] : rows;
 };
+/**
+ * Processes any date columns and ensures that those without the ignoreTimezones
+ * flag set are parsed as UTC rather than local time.
+ */
+exports.processDates = (table, rows) => {
+    let datesWithTZ = [];
+    for (let [column, schema] of Object.entries(table.schema)) {
+        if (schema.type !== FieldTypes.DATETIME) {
+            continue;
+        }
+        if (!schema.ignoreTimezones) {
+            datesWithTZ.push(column);
+        }
+    }
+    for (let row of rows) {
+        for (let col of datesWithTZ) {
+            if (row[col] && typeof row[col] === "string" && !row[col].endsWith("Z")) {
+                row[col] = new Date(row[col]).toISOString();
+            }
+        }
+    }
+    return rows;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.193",
+  "version": "1.0.196",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.193",
-    "@budibase/client": "^1.0.193",
-    "@budibase/pro": "1.0.192",
-    "@budibase/string-templates": "^1.0.193",
+    "@budibase/backend-core": "^1.0.196",
+    "@budibase/client": "^1.0.196",
+    "@budibase/pro": "1.0.195",
+    "@budibase/string-templates": "^1.0.196",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -184,5 +184,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "e578ffe12ea6cda078836628b6e69f41a7048301"
+  "gitHead": "a7f4959e853eba49c4de3d7d355a98900eaa0591"
 }

package/src/api/controllers/row/ExternalRequest.ts

@@ -29,7 +29,10 @@ import { breakExternalTableId, isSQL } from "../../../integrations/utils"
 import { processObjectSync } from "@budibase/string-templates"
 // @ts-ignore
 import { cloneDeep } from "lodash/fp"
-import { processFormulas } from "../../../utilities/rowProcessor/utils"
+import {
+  processFormulas,
+  processDates,
+} from "../../../utilities/rowProcessor/utils"
 // @ts-ignore
 import { getAppDB } from "@budibase/backend-core/context"
 
@@ -434,7 +437,13 @@ module External {
           relationships
         )
       }
-      return processFormulas(table, Object.values(finalRows)).map((row: Row) =>
+
+      // Process some additional data types
+      let finalRowArray = Object.values(finalRows)
+      finalRowArray = processDates(table, finalRowArray)
+      finalRowArray = processFormulas(table, finalRowArray)
+
+      return finalRowArray.map((row: Row) =>
         this.squashRelationshipColumns(table, row, relationships)
       )
     }

package/src/definitions/common.ts

@@ -25,6 +25,7 @@ export interface FieldSchema {
   formula?: string
   formulaType?: string
   main?: boolean
+  ignoreTimezones?: boolean
   meta?: {
     toTable: string
     toKey: string

package/src/integrations/base/sqlTable.ts

@@ -61,7 +61,9 @@ function generateSchema(
         schema.boolean(key)
         break
       case FieldTypes.DATETIME:
-        schema.datetime(key)
+        schema.datetime(key, {
+          useTz: !column.ignoreTimezones,
+        })
         break
       case FieldTypes.ARRAY:
         schema.json(key)

package/src/integrations/googlesheets.ts

@@ -164,11 +164,15 @@ module GoogleSheetsModule {
         }
       )
 
+      const json = await response.json()
+
       if (response.status !== 200) {
-        throw new Error("Error authenticating with google sheets.")
+        throw new Error(
+          `Error authenticating with google sheets. ${json.error_description}`
+        )
       }
 
-      return response.json()
+      return json
     }
 
     async connect() {

package/src/integrations/mysql.ts

@@ -15,7 +15,6 @@ import {
 } from "./utils"
 import { DatasourcePlus } from "./base/datasourcePlus"
 import dayjs from "dayjs"
-import { FieldTypes } from "../constants"
 const { NUMBER_REGEX } = require("../utilities")
 
 module MySQLModule {
@@ -30,6 +29,7 @@ module MySQLModule {
     database: string
     ssl?: { [key: string]: any }
     rejectUnauthorized: boolean
+    typeCast: Function
   }
 
   const SCHEMA: Integration = {
@@ -89,6 +89,8 @@ module MySQLModule {
     },
   }
 
+  const TimezoneAwareDateTypes = ["timestamp"]
+
   function bindingTypeCoerce(bindings: any[]) {
     for (let i = 0; i < bindings.length; i++) {
       const binding = bindings[i]
@@ -131,7 +133,19 @@ module MySQLModule {
       }
       // @ts-ignore
       delete config.rejectUnauthorized
-      this.config = config
+      this.config = {
+        ...config,
+        typeCast: function (field: any, next: any) {
+          if (
+            field.type == "DATETIME" ||
+            field.type === "DATE" ||
+            field.type === "TIMESTAMP"
+          ) {
+            return field.string()
+          }
+          return next()
+        },
+      }
     }
 
     getBindingIdentifier(): string {

package/src/integrations/postgres.ts

@@ -16,10 +16,19 @@ import {
 import { DatasourcePlus } from "./base/datasourcePlus"
 
 module PostgresModule {
-  const { Client } = require("pg")
+  const { Client, types } = require("pg")
   const Sql = require("./base/sql")
   const { escapeDangerousCharacters } = require("../utilities")
 
+  // Return "date" and "timestamp" types as plain strings.
+  // This lets us reference the original stored timezone.
+  // types is undefined when running in a test env for some reason.
+  if (types) {
+    types.setTypeParser(1114, (val: any) => val) // timestamp
+    types.setTypeParser(1082, (val: any) => val) // date
+    types.setTypeParser(1184, (val: any) => val) // timestampz
+  }
+
   const JSON_REGEX = /'{.*}'::json/s
 
   interface PostgresConfig {

package/src/utilities/rowProcessor/utils.js

@@ -65,3 +65,28 @@ exports.processFormulas = (
   }
   return single ? rows[0] : rows
 }
+
+/**
+ * Processes any date columns and ensures that those without the ignoreTimezones
+ * flag set are parsed as UTC rather than local time.
+ */
+exports.processDates = (table, rows) => {
+  let datesWithTZ = []
+  for (let [column, schema] of Object.entries(table.schema)) {
+    if (schema.type !== FieldTypes.DATETIME) {
+      continue
+    }
+    if (!schema.ignoreTimezones) {
+      datesWithTZ.push(column)
+    }
+  }
+
+  for (let row of rows) {
+    for (let col of datesWithTZ) {
+      if (row[col] && typeof row[col] === "string" && !row[col].endsWith("Z")) {
+        row[col] = new Date(row[col]).toISOString()
+      }
+    }
+  }
+  return rows
+}