@budibase/backend-core 2.29.1 → 2.29.2

package/dist/index.js

@@ -54131,8 +54131,8 @@ var require_lib9 = __commonJS({
 var src_exports = {};
 __export(src_exports, {
   APP_DEV: () => APP_DEV,
-  APP_DEV_PREFIX: () => APP_DEV_PREFIX,
-  APP_PREFIX: () => APP_PREFIX,
+  APP_DEV_PREFIX: () => APP_DEV_PREFIX2,
+  APP_PREFIX: () => APP_PREFIX2,
   AutomationViewMode: () => AutomationViewMode,
   BUDIBASE_DATASOURCE_TYPE: () => BUDIBASE_DATASOURCE_TYPE,
   BadRequestError: () => BadRequestError,
@@ -54659,8 +54659,8 @@ var BREAKDOWN_QUOTA_NAMES = [
 var constants_exports2 = {};
 __export(constants_exports2, {
   APP_DEV: () => APP_DEV,
-  APP_DEV_PREFIX: () => APP_DEV_PREFIX,
-  APP_PREFIX: () => APP_PREFIX,
+  APP_DEV_PREFIX: () => APP_DEV_PREFIX2,
+  APP_PREFIX: () => APP_PREFIX2,
   AutomationViewMode: () => AutomationViewMode,
   BUDIBASE_DATASOURCE_TYPE: () => BUDIBASE_DATASOURCE_TYPE,
   Config: () => Config,
@@ -54687,69 +54687,6 @@ __export(constants_exports2, {
   ViewName: () => ViewName
 });
 
-// src/constants/db.ts
-var AutomationViewMode = /* @__PURE__ */ ((AutomationViewMode2) => {
-  AutomationViewMode2["ALL"] = "all";
-  AutomationViewMode2["AUTOMATION"] = "automation";
-  AutomationViewMode2["STATUS"] = "status";
-  return AutomationViewMode2;
-})(AutomationViewMode || {});
-var ViewName = /* @__PURE__ */ ((ViewName3) => {
-  ViewName3["USER_BY_APP"] = "by_app";
-  ViewName3["USER_BY_EMAIL"] = "by_email2";
-  ViewName3["BY_API_KEY"] = "by_api_key";
-  ViewName3["LINK"] = "by_link";
-  ViewName3["ROUTING"] = "screen_routes";
-  ViewName3["AUTOMATION_LOGS"] = "automation_logs";
-  ViewName3["ACCOUNT_BY_EMAIL"] = "account_by_email";
-  ViewName3["PLATFORM_USERS_LOWERCASE"] = "platform_users_lowercase_2";
-  ViewName3["USER_BY_GROUP"] = "user_by_group";
-  ViewName3["APP_BACKUP_BY_TRIGGER"] = "by_trigger";
-  return ViewName3;
-})(ViewName || {});
-var DeprecatedViews = {
-  ["by_email2" /* USER_BY_EMAIL */]: [
-    // removed due to inaccuracy in view doc filter logic
-    "by_email"
-  ]
-};
-var StaticDatabases = {
-  GLOBAL: {
-    name: "global-db",
-    docs: {
-      apiKeys: "apikeys",
-      usageQuota: "usage_quota",
-      licenseInfo: "license_info",
-      environmentVariables: "environmentvariables"
-    }
-  },
-  // contains information about tenancy and so on
-  PLATFORM_INFO: {
-    name: "global-info",
-    docs: {
-      tenants: "tenants",
-      install: "install"
-    }
-  },
-  AUDIT_LOGS: {
-    name: "audit-logs"
-  },
-  SCIM_LOGS: {
-    name: "scim-logs"
-  }
-};
-var APP_PREFIX = prefixed("app" /* APP */);
-var APP_DEV = prefixed("app_dev" /* APP_DEV */);
-var APP_DEV_PREFIX = APP_DEV;
-var SQS_DATASOURCE_INTERNAL = "internal";
-var BUDIBASE_DATASOURCE_TYPE = "budibase";
-var SQLITE_DESIGN_DOC_ID = "_design/sqlite";
-var DEFAULT_JOBS_TABLE_ID = "ta_bb_jobs";
-var DEFAULT_INVENTORY_TABLE_ID = "ta_bb_inventory";
-var DEFAULT_EXPENSES_TABLE_ID = "ta_bb_expenses";
-var DEFAULT_EMPLOYEE_TABLE_ID = "ta_bb_employee";
-var DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default";
-
 // ../shared-core/src/constants/api.ts
 var Header = /* @__PURE__ */ ((Header2) => {
   Header2["API_KEY"] = "x-budibase-api-key";
@@ -54885,6 +54822,7 @@ var SqlNumberTypeRangeMap = {
     min: -8388608
   }
 };
+var DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default";
 
 // ../shared-core/src/filters.ts
 var filters_exports = {};
@@ -55564,31 +55502,31 @@ __export(applications_exports, {
   getDevAppID: () => getDevAppID,
   getProdAppID: () => getProdAppID
 });
-var APP_PREFIX2 = prefixed("app" /* APP */);
-var APP_DEV_PREFIX2 = prefixed("app_dev" /* APP_DEV */);
+var APP_PREFIX = prefixed("app" /* APP */);
+var APP_DEV_PREFIX = prefixed("app_dev" /* APP_DEV */);
 function getDevAppID(appId) {
   if (!appId) {
     throw new Error("No app ID provided");
   }
-  if (appId.startsWith(APP_DEV_PREFIX2)) {
+  if (appId.startsWith(APP_DEV_PREFIX)) {
     return appId;
   }
-  const split = appId.split(APP_PREFIX2);
+  const split = appId.split(APP_PREFIX);
   split.shift();
-  const rest = split.join(APP_PREFIX2);
-  return `${APP_DEV_PREFIX2}${rest}`;
+  const rest = split.join(APP_PREFIX);
+  return `${APP_DEV_PREFIX}${rest}`;
 }
 function getProdAppID(appId) {
   if (!appId) {
     throw new Error("No app ID provided");
   }
-  if (!appId.startsWith(APP_DEV_PREFIX2)) {
+  if (!appId.startsWith(APP_DEV_PREFIX)) {
     return appId;
   }
-  const split = appId.split(APP_DEV_PREFIX2);
+  const split = appId.split(APP_DEV_PREFIX);
   split.shift();
-  const rest = split.join(APP_DEV_PREFIX2);
-  return `${APP_PREFIX2}${rest}`;
+  const rest = split.join(APP_DEV_PREFIX);
+  return `${APP_PREFIX}${rest}`;
 }
 
 // ../shared-core/src/sdk/documents/users.ts
@@ -55743,6 +55681,68 @@ var allowSortColumnByType = {
   ["bb_reference_single" /* BB_REFERENCE_SINGLE */]: false
 };
 
+// src/constants/db.ts
+var AutomationViewMode = /* @__PURE__ */ ((AutomationViewMode2) => {
+  AutomationViewMode2["ALL"] = "all";
+  AutomationViewMode2["AUTOMATION"] = "automation";
+  AutomationViewMode2["STATUS"] = "status";
+  return AutomationViewMode2;
+})(AutomationViewMode || {});
+var ViewName = /* @__PURE__ */ ((ViewName3) => {
+  ViewName3["USER_BY_APP"] = "by_app";
+  ViewName3["USER_BY_EMAIL"] = "by_email2";
+  ViewName3["BY_API_KEY"] = "by_api_key";
+  ViewName3["LINK"] = "by_link";
+  ViewName3["ROUTING"] = "screen_routes";
+  ViewName3["AUTOMATION_LOGS"] = "automation_logs";
+  ViewName3["ACCOUNT_BY_EMAIL"] = "account_by_email";
+  ViewName3["PLATFORM_USERS_LOWERCASE"] = "platform_users_lowercase_2";
+  ViewName3["USER_BY_GROUP"] = "user_by_group";
+  ViewName3["APP_BACKUP_BY_TRIGGER"] = "by_trigger";
+  return ViewName3;
+})(ViewName || {});
+var DeprecatedViews = {
+  ["by_email2" /* USER_BY_EMAIL */]: [
+    // removed due to inaccuracy in view doc filter logic
+    "by_email"
+  ]
+};
+var StaticDatabases = {
+  GLOBAL: {
+    name: "global-db",
+    docs: {
+      apiKeys: "apikeys",
+      usageQuota: "usage_quota",
+      licenseInfo: "license_info",
+      environmentVariables: "environmentvariables"
+    }
+  },
+  // contains information about tenancy and so on
+  PLATFORM_INFO: {
+    name: "global-info",
+    docs: {
+      tenants: "tenants",
+      install: "install"
+    }
+  },
+  AUDIT_LOGS: {
+    name: "audit-logs"
+  },
+  SCIM_LOGS: {
+    name: "scim-logs"
+  }
+};
+var APP_PREFIX2 = prefixed("app" /* APP */);
+var APP_DEV = prefixed("app_dev" /* APP_DEV */);
+var APP_DEV_PREFIX2 = APP_DEV;
+var SQS_DATASOURCE_INTERNAL = "internal";
+var BUDIBASE_DATASOURCE_TYPE = "budibase";
+var SQLITE_DESIGN_DOC_ID = "_design/sqlite";
+var DEFAULT_JOBS_TABLE_ID = "ta_bb_jobs";
+var DEFAULT_INVENTORY_TABLE_ID = "ta_bb_inventory";
+var DEFAULT_EXPENSES_TABLE_ID = "ta_bb_expenses";
+var DEFAULT_EMPLOYEE_TABLE_ID = "ta_bb_employee";
+
 // src/constants/misc.ts
 var UserStatus = /* @__PURE__ */ ((UserStatus3) => {
   UserStatus3["ACTIVE"] = "active";
@@ -56090,13 +56090,13 @@ function isDevAppID(appId) {
   if (!appId) {
     throw NO_APP_ERROR;
   }
-  return appId.startsWith(APP_DEV_PREFIX);
+  return appId.startsWith(APP_DEV_PREFIX2);
 }
 function isProdAppID(appId) {
   if (!appId) {
     throw NO_APP_ERROR;
   }
-  return appId.startsWith(APP_PREFIX) && !isDevAppID(appId);
+  return appId.startsWith(APP_PREFIX2) && !isDevAppID(appId);
 }
 function isDevApp(app) {
   if (!app) {
@@ -56105,23 +56105,23 @@ function isDevApp(app) {
   return isDevAppID(app.appId);
 }
 function getDevelopmentAppID(appId) {
-  if (!appId || appId.startsWith(APP_DEV_PREFIX)) {
+  if (!appId || appId.startsWith(APP_DEV_PREFIX2)) {
     return appId;
   }
-  const split = appId.split(APP_PREFIX);
+  const split = appId.split(APP_PREFIX2);
   split.shift();
-  const rest = split.join(APP_PREFIX);
-  return `${APP_DEV_PREFIX}${rest}`;
+  const rest = split.join(APP_PREFIX2);
+  return `${APP_DEV_PREFIX2}${rest}`;
 }
 var getDevAppID2 = getDevelopmentAppID;
 function getProdAppID2(appId) {
-  if (!appId || !appId.startsWith(APP_DEV_PREFIX)) {
+  if (!appId || !appId.startsWith(APP_DEV_PREFIX2)) {
     return appId;
   }
-  const split = appId.split(APP_DEV_PREFIX);
+  const split = appId.split(APP_DEV_PREFIX2);
   split.shift();
-  const rest = split.join(APP_DEV_PREFIX);
-  return `${APP_PREFIX}${rest}`;
+  const rest = split.join(APP_DEV_PREFIX2);
+  return `${APP_PREFIX2}${rest}`;
 }
 function extractAppUUID(id) {
   const split = id?.split("_") || [];
@@ -57353,8 +57353,8 @@ var import_uuid2 = require("uuid");
 var db_exports = {};
 __export(db_exports, {
   APP_DEV: () => APP_DEV,
-  APP_DEV_PREFIX: () => APP_DEV_PREFIX,
-  APP_PREFIX: () => APP_PREFIX,
+  APP_DEV_PREFIX: () => APP_DEV_PREFIX2,
+  APP_PREFIX: () => APP_PREFIX2,
   AutomationViewMode: () => AutomationViewMode,
   BUDIBASE_DATASOURCE_TYPE: () => BUDIBASE_DATASOURCE_TYPE,
   CONSTANT_EXTERNAL_ROW_COLS: () => CONSTANT_EXTERNAL_ROW_COLS,
@@ -57548,7 +57548,7 @@ __export(docIds_exports, {
 
 // src/docIds/ids.ts
 var generateAppID = (tenantId) => {
-  let id = APP_PREFIX;
+  let id = APP_PREFIX2;
   if (tenantId) {
     id += `${tenantId}${SEPARATOR}`;
   }
@@ -58708,7 +58708,7 @@ function sanitizeKey(input) {
   return sanitize(sanitizeBucket(input)).replace(/\\/g, "/");
 }
 function sanitizeBucket(input) {
-  return input.replace(new RegExp(APP_DEV_PREFIX, "g"), APP_PREFIX);
+  return input.replace(new RegExp(APP_DEV_PREFIX2, "g"), APP_PREFIX2);
 }
 function ObjectStore(bucket, opts = { presigning: false }) {
   const config = {
@@ -67112,15 +67112,15 @@ function buildExternalTableId(datasourceId, tableName) {
   return `${datasourceId}${DOUBLE_SEPARATOR}${tableName}`;
 }
 function breakExternalTableId(tableId) {
-  if (!tableId) {
-    return {};
-  }
   const parts = tableId.split(DOUBLE_SEPARATOR);
   let datasourceId = parts.shift();
   let tableName = parts.join(DOUBLE_SEPARATOR);
   if (tableName.includes(ENCODED_SPACE)) {
     tableName = decodeURIComponent(tableName);
   }
+  if (!datasourceId || !tableName) {
+    throw new Error("Unable to get datasource/table name from table ID");
+  }
   return { datasourceId, tableName };
 }
 function generateRowIdField(keyProps = []) {
@@ -67296,8 +67296,10 @@ function generateSchema(schema, table, tables, oldTable = null, renamed) {
           }
           const { tableName } = breakExternalTableId(column.tableId);
           const relatedTable = tables[tableName];
-          if (!relatedTable) {
-            throw new Error("Referenced table doesn't exist");
+          if (!relatedTable || !relatedTable.primary) {
+            throw new Error(
+              "Referenced table doesn't exist or has no primary keys"
+            );
           }
           const relatedPrimary = relatedTable.primary[0];
           const externalType = relatedTable.schema[relatedPrimary].externalType;
@@ -67778,7 +67780,9 @@ var InternalBuilder = class {
         query = query.orderBy(`${aliased}.${key}`, direction, nulls);
       }
     }
-    query = query.orderBy(`${aliased}.${primaryKey[0]}`);
+    if (!sort2 || sort2[primaryKey[0]] === void 0) {
+      query = query.orderBy(`${aliased}.${primaryKey[0]}`);
+    }
     return query;
   }
   tableNameWithSchema(tableName, opts) {
@@ -67894,7 +67898,8 @@ var InternalBuilder = class {
       if (!primary) {
         throw new Error("Primary key is required for upsert");
       }
-      return query.insert(parsedBody).onConflict(primary).merge();
+      const ret = query.insert(parsedBody).onConflict(primary).merge();
+      return ret;
     } else if (this.client === "mssql" /* MS_SQL */) {
       return query.insert(parsedBody);
     }