@budibase/server 1.1.25-alpha.0 → 1.1.26

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

@@ -18,7 +18,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: {} }, base);
         this.limit = 50;
         this.sortOrder = "ascending";
         this.sortType = "string";
@@ -100,10 +100,6 @@ class QueryBuilder {
         this.query.oneOf[key] = value;
         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.
@@ -146,27 +142,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, "_"), {
@@ -241,10 +216,21 @@ 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/dist/integrations/base/sql.js

@@ -125,20 +125,6 @@ class InternalBuilder {
                 }
             }
         }
-        const like = (key, value) => {
-            const fnc = allOr ? "orWhere" : "where";
-            // postgres supports ilike, nothing else does
-            if (this.client === utils_1.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;
         }
@@ -166,7 +152,20 @@ 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 === utils_1.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) => {
@@ -211,34 +210,6 @@ class InternalBuilder {
                 query = query[fnc](key);
             });
         }
-        if (filters.contains) {
-            const fnc = allOr ? "orWhere" : "where";
-            const rawFnc = `${fnc}Raw`;
-            if (this.client === utils_1.SqlClients.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.SqlClients.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);
-            }
-        }
         return query;
     }
     addSorting(query, json) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.1.24",
+    "version": "1.1.25",
     "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.24",
-        "@budibase/client": "^1.1.24",
-        "@budibase/pro": "1.1.24",
-        "@budibase/string-templates": "^1.1.24",
-        "@budibase/types": "^1.1.24",
+        "@budibase/backend-core": "^1.1.25",
+        "@budibase/client": "^1.1.25",
+        "@budibase/pro": "1.1.25",
+        "@budibase/string-templates": "^1.1.25",
+        "@budibase/types": "^1.1.25",
         "@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",