@budibase/backend-core 2.30.8 → 2.31.1

package/dist/index.js

@@ -54483,6 +54483,11 @@ var RangeOperator = /* @__PURE__ */ ((RangeOperator2) => {
   RangeOperator2["RANGE"] = "range";
   return RangeOperator2;
 })(RangeOperator || {});
+var LogicalOperator = /* @__PURE__ */ ((LogicalOperator2) => {
+  LogicalOperator2["AND"] = "$and";
+  LogicalOperator2["OR"] = "$or";
+  return LogicalOperator2;
+})(LogicalOperator || {});
 function isLogicalSearchOperator(value) {
   return value === "$and" /* AND */ || value === "$or" /* OR */;
 }
@@ -54864,6 +54869,7 @@ __export(filters_exports, {
   getValidOperatorsForType: () => getValidOperatorsForType,
   hasFilters: () => hasFilters,
   limit: () => limit,
+  recurseLogicalOperators: () => recurseLogicalOperators,
   removeKeyNumbering: () => removeKeyNumbering,
   runQuery: () => runQuery,
   search: () => search,
@@ -55093,6 +55099,16 @@ var NoEmptyFilterStrings = [
   OperatorOptions.ContainsAny.value,
   OperatorOptions.In.value
 ];
+function recurseLogicalOperators(filters, fn) {
+  for (const logical of Object.values(LogicalOperator)) {
+    if (filters[logical]) {
+      filters[logical].conditions = filters[logical].conditions.map(
+        (condition) => fn(condition)
+      );
+    }
+  }
+  return filters;
+}
 var cleanupQuery = (query) => {
   if (!query) {
     return query;
@@ -55115,6 +55131,7 @@ var cleanupQuery = (query) => {
       }
     }
   }
+  query = recurseLogicalOperators(query, cleanupQuery);
   return query;
 };
 function isEmptyArray(value) {
@@ -55297,6 +55314,7 @@ function fixupFilterArrays(filters) {
       }
     }
   }
+  recurseLogicalOperators(filters, fixupFilterArrays);
   return filters;
 }
 var search = (docs, query) => {
@@ -67912,6 +67930,7 @@ var SqlTableQueryBuilder = class {
 var sqlTable_default = SqlTableQueryBuilder;
 
 // src/sql/sql.ts
+var import_lodash3 = require("lodash");
 function getBaseLimit() {
   const envLimit = environment_default.SQL_MAX_ROWS ? parseInt(environment_default.SQL_MAX_ROWS) : null;
   return envLimit || 5e3;
@@ -68071,6 +68090,7 @@ var InternalBuilder = class {
     return body2;
   }
   parseFilters(filters) {
+    filters = (0, import_lodash3.cloneDeep)(filters);
     for (const op of Object.values(BasicOperator)) {
       const filter = filters[op];
       if (!filter) {
@@ -68130,7 +68150,7 @@ var InternalBuilder = class {
     if (!filters) {
       return query;
     }
-    filters = this.parseFilters(filters);
+    filters = this.parseFilters({ ...filters });
     const aliases = this.query.tableAliases;
     const allOr = filters.allOr;
     const tableName = this.client === "sqlite3" /* SQL_LITE */ ? this.table._id : this.table.name;
@@ -68152,10 +68172,11 @@ var InternalBuilder = class {
             ),
             castedTypeValue.values
           );
-        } else if (!opts?.relationship && !isRelationshipField) {
+        } else if (!isRelationshipField) {
           const alias = getTableAlias(tableName);
           fn(alias ? `${alias}.${updatedKey}` : updatedKey, value);
-        } else if (opts?.relationship && isRelationshipField) {
+        }
+        if (opts?.relationship && isRelationshipField) {
           const [filterTableName, property] = updatedKey.split(".");
           const alias = getTableAlias(filterTableName);
           fn(alias ? `${alias}.${property}` : property, value);
@@ -68237,17 +68258,19 @@ var InternalBuilder = class {
     };
     if (filters.$and) {
       const { $and } = filters;
-      query = query.where((x) => {
-        for (const condition of $and.conditions) {
-          x = this.addFilters(x, condition, opts);
-        }
-      });
+      for (const condition of $and.conditions) {
+        query = query.where((b) => {
+          this.addFilters(b, condition, opts);
+        });
+      }
     }
     if (filters.$or) {
       const { $or } = filters;
-      query = query.where((x) => {
+      query = query.where((b) => {
         for (const condition of $or.conditions) {
-          x = this.addFilters(x, { ...condition, allOr: true }, opts);
+          b.orWhere(
+            (c) => this.addFilters(c, { ...condition, allOr: true }, opts)
+          );
         }
       });
     }