@budibase/server 1.0.221 → 1.1.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.221",
+  "version": "1.1.4",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,10 +77,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.221",
-    "@budibase/client": "^1.0.221",
-    "@budibase/pro": "1.0.220",
-    "@budibase/string-templates": "^1.0.221",
+    "@budibase/backend-core": "^1.1.4",
+    "@budibase/client": "^1.1.4",
+    "@budibase/pro": "1.1.3",
+    "@budibase/string-templates": "^1.1.4",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -151,7 +151,7 @@
     "@babel/core": "7.17.4",
     "@babel/preset-env": "7.16.11",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/types": "^1.0.221",
+    "@budibase/types": "^1.1.4",
     "@jest/test-sequencer": "24.9.0",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "4e1904bba3bbec3d6f36827ecd012827b5e76cd8"
+  "gitHead": "8f9b9b62422e22bdf844a61ac9344fda9900d079"
 }

package/src/api/controllers/query/index.ts

@@ -1,5 +1,5 @@
 import { generateQueryID, getQueryParams, isProdAppID } from "../../../db/utils"
-import { BaseQueryVerbs } from "../../../constants"
+import { BaseQueryVerbs, FieldTypes } from "../../../constants"
 import { Thread, ThreadType } from "../../../threads"
 import { save as saveDatasource } from "../datasource"
 import { RestImporter } from "./import"
@@ -154,10 +154,37 @@ export async function preview(ctx: any) {
         },
       })
     const { rows, keys, info, extra } = await quotas.addQuery(runFn)
+    const schemaFields: any = {}
+    if (rows?.length > 0) {
+      for (let key of [...new Set(keys)] as string[]) {
+        const field = rows[0][key]
+        let type = typeof field,
+          fieldType = FieldTypes.STRING
+        if (field)
+          switch (type) {
+            case "boolean":
+              schemaFields[key] = FieldTypes.BOOLEAN
+              break
+            case "object":
+              if (field instanceof Date) {
+                fieldType = FieldTypes.DATETIME
+              } else if (Array.isArray(field)) {
+                fieldType = FieldTypes.ARRAY
+              } else {
+                fieldType = FieldTypes.JSON
+              }
+              break
+            case "number":
+              fieldType = FieldTypes.NUMBER
+              break
+          }
+        schemaFields[key] = fieldType
+      }
+    }
     await events.query.previewed(datasource, query)
     ctx.body = {
       rows,
-      schemaFields: [...new Set(keys)],
+      schemaFields,
       info,
       extra,
     }

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

@@ -215,7 +215,10 @@ describe("/queries", () => {
         .expect("Content-Type", /json/)
         .expect(200)
       // these responses come from the mock
-      expect(res.body.schemaFields).toEqual(["a", "b"])
+      expect(res.body.schemaFields).toEqual({
+        "a": "string",
+        "b": "number",
+      })
       expect(res.body.rows.length).toEqual(1)
       expect(events.query.previewed).toBeCalledTimes(1)
       expect(events.query.previewed).toBeCalledWith(datasource, query)
@@ -289,7 +292,11 @@ describe("/queries", () => {
         queryString: "test={{ variable2 }}",
       })
       // these responses come from the mock
-      expect(res.body.schemaFields).toEqual(["url", "opts", "value"])
+      expect(res.body.schemaFields).toEqual({
+        "opts": "json",
+        "url": "string",
+        "value": "string",
+      })
       expect(res.body.rows[0].url).toEqual("http://www.google.com?test=1")
     })
 
@@ -299,7 +306,11 @@ describe("/queries", () => {
         path: "www.google.com",
         queryString: "test={{ variable3 }}",
       })
-      expect(res.body.schemaFields).toEqual(["url", "opts", "value"])
+      expect(res.body.schemaFields).toEqual({
+        "opts": "json",
+        "url": "string",
+        "value": "string"
+      })
       expect(res.body.rows[0].url).toContain("doctype html")
     })
 
@@ -318,7 +329,11 @@ describe("/queries", () => {
         path: "www.failonce.com",
         queryString: "test={{ variable3 }}",
       })
-      expect(res.body.schemaFields).toEqual(["fails", "url", "opts"])
+      expect(res.body.schemaFields).toEqual({
+        "fails": "number",
+        "opts": "json",
+        "url": "string"
+      })
       expect(res.body.rows[0].fails).toEqual(1)
     })
 

package/src/integrations/index.ts

@@ -53,7 +53,7 @@ const INTEGRATIONS = {
 }
 
 // optionally add oracle integration if the oracle binary can be installed
-if (!(process.arch === "arm64" && process.platform === "darwin")) {
+if (process.arch && !process.arch.startsWith("arm")) {
   const oracle = require("./oracle")
   DEFINITIONS[SourceNames.ORACLE] = oracle.schema
   INTEGRATIONS[SourceNames.ORACLE] = oracle.integration