@budibase/server 1.1.22-alpha.2 → 1.1.24

package/dist/utilities/fileSystem/index.js

@@ -99,21 +99,18 @@ exports.apiFileReturn = contents => {
     return fs.createReadStream(path);
 };
 exports.defineFilter = excludeRows => {
+    const ids = [USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX];
     if (excludeRows) {
-        return doc => !(doc._id.includes(USER_METDATA_PREFIX) ||
-            doc._id.includes(LINK_USER_METADATA_PREFIX) ||
-            doc._id.includes(TABLE_ROW_PREFIX));
-    }
-    else if (!excludeRows) {
-        return doc => !(doc._id.includes(USER_METDATA_PREFIX) ||
-            doc._id.includes(LINK_USER_METADATA_PREFIX));
+        ids.push(TABLE_ROW_PREFIX);
     }
+    return doc => !ids.map(key => doc._id.includes(key)).reduce((prev, curr) => prev || curr);
 };
 /**
  * Local utility to back up the database state for an app, excluding global user
  * data or user relationships.
  * @param {string} appId The app to backup
  * @param {object} config Config to send to export DB
+ * @param {boolean} includeRows Flag to state whether the export should include data.
  * @returns {*} either a string or a stream of the backup
  */
 const backupAppData = (appId, config, includeRows) => __awaiter(void 0, void 0, void 0, function* () {
@@ -131,6 +128,7 @@ exports.performBackup = (appId, backupName) => __awaiter(void 0, void 0, void 0,
 /**
  * Streams a backup of the database state for an app
  * @param {string} appId The ID of the app which is to be backed up.
+ * @param {boolean} includeRows Flag to state whether the export should include data.
  * @returns {*} a readable stream of the backup which is written in real time
  */
 exports.streamBackup = (appId, includeRows) => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.1.22-alpha.2",
+  "version": "1.1.24",
   "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.1.22-alpha.2",
-    "@budibase/client": "^1.1.22-alpha.2",
-    "@budibase/pro": "1.1.22-alpha.1",
-    "@budibase/string-templates": "^1.1.22-alpha.2",
-    "@budibase/types": "^1.1.22-alpha.2",
+    "@budibase/backend-core": "^1.1.24",
+    "@budibase/client": "^1.1.24",
+    "@budibase/pro": "1.1.23",
+    "@budibase/string-templates": "^1.1.24",
+    "@budibase/types": "^1.1.24",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -118,7 +118,7 @@
     "koa-send": "5.0.0",
     "koa-session": "5.12.0",
     "koa-static": "5.0.0",
-    "koa2-ratelimit": "1.1.1",
+    "koa2-ratelimit": "1.1.0",
     "lodash": "4.17.21",
     "memorystream": "0.3.1",
     "mongodb": "3.6.3",
@@ -137,7 +137,7 @@
     "redis": "4",
     "server-destroy": "1.0.1",
     "snowflake-promise": "^4.5.0",
-    "svelte": "3.49.0",
+    "svelte": "3.44.1",
     "swagger-parser": "10.0.3",
     "to-json-schema": "0.2.5",
     "uuid": "3.3.2",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "ad873d1ccf307984e52f44f9ad9b5bc1ae534490"
+  "gitHead": "3ef86c5df9276a23c5db4ec0b8780733228de982"
 }

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

@@ -19,7 +19,6 @@ class QueryBuilder {
       empty: {},
       notEmpty: {},
       oneOf: {},
-      contains: {},
       ...base,
     }
     this.limit = 50
@@ -120,11 +119,6 @@ class QueryBuilder {
     return this
   }
 
-  addContains(key, value) {
-    this.query.contains[key] = value
-    return this
-  }
-
   /**
    * Preprocesses a value before going into a lucene search.
    * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -170,31 +164,6 @@ class QueryBuilder {
       return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
     }
 
-    const contains = (key, value) => {
-      if (!value && value !== 0) {
-        return null
-      }
-      return `${key}:${builder.preprocess(value, { escape: true })}`
-    }
-
-    const oneOf = (key, value) => {
-      if (!Array.isArray(value)) {
-        if (typeof value === "string") {
-          value = value.split(",")
-        } else {
-          return ""
-        }
-      }
-      let orStatement = `${builder.preprocess(value[0], allPreProcessingOpts)}`
-      for (let i = 1; i < value.length; i++) {
-        orStatement += ` OR ${builder.preprocess(
-          value[i],
-          allPreProcessingOpts
-        )}`
-      }
-      return `${key}:(${orStatement})`
-    }
-
     function build(structure, queryFn) {
       for (let [key, value] of Object.entries(structure)) {
         key = builder.preprocess(key.replace(/ /g, "_"), {
@@ -270,10 +239,26 @@ class QueryBuilder {
       build(this.query.notEmpty, key => `${key}:["" TO *]`)
     }
     if (this.query.oneOf) {
-      build(this.query.oneOf, oneOf)
-    }
-    if (this.query.contains) {
-      build(this.query.contains, contains)
+      build(this.query.oneOf, (key, value) => {
+        if (!Array.isArray(value)) {
+          if (typeof value === "string") {
+            value = value.split(",")
+          } else {
+            return ""
+          }
+        }
+        let orStatement = `${builder.preprocess(
+          value[0],
+          allPreProcessingOpts
+        )}`
+        for (let i = 1; i < value.length; i++) {
+          orStatement += ` OR ${builder.preprocess(
+            value[i],
+            allPreProcessingOpts
+          )}`
+        }
+        return `${key}:(${orStatement})`
+      })
     }
     // make sure table ID is always added as an AND
     if (tableId) {

package/src/definitions/datasource.ts

@@ -131,9 +131,6 @@ export interface SearchFilters {
   oneOf?: {
     [key: string]: any[]
   }
-  contains?: {
-    [key: string]: any
-  }
 }
 
 export interface SortJson {

package/src/integrations/base/sql.ts

@@ -142,21 +142,6 @@ class InternalBuilder {
         }
       }
     }
-
-    const like = (key: string, value: any) => {
-      const fnc = allOr ? "orWhere" : "where"
-      // postgres supports ilike, nothing else does
-      if (this.client === SqlClients.POSTGRES) {
-        query = query[fnc](key, "ilike", `%${value}%`)
-      } else {
-        const rawFnc = `${fnc}Raw`
-        // @ts-ignore
-        query = query[rawFnc](`LOWER(${likeKey(this.client, key)}) LIKE ?`, [
-          `%${value}%`,
-        ])
-      }
-    }
-
     if (!filters) {
       return query
     }
@@ -183,7 +168,19 @@ class InternalBuilder {
       })
     }
     if (filters.fuzzy) {
-      iterate(filters.fuzzy, like)
+      iterate(filters.fuzzy, (key, value) => {
+        const fnc = allOr ? "orWhere" : "where"
+        // postgres supports ilike, nothing else does
+        if (this.client === SqlClients.POSTGRES) {
+          query = query[fnc](key, "ilike", `%${value}%`)
+        } else {
+          const rawFnc = `${fnc}Raw`
+          // @ts-ignore
+          query = query[rawFnc](`LOWER(${likeKey(this.client, key)}) LIKE ?`, [
+            `%${value}%`,
+          ])
+        }
+      })
     }
     if (filters.range) {
       iterate(filters.range, (key, value) => {
@@ -226,34 +223,6 @@ class InternalBuilder {
         query = query[fnc](key)
       })
     }
-    if (filters.contains) {
-      const fnc = allOr ? "orWhere" : "where"
-      const rawFnc = `${fnc}Raw`
-      if (this.client === SqlClients.POSTGRES) {
-        iterate(filters.contains, (key: string, value: any) => {
-          const fieldNames = key.split(/\./g)
-          const tableName = fieldNames[0]
-          const columnName = fieldNames[1]
-          if (typeof value === "string") {
-            value = `"${value}"`
-          }
-          // @ts-ignore
-          query = query[rawFnc](
-            `"${tableName}"."${columnName}"::jsonb @> '[${value}]'`
-          )
-        })
-      } else if (this.client === SqlClients.MY_SQL) {
-        iterate(filters.contains, (key: string, value: any) => {
-          if (typeof value === "string") {
-            value = `"${value}"`
-          }
-          // @ts-ignore
-          query = query[rawFnc](`JSON_CONTAINS(${key}, '${value}')`)
-        })
-      } else {
-        iterate(filters.contains, like)
-      }
-    }
     return query
   }
 

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

@@ -1,5 +1,4 @@
 const Sql = require("../base/sql")
-const { SqlClients } = require("../utils")
 
 const TABLE_NAME = "test"
 
@@ -47,7 +46,7 @@ function generateDeleteJson(table = TABLE_NAME, filters = {}) {
 
 describe("SQL query builder", () => {
   const limit = 500
-  const client = SqlClients.POSTGRES
+  const client = "pg"
   let sql
 
   beforeEach(() => {
@@ -174,15 +173,15 @@ describe("SQL query builder", () => {
   })
 
   it("should work with MS-SQL", () => {
-    const query = new Sql(SqlClients.MS_SQL, 10)._query(generateReadJson())
+    const query = new Sql("mssql", 10)._query(generateReadJson())
     expect(query).toEqual({
       bindings: [10],
       sql: `select * from (select top (@p0) * from [${TABLE_NAME}]) as [${TABLE_NAME}]`
     })
   })
 
-  it("should work with MySQL", () => {
-    const query = new Sql(SqlClients.MY_SQL, 10)._query(generateReadJson())
+  it("should work with mySQL", () => {
+    const query = new Sql("mysql", 10)._query(generateReadJson())
     expect(query).toEqual({
       bindings: [10],
       sql: `select * from (select * from \`${TABLE_NAME}\` limit ?) as \`${TABLE_NAME}\``
@@ -239,49 +238,4 @@ describe("SQL query builder", () => {
       sql: `select * from (select * from "${TABLE_NAME}" where "${TABLE_NAME}"."property" > $1 limit $2) as "${TABLE_NAME}"`
     })
   })
-
-  it("should use like expression for MS-SQL when filter is contains", () => {
-    const query = new Sql(SqlClients.MS_SQL, 10)._query(generateReadJson({
-      filters: {
-        contains: {
-          age: 20,
-          name: "John"
-        }
-      }
-    }))
-    expect(query).toEqual({
-      bindings: [10, "%20%", "%John%"],
-      sql: `select * from (select top (@p0) * from [${TABLE_NAME}] where LOWER(${TABLE_NAME}.age) LIKE @p1 and LOWER(${TABLE_NAME}.name) LIKE @p2) as [${TABLE_NAME}]`
-    })
-  })
-
-  it("should use JSON_CONTAINS expression for MySQL when filter is contains", () => {
-    const query = new Sql(SqlClients.MY_SQL, 10)._query(generateReadJson({
-      filters: {
-        contains: {
-          age: 20,
-          name: "John"
-        }
-      }
-    }))
-    expect(query).toEqual({
-      bindings: [10],
-      sql: `select * from (select * from \`${TABLE_NAME}\` where JSON_CONTAINS(${TABLE_NAME}.age, '20') and JSON_CONTAINS(${TABLE_NAME}.name, '"John"') limit ?) as \`${TABLE_NAME}\``
-    })
-  })
-
-  it("should use jsonb operator expression for PostgreSQL when filter is contains", () => {
-    const query = new Sql(SqlClients.POSTGRES, 10)._query(generateReadJson({
-      filters: {
-        contains: {
-          age: 20,
-          name: "John"
-        }
-      }
-    }))
-    expect(query).toEqual({
-      bindings: [10],
-      sql: `select * from (select * from \"${TABLE_NAME}\" where \"${TABLE_NAME}\".\"age\"::jsonb @> '[20]' and \"${TABLE_NAME}\".\"name\"::jsonb @> '["John"]' limit $1) as \"${TABLE_NAME}\"`
-    })
-  })
 })

package/src/utilities/fileSystem/index.js

@@ -111,20 +111,12 @@ exports.apiFileReturn = contents => {
 }
 
 exports.defineFilter = excludeRows => {
+  const ids = [USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX]
   if (excludeRows) {
-    return doc =>
-      !(
-        doc._id.includes(USER_METDATA_PREFIX) ||
-        doc._id.includes(LINK_USER_METADATA_PREFIX) ||
-        doc._id.includes(TABLE_ROW_PREFIX)
-      )
-  } else if (!excludeRows) {
-    return doc =>
-      !(
-        doc._id.includes(USER_METDATA_PREFIX) ||
-        doc._id.includes(LINK_USER_METADATA_PREFIX)
-      )
+    ids.push(TABLE_ROW_PREFIX)
   }
+  return doc =>
+    !ids.map(key => doc._id.includes(key)).reduce((prev, curr) => prev || curr)
 }
 
 /**
@@ -132,6 +124,7 @@ exports.defineFilter = excludeRows => {
  * data or user relationships.
  * @param {string} appId The app to backup
  * @param {object} config Config to send to export DB
+ * @param {boolean} includeRows Flag to state whether the export should include data.
  * @returns {*} either a string or a stream of the backup
  */
 const backupAppData = async (appId, config, includeRows) => {
@@ -154,6 +147,7 @@ exports.performBackup = async (appId, backupName) => {
 /**
  * Streams a backup of the database state for an app
  * @param {string} appId The ID of the app which is to be backed up.
+ * @param {boolean} includeRows Flag to state whether the export should include data.
  * @returns {*} a readable stream of the backup which is written in real time
  */
 exports.streamBackup = async (appId, includeRows) => {