@budibase/server 1.0.44-alpha.1 → 1.0.44

package/dist/utilities/workerRequests.js

@@ -71,7 +71,7 @@ exports.getDeployedApps = () => __awaiter(void 0, void 0, void 0, function* () {
         for (let [key, value] of Object.entries(json)) {
             if (value.url) {
                 value.url = value.url.toLowerCase();
-                apps[key] = value;
+                apps[key.toLowerCase()] = value;
             }
         }
         return apps;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.44-alpha.1",
+  "version": "1.0.44",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.44-alpha.1",
-    "@budibase/client": "^1.0.44-alpha.1",
-    "@budibase/string-templates": "^1.0.44-alpha.1",
+    "@budibase/backend-core": "^1.0.44",
+    "@budibase/client": "^1.0.44",
+    "@budibase/string-templates": "^1.0.44",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -165,5 +165,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "89077f9860d5bce6e39e702a3a42fb03bba70e99"
+  "gitHead": "2eb6bef9f5255148c820c0b3b5d8d92db7c86a50"
 }

package/src/api/controllers/row/utils.js

@@ -61,17 +61,12 @@ exports.validate = async ({ appId, tableId, row, table }) => {
     let res
 
     // Validate.js doesn't seem to handle array
-    if (type === FieldTypes.ARRAY && row[fieldName]) {
-      if (row[fieldName].length) {
-        row[fieldName].map(val => {
-          if (!constraints.inclusion.includes(val)) {
-            errors[fieldName] = "Field not in list"
-          }
-        })
-      } else if (constraints.presence && row[fieldName].length === 0) {
-        // non required MultiSelect creates an empty array, which should not throw errors
-        errors[fieldName] = [`${fieldName} is required`]
-      }
+    if (type === FieldTypes.ARRAY && row[fieldName] && row[fieldName].length) {
+      row[fieldName].map(val => {
+        if (!constraints.inclusion.includes(val)) {
+          errors[fieldName] = "Field not in list"
+        }
+      })
     } else if (type === FieldTypes.JSON && typeof row[fieldName] === "string") {
       // this should only happen if there is an error
       try {

package/src/api/controllers/table/index.js

@@ -2,7 +2,7 @@ const CouchDB = require("../../../db")
 const internal = require("./internal")
 const external = require("./external")
 const csvParser = require("../../../utilities/csvParser")
-const { isExternalTable, isSQL } = require("../../../integrations/utils")
+const { isExternalTable } = require("../../../integrations/utils")
 const {
   getTableParams,
   getDatasourceParams,
@@ -32,8 +32,8 @@ exports.fetch = async function (ctx) {
     })
   )
 
-  const internal = internalTables.rows.map(tableDoc => ({
-    ...tableDoc.doc,
+  const internal = internalTables.rows.map(row => ({
+    ...row.doc,
     type: "internal",
     sourceId: BudibaseInternalDB._id,
   }))
@@ -44,18 +44,12 @@ exports.fetch = async function (ctx) {
     })
   )
 
-  const external = externalTables.rows.flatMap(tableDoc => {
-    let entities = tableDoc.doc.entities
-    if (entities) {
-      return Object.values(entities).map(entity => ({
-        ...entity,
-        type: "external",
-        sourceId: tableDoc.doc._id,
-        sql: isSQL(tableDoc.doc),
-      }))
-    } else {
-      return []
-    }
+  const external = externalTables.rows.flatMap(row => {
+    return Object.values(row.doc.entities || {}).map(entity => ({
+      ...entity,
+      type: "external",
+      sourceId: row.doc._id,
+    }))
   })
 
   ctx.body = [...internal, ...external]

package/src/api/controllers/table/utils.js

@@ -12,7 +12,6 @@ const { USERS_TABLE_SCHEMA, SwitchableTypes } = require("../../../constants")
 const {
   isExternalTable,
   breakExternalTableId,
-  isSQL,
 } = require("../../../integrations/utils")
 const { getViews, saveView } = require("../view/utils")
 const viewTemplate = require("../view/viewBuilder")
@@ -243,9 +242,7 @@ exports.getTable = async (appId, tableId) => {
   const db = new CouchDB(appId)
   if (isExternalTable(tableId)) {
     let { datasourceId, tableName } = breakExternalTableId(tableId)
-    const datasource = await db.get(datasourceId)
-    const table = await exports.getExternalTable(appId, datasourceId, tableName)
-    return { ...table, sql: isSQL(datasource) }
+    return exports.getExternalTable(appId, datasourceId, tableName)
   } else {
     return db.get(tableId)
   }

package/src/integrations/base/sql.ts

@@ -72,22 +72,16 @@ class InternalBuilder {
 
   // right now we only do filters on the specific table being queried
   addFilters(
+    tableName: string,
     query: KnexQuery,
-    filters: SearchFilters | undefined,
-    opts: { relationship?: boolean; tableName?: string }
+    filters: SearchFilters | undefined
   ): KnexQuery {
     function iterate(
       structure: { [key: string]: any },
       fn: (key: string, value: any) => void
     ) {
       for (let [key, value] of Object.entries(structure)) {
-        const isRelationshipField = key.includes(".")
-        if (!opts.relationship && !isRelationshipField) {
-          fn(`${opts.tableName}.${key}`, value)
-        }
-        if (opts.relationship && isRelationshipField) {
-          fn(key, value)
-        }
+        fn(`${tableName}.${key}`, value)
       }
     }
     if (!filters) {
@@ -278,7 +272,7 @@ class InternalBuilder {
     if (foundOffset) {
       query = query.offset(foundOffset)
     }
-    query = this.addFilters(query, filters, { tableName })
+    query = this.addFilters(tableName, query, filters)
     // add sorting to pre-query
     query = this.addSorting(query, json)
     // @ts-ignore
@@ -291,21 +285,20 @@ class InternalBuilder {
       preQuery = this.addSorting(preQuery, json)
     }
     // handle joins
-    query = this.addRelationships(
+    return this.addRelationships(
       knex,
       preQuery,
       selectStatement,
       tableName,
       relationships
     )
-    return this.addFilters(query, filters, { relationship: true })
   }
 
   update(knex: Knex, json: QueryJson, opts: QueryOptions): KnexQuery {
     const { endpoint, body, filters } = json
     let query: KnexQuery = knex(endpoint.entityId)
     const parsedBody = parseBody(body)
-    query = this.addFilters(query, filters, { tableName: endpoint.entityId })
+    query = this.addFilters(endpoint.entityId, query, filters)
     // mysql can't use returning
     if (opts.disableReturning) {
       return query.update(parsedBody)
@@ -317,7 +310,7 @@ class InternalBuilder {
   delete(knex: Knex, json: QueryJson, opts: QueryOptions): KnexQuery {
     const { endpoint, filters } = json
     let query: KnexQuery = knex(endpoint.entityId)
-    query = this.addFilters(query, filters, { tableName: endpoint.entityId })
+    query = this.addFilters(endpoint.entityId, query, filters)
     // mysql can't use returning
     if (opts.disableReturning) {
       return query.delete()

package/src/integrations/tests/sql.spec.js

@@ -119,22 +119,6 @@ describe("SQL query builder", () => {
     })
   })
 
-  it("should allow filtering on a related field", () => {
-    const query = sql._query(generateReadJson({
-      filters: {
-        equal: {
-          age: 10,
-          "task.name": "task 1",
-        },
-      },
-    }))
-    // order of bindings changes because relationship filters occur outside inner query
-    expect(query).toEqual({
-      bindings: [10, limit, "task 1"],
-      sql: `select * from (select * from "${TABLE_NAME}" where "${TABLE_NAME}"."age" = $1 limit $2) as "${TABLE_NAME}" where "task"."name" = $3`
-    })
-  })
-
   it("should test an create statement", () => {
     const query = sql._query(generateCreateJson(TABLE_NAME, {
       name: "Michael",

package/src/integrations/utils.ts

@@ -1,5 +1,6 @@
-import { SourceNames, SqlQuery } from "../definitions/datasource"
+import { SqlQuery } from "../definitions/datasource"
 import { Datasource, Table } from "../definitions/common"
+import { SourceNames } from "../definitions/datasource"
 import { DocumentTypes, SEPARATOR } from "../db/utils"
 import { FieldTypes, BuildSchemaErrors, InvalidColumns } from "../constants"
 
@@ -126,12 +127,7 @@ export function isSQL(datasource: Datasource): boolean {
   if (!datasource || !datasource.source) {
     return false
   }
-  const SQL = [
-    SourceNames.POSTGRES,
-    SourceNames.SQL_SERVER,
-    SourceNames.MYSQL,
-    SourceNames.ORACLE,
-  ]
+  const SQL = [SourceNames.POSTGRES, SourceNames.SQL_SERVER, SourceNames.MYSQL]
   return SQL.indexOf(datasource.source) !== -1
 }
 

package/src/middleware/currentapp.js

@@ -47,15 +47,6 @@ module.exports = async (ctx, next) => {
     (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)
   ) {
     clearCookie(ctx, Cookies.CurrentApp)
-    // have to set the return url on the server side as client side is not available
-    setCookie(ctx, ctx.url, Cookies.RETURN_URL, {
-      // don't sign so the browser can easily read
-      sign: false,
-      // use the request domain to match how ui handles the return url cookie.
-      // it's important we don't use the shared domain here as the builder
-      // can't delete from it without awareness of the domain.
-      requestDomain: true,
-    })
     return ctx.redirect("/")
   }
 

package/src/utilities/workerRequests.js

@@ -71,7 +71,7 @@ exports.getDeployedApps = async () => {
     for (let [key, value] of Object.entries(json)) {
       if (value.url) {
         value.url = value.url.toLowerCase()
-        apps[key] = value
+        apps[key.toLowerCase()] = value
       }
     }
     return apps