@budibase/server 1.2.39-alpha.4 → 1.2.39-alpha.7

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

@@ -19,7 +19,7 @@ const { getAppId } = require("@budibase/backend-core/context");
  */
 class QueryBuilder {
     constructor(base) {
-        this.query = Object.assign({ allOr: false, string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {}, contains: {} }, base);
+        this.query = Object.assign({ allOr: false, string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {}, contains: {}, notContains: {}, containsAny: {} }, base);
         this.limit = 50;
         this.sortOrder = "ascending";
         this.sortType = "string";
@@ -105,6 +105,14 @@ class QueryBuilder {
         this.query.contains[key] = value;
         return this;
     }
+    addNotContains(key, value) {
+        this.query.notContains[key] = value;
+        return this;
+    }
+    addContainsAny(key, value) {
+        this.query.containsAny[key] = value;
+        return this;
+    }
     /**
      * Preprocesses a value before going into a lucene search.
      * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -147,11 +155,27 @@ class QueryBuilder {
             }
             return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`;
         };
-        const contains = (key, value) => {
-            if (!value && value !== 0) {
+        const contains = (key, value, mode = "AND") => {
+            if (Array.isArray(value) && value.length === 0) {
                 return null;
             }
-            return `${key}:${builder.preprocess(value, { escape: true })}`;
+            if (!Array.isArray(value)) {
+                return `${key}:${value}`;
+            }
+            let statement = `${builder.preprocess(value[0], { escape: true })}`;
+            for (let i = 1; i < value.length; i++) {
+                statement += ` ${mode} ${builder.preprocess(value[i], {
+                    escape: true,
+                })}`;
+            }
+            return `${key}:(${statement})`;
+        };
+        const notContains = (key, value) => {
+            const allPrefix = allOr === "" ? "*:* AND" : "";
+            return allPrefix + "NOT " + contains(key, value);
+        };
+        const containsAny = (key, value) => {
+            return contains(key, value, "OR");
         };
         const oneOf = (key, value) => {
             if (!Array.isArray(value)) {
@@ -249,6 +273,12 @@ class QueryBuilder {
         if (this.query.contains) {
             build(this.query.contains, contains);
         }
+        if (this.query.notContains) {
+            build(this.query.notContains, notContains);
+        }
+        if (this.query.containsAny) {
+            build(this.query.containsAny, containsAny);
+        }
         // make sure table ID is always added as an AND
         if (tableId) {
             query = `(${query})`;

package/dist/integrations/base/sql.js

@@ -141,6 +141,56 @@ class InternalBuilder {
                 ]);
             }
         };
+        const contains = (mode, any = false) => {
+            const fnc = allOr ? "orWhere" : "where";
+            const rawFnc = `${fnc}Raw`;
+            const not = mode === (filters === null || filters === void 0 ? void 0 : filters.notContains) ? "NOT " : "";
+            function stringifyArray(value, quoteStyle = '"') {
+                for (let i in value) {
+                    if (typeof value[i] === "string") {
+                        value[i] = `${quoteStyle}${value[i]}${quoteStyle}`;
+                    }
+                }
+                return `[${value.join(",")}]`;
+            }
+            if (this.client === utils_1.SqlClient.POSTGRES) {
+                iterate(mode, (key, value) => {
+                    const wrap = any ? "" : "'";
+                    const containsOp = any ? "\\?| array" : "@>";
+                    const fieldNames = key.split(/\./g);
+                    const tableName = fieldNames[0];
+                    const columnName = fieldNames[1];
+                    // @ts-ignore
+                    query = query[rawFnc](`${not}"${tableName}"."${columnName}"::jsonb ${containsOp} ${wrap}${stringifyArray(value, any ? "'" : '"')}${wrap}`);
+                });
+            }
+            else if (this.client === utils_1.SqlClient.MY_SQL) {
+                const jsonFnc = any ? "JSON_OVERLAPS" : "JSON_CONTAINS";
+                iterate(mode, (key, value) => {
+                    // @ts-ignore
+                    query = query[rawFnc](`${not}${jsonFnc}(${key}, '${stringifyArray(value)}')`);
+                });
+            }
+            else {
+                const andOr = mode === (filters === null || filters === void 0 ? void 0 : filters.containsAny) ? " OR " : " AND ";
+                iterate(mode, (key, value) => {
+                    let statement = "";
+                    for (let i in value) {
+                        if (typeof value[i] === "string") {
+                            value[i] = `%"${value[i]}"%`;
+                        }
+                        else {
+                            value[i] = `%${value[i]}%`;
+                        }
+                        statement +=
+                            (statement ? andOr : "") +
+                                `LOWER(${likeKey(this.client, key)}) LIKE ?`;
+                    }
+                    // @ts-ignore
+                    query = query[rawFnc](`${not}(${statement})`, value);
+                });
+            }
+        };
         if (!filters) {
             return query;
         }
@@ -214,32 +264,13 @@ class InternalBuilder {
             });
         }
         if (filters.contains) {
-            const fnc = allOr ? "orWhere" : "where";
-            const rawFnc = `${fnc}Raw`;
-            if (this.client === utils_1.SqlClient.POSTGRES) {
-                iterate(filters.contains, (key, value) => {
-                    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 === utils_1.SqlClient.MY_SQL) {
-                iterate(filters.contains, (key, value) => {
-                    if (typeof value === "string") {
-                        value = `"${value}"`;
-                    }
-                    // @ts-ignore
-                    query = query[rawFnc](`JSON_CONTAINS(${key}, '${value}')`);
-                });
-            }
-            else {
-                iterate(filters.contains, like);
-            }
+            contains(filters.contains);
+        }
+        if (filters.notContains) {
+            contains(filters.notContains);
+        }
+        if (filters.containsAny) {
+            contains(filters.containsAny, true);
         }
         return query;
     }

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.2.39-alpha.3",
+    "version": "1.2.39-alpha.6",
     "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.2.39-alpha.3",
-        "@budibase/client": "1.2.39-alpha.3",
-        "@budibase/pro": "1.2.39-alpha.3",
-        "@budibase/string-templates": "1.2.39-alpha.3",
-        "@budibase/types": "1.2.39-alpha.3",
+        "@budibase/backend-core": "1.2.39-alpha.6",
+        "@budibase/client": "1.2.39-alpha.6",
+        "@budibase/pro": "1.2.39-alpha.6",
+        "@budibase/string-templates": "1.2.39-alpha.6",
+        "@budibase/types": "1.2.39-alpha.6",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",