@budibase/backend-core 2.32.3 → 2.32.5

package/dist/index.js

@@ -62040,10 +62040,10 @@ var RoleIDVersion = {
   NAME: "name"
 };
 var Role = class {
-  constructor(id, permissionId, uiMetadata) {
+  constructor(id, name, permissionId, uiMetadata) {
     this.permissions = {};
     this._id = id;
-    this.name = uiMetadata?.displayName || id;
+    this.name = name;
     this.uiMetadata = uiMetadata;
     this.permissionId = permissionId;
     this.version = RoleIDVersion.NAME;
@@ -62054,31 +62054,56 @@ var Role = class {
   }
 };
 var BUILTIN_ROLES = {
-  ADMIN: new Role(BUILTIN_IDS.ADMIN, "admin" /* ADMIN */, {
-    displayName: "App admin",
-    description: "Can do everything",
-    color: "var(--spectrum-global-color-static-red-400)" /* ADMIN */
-  }).addInheritance(BUILTIN_IDS.POWER),
-  POWER: new Role(BUILTIN_IDS.POWER, "power" /* POWER */, {
-    displayName: "App power user",
-    description: "An app user with more access",
-    color: "var(--spectrum-global-color-static-orange-400)" /* POWER */
-  }).addInheritance(BUILTIN_IDS.BASIC),
-  BASIC: new Role(BUILTIN_IDS.BASIC, "write" /* WRITE */, {
-    displayName: "App user",
-    description: "Any logged in user",
-    color: "var(--spectrum-global-color-static-green-400)" /* BASIC */
-  }).addInheritance(BUILTIN_IDS.PUBLIC),
-  PUBLIC: new Role(BUILTIN_IDS.PUBLIC, "public" /* PUBLIC */, {
-    displayName: "Public user",
-    description: "Accessible to anyone",
-    color: "var(--spectrum-global-color-static-blue-400)" /* PUBLIC */
-  }),
-  BUILDER: new Role(BUILTIN_IDS.BUILDER, "admin" /* ADMIN */, {
-    displayName: "Builder user",
-    description: "Users that can edit this app",
-    color: "var(--spectrum-global-color-static-magenta-600)" /* BUILDER */
-  })
+  ADMIN: new Role(
+    BUILTIN_IDS.ADMIN,
+    BUILTIN_IDS.ADMIN,
+    "admin" /* ADMIN */,
+    {
+      displayName: "App admin",
+      description: "Can do everything",
+      color: "var(--spectrum-global-color-static-red-400)" /* ADMIN */
+    }
+  ).addInheritance(BUILTIN_IDS.POWER),
+  POWER: new Role(
+    BUILTIN_IDS.POWER,
+    BUILTIN_IDS.POWER,
+    "power" /* POWER */,
+    {
+      displayName: "App power user",
+      description: "An app user with more access",
+      color: "var(--spectrum-global-color-static-orange-400)" /* POWER */
+    }
+  ).addInheritance(BUILTIN_IDS.BASIC),
+  BASIC: new Role(
+    BUILTIN_IDS.BASIC,
+    BUILTIN_IDS.BASIC,
+    "write" /* WRITE */,
+    {
+      displayName: "App user",
+      description: "Any logged in user",
+      color: "var(--spectrum-global-color-static-green-400)" /* BASIC */
+    }
+  ).addInheritance(BUILTIN_IDS.PUBLIC),
+  PUBLIC: new Role(
+    BUILTIN_IDS.PUBLIC,
+    BUILTIN_IDS.PUBLIC,
+    "public" /* PUBLIC */,
+    {
+      displayName: "Public user",
+      description: "Accessible to anyone",
+      color: "var(--spectrum-global-color-static-blue-400)" /* PUBLIC */
+    }
+  ),
+  BUILDER: new Role(
+    BUILTIN_IDS.BUILDER,
+    BUILTIN_IDS.BUILDER,
+    "admin" /* ADMIN */,
+    {
+      displayName: "Builder user",
+      description: "Users that can edit this app",
+      color: "var(--spectrum-global-color-static-magenta-600)" /* BUILDER */
+    }
+  )
 };
 function getBuiltinRoles() {
   return (0, import_cloneDeep2.default)(BUILTIN_ROLES);
@@ -68033,7 +68058,6 @@ var sqlTable_default = SqlTableQueryBuilder;
 
 // src/sql/sql.ts
 var import_lodash3 = require("lodash");
-var MAX_SQS_RELATIONSHIP_FIELDS = 63;
 function getBaseLimit() {
   const envLimit = environment_default.SQL_MAX_ROWS ? parseInt(environment_default.SQL_MAX_ROWS) : null;
   return envLimit || 5e3;
@@ -68042,6 +68066,19 @@ function getRelationshipLimit() {
   const envLimit = environment_default.SQL_MAX_RELATED_ROWS ? parseInt(environment_default.SQL_MAX_RELATED_ROWS) : null;
   return envLimit || 500;
 }
+function prioritisedArraySort(toSort, priorities) {
+  return toSort.sort((a, b) => {
+    const aPriority = priorities.find((field) => field && a.endsWith(field));
+    const bPriority = priorities.find((field) => field && b.endsWith(field));
+    if (aPriority && !bPriority) {
+      return -1;
+    }
+    if (!aPriority && bPriority) {
+      return 1;
+    }
+    return a.localeCompare(b);
+  });
+}
 function getTableName(table) {
   if (table?.sourceType === "internal" /* INTERNAL */ || table?.sourceId === INTERNAL_TABLE_SOURCE_ID) {
     return table?._id;
@@ -68682,10 +68719,20 @@ var InternalBuilder = class {
     const separator = this.client === "oracledb" /* ORACLE */ ? " VALUE " : ",";
     return `'${unaliased}'${separator}${tableField}`;
   }
+  maxFunctionParameters() {
+    switch (this.client) {
+      case "sqlite3" /* SQL_LITE */:
+        return 127;
+      case "pg" /* POSTGRES */:
+        return 100;
+      default:
+        return 200;
+    }
+  }
   addJsonRelationships(query, fromTable, relationships) {
     const sqlClient = this.client;
     const knex3 = this.knex;
-    const { resource, tableAliases: aliases, endpoint } = this.query;
+    const { resource, tableAliases: aliases, endpoint, meta } = this.query;
     const fields = resource?.fields || [];
     for (let relationship of relationships) {
       const {
@@ -68699,20 +68746,24 @@ var InternalBuilder = class {
       if (!toTable || !fromTable) {
         continue;
       }
+      const relatedTable = meta.tables?.[toTable];
       const toAlias = aliases?.[toTable] || toTable, fromAlias = aliases?.[fromTable] || fromTable;
       let toTableWithSchema = this.tableNameWithSchema(toTable, {
         alias: toAlias,
         schema: endpoint.schema
       });
-      let relationshipFields = fields.filter(
-        (field) => field.split(".")[0] === toAlias
+      const requiredFields = [
+        ...relatedTable?.primary || [],
+        relatedTable?.primaryDisplay
+      ].filter((field) => field);
+      let relationshipFields = prioritisedArraySort(
+        fields.filter((field) => field.split(".")[0] === toAlias),
+        requiredFields
+      );
+      relationshipFields = relationshipFields.slice(
+        0,
+        Math.floor(this.maxFunctionParameters() / 2)
       );
-      if (this.client === "sqlite3" /* SQL_LITE */) {
-        relationshipFields = relationshipFields.slice(
-          0,
-          MAX_SQS_RELATIONSHIP_FIELDS
-        );
-      }
       const fieldList = relationshipFields.map((field) => this.buildJsonField(field)).join(",");
       const primaryKey = `${toAlias}.${toPrimary || toKey}`;
       let subQuery = knex3.from(toTableWithSchema).limit(getRelationshipLimit()).orderBy(primaryKey);