@budibase/backend-core 2.29.3 → 2.29.7

package/dist/index.js

@@ -54739,6 +54739,20 @@ var SWITCHABLE_TYPES = {
   ["number" /* NUMBER */]: ["number" /* NUMBER */, "boolean" /* BOOLEAN */]
 };
 
+// ../shared-core/src/constants/rows.ts
+var CONSTANT_INTERNAL_ROW_COLS = [
+  "_id",
+  "_rev",
+  "type",
+  "createdAt",
+  "updatedAt",
+  "tableId"
+];
+var CONSTANT_EXTERNAL_ROW_COLS = ["_id", "_rev", "tableId"];
+function isInternalColumnName(name) {
+  return CONSTANT_INTERNAL_ROW_COLS.includes(name);
+}
+
 // ../shared-core/src/constants/index.ts
 var OperatorOptions = {
   Equals: {
@@ -54813,8 +54827,10 @@ var DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default";
 // ../shared-core/src/filters.ts
 var filters_exports = {};
 __export(filters_exports, {
+  ColumnSplitter: () => ColumnSplitter,
   NoEmptyFilterStrings: () => NoEmptyFilterStrings,
   buildQuery: () => buildQuery,
+  getKeyNumbering: () => getKeyNumbering,
   getValidOperatorsForType: () => getValidOperatorsForType,
   hasFilters: () => hasFilters,
   limit: () => limit,
@@ -55050,12 +55066,46 @@ var cleanupQuery = (query) => {
   return query;
 };
 var removeKeyNumbering = (key) => {
+  return getKeyNumbering(key).key;
+};
+var getKeyNumbering = (key) => {
   if (typeof key === "string" && key.match(/\d[0-9]*:/g) != null) {
     const parts = key.split(":");
-    parts.shift();
-    return parts.join(":");
+    const number = parts.shift();
+    return { prefix: `${number}:`, key: parts.join(":") };
   } else {
-    return key;
+    return { key };
+  }
+};
+var ColumnSplitter = class {
+  constructor(tables) {
+    this.tableNames = tables.map((table) => table.name);
+    this.tableIds = tables.map((table) => table._id);
+    this.relationshipColumnNames = tables.flatMap(
+      (table) => Object.keys(table.schema).filter(
+        (columnName) => table.schema[columnName].type === "link" /* LINK */
+      )
+    );
+    this.relationships = this.tableNames.concat(this.tableIds).concat(this.relationshipColumnNames).sort((a, b) => b.length - a.length);
+  }
+  run(key) {
+    let { prefix, key: splitKey } = getKeyNumbering(key);
+    let relationship;
+    for (let possibleRelationship of this.relationships) {
+      const withDot = `${possibleRelationship}.`;
+      if (splitKey.startsWith(withDot)) {
+        const finalKeyParts = splitKey.split(withDot);
+        finalKeyParts.shift();
+        relationship = withDot;
+        splitKey = finalKeyParts.join(".");
+        break;
+      }
+    }
+    return {
+      numberPrefix: prefix,
+      relationshipPrefix: relationship,
+      column: splitKey
+    };
   }
 };
 var buildQuery = (filter) => {
@@ -55139,12 +55189,16 @@ var buildQuery = (filter) => {
           query.equal = query.equal || {};
           query.equal[field] = true;
         } else {
-          query[queryOperator] = query[queryOperator] || {};
-          query[queryOperator][field] = value;
+          query[queryOperator] = {
+            ...query[queryOperator],
+            [field]: value
+          };
         }
       } else {
-        query[queryOperator] = query[queryOperator] || {};
-        query[queryOperator][field] = value;
+        query[queryOperator] = {
+          ...query[queryOperator],
+          [field]: value
+        };
       }
     }
   });
@@ -56733,20 +56787,6 @@ var DatabaseImpl = class _DatabaseImpl {
   }
 };
 
-// src/db/constants.ts
-var CONSTANT_INTERNAL_ROW_COLS = [
-  "_id",
-  "_rev",
-  "type",
-  "createdAt",
-  "updatedAt",
-  "tableId"
-];
-var CONSTANT_EXTERNAL_ROW_COLS = ["_id", "_rev", "tableId"];
-function isInternalColumnName(name) {
-  return CONSTANT_INTERNAL_ROW_COLS.includes(name);
-}
-
 // src/db/db.ts
 function getDB(dbName, opts) {
   return new DDInstrumentedDatabase(new DatabaseImpl(dbName, opts));
@@ -67176,14 +67216,20 @@ var import_knex2 = require("knex");
 
 // src/sql/sqlStatements.ts
 var SqlStatements = class {
-  constructor(client, table, { allOr } = {}) {
+  constructor(client, table, { allOr, columnPrefix } = {}) {
     this.client = client;
     this.table = table;
     this.allOr = allOr;
+    this.columnPrefix = columnPrefix;
   }
   getField(key) {
     const fieldName = key.split(".")[1];
-    return this.table.schema[fieldName];
+    let found = this.table.schema[fieldName];
+    if (!found && this.columnPrefix) {
+      const prefixRemovedFieldName = fieldName.replace(this.columnPrefix, "");
+      found = this.table.schema[prefixRemovedFieldName];
+    }
+    return found;
   }
   between(query, key, low, high) {
     const field = this.getField(key);
@@ -67559,7 +67605,10 @@ var InternalBuilder = class {
     }
     filters = parseFilters(filters);
     const allOr = filters.allOr;
-    const sqlStatements = new SqlStatements(this.client, table, { allOr });
+    const sqlStatements = new SqlStatements(this.client, table, {
+      allOr,
+      columnPrefix: opts.columnPrefix
+    });
     const tableName = this.client === "sqlite3" /* SQL_LITE */ ? table._id : table.name;
     function getTableAlias(name) {
       const alias = opts.aliases?.[name];
@@ -67741,8 +67790,8 @@ var InternalBuilder = class {
     if (filters.containsAny) {
       contains(filters.containsAny, true);
     }
-    if (filters.documentType && !isExternalTable(table)) {
-      const tableRef = opts?.aliases?.[table._id] || table._id;
+    const tableRef = opts?.aliases?.[table._id] || table._id;
+    if (filters.documentType && !isExternalTable(table) && tableRef) {
       query.andWhereLike(
         `${tableRef}._id`,
         `${prefixed(filters.documentType)}%`
@@ -67934,6 +67983,7 @@ var InternalBuilder = class {
       query = this.addSorting(query, json);
     }
     query = this.addFilters(query, filters, json.meta.table, {
+      columnPrefix: json.meta.columnPrefix,
       aliases: tableAliases
     });
     const alias = tableAliases?.[tableName] || tableName;
@@ -67959,6 +68009,7 @@ var InternalBuilder = class {
       query = query.limit(limits.base);
     }
     return this.addFilters(query, filters, json.meta.table, {
+      columnPrefix: json.meta.columnPrefix,
       relationship: true,
       aliases: tableAliases
     });
@@ -67968,6 +68019,7 @@ var InternalBuilder = class {
     let query = this.knexWithAlias(knex3, endpoint, tableAliases);
     const parsedBody = parseBody(body2);
     query = this.addFilters(query, filters, json.meta.table, {
+      columnPrefix: json.meta.columnPrefix,
       aliases: tableAliases
     });
     if (opts.disableReturning) {
@@ -67980,6 +68032,7 @@ var InternalBuilder = class {
     const { endpoint, filters, tableAliases } = json;
     let query = this.knexWithAlias(knex3, endpoint, tableAliases);
     query = this.addFilters(query, filters, json.meta.table, {
+      columnPrefix: json.meta.columnPrefix,
       aliases: tableAliases
     });
     if (opts.disableReturning) {