@budibase/backend-core 2.29.21 → 2.29.22

package/dist/index.js

@@ -67621,27 +67621,20 @@ var sqlTable_default = SqlTableQueryBuilder;
 // src/sql/sql.ts
 var envLimit = environment_default.SQL_MAX_ROWS ? parseInt(environment_default.SQL_MAX_ROWS) : null;
 var BASE_LIMIT = envLimit || 5e3;
-function likeKey(client, key) {
-  let start2, end2;
+function quote(client, str) {
   switch (client) {
-    case "mysql2" /* MY_SQL */:
-      start2 = end2 = "`";
-      break;
     case "sqlite3" /* SQL_LITE */:
     case "oracledb" /* ORACLE */:
     case "pg" /* POSTGRES */:
-      start2 = end2 = '"';
-      break;
+      return `"${str}"`;
     case "mssql" /* MS_SQL */:
-      start2 = "[";
-      end2 = "]";
-      break;
-    default:
-      throw new Error("Unknown client generating like key");
+      return `[${str}]`;
+    case "mysql2" /* MY_SQL */:
+      return `\`${str}\``;
   }
-  const parts = key.split(".");
-  key = parts.map((part) => `${start2}${part}${end2}`).join(".");
-  return key;
+}
+function quotedIdentifier(client, key) {
+  return key.split(".").map((part) => quote(client, part)).join(".");
 }
 function parse(input) {
   if (Array.isArray(input)) {
@@ -67684,27 +67677,51 @@ function parseFilters(filters) {
 }
 function generateSelectStatement(json, knex3) {
   const { resource, meta } = json;
+  const client = knex3.client.config.client;
   if (!resource || !resource.fields || resource.fields.length === 0) {
     return "*";
   }
-  const schema = meta?.table?.schema;
+  const schema = meta.table.schema;
   return resource.fields.map((field) => {
-    const fieldNames = field.split(/\./g);
-    const tableName = fieldNames[0];
-    const columnName = fieldNames[1];
-    const columnSchema = schema?.[columnName];
-    if (columnSchema && knex3.client.config.client === "pg" /* POSTGRES */) {
-      const externalType = schema[columnName].externalType;
-      if (externalType?.includes("money")) {
-        return knex3.raw(
-          `"${tableName}"."${columnName}"::money::numeric as "${field}"`
-        );
-      }
+    const parts = field.split(/\./g);
+    let table = void 0;
+    let column = void 0;
+    if (parts.length === 1) {
+      column = parts[0];
+    }
+    if (parts.length === 2) {
+      table = parts[0];
+      column = parts[1];
+    }
+    if (parts.length > 2) {
+      table = parts[0];
+      column = parts.slice(1).join(".");
+    }
+    if (!column) {
+      throw new Error(`Invalid field name: ${field}`);
+    }
+    const columnSchema = schema[column];
+    if (client === "pg" /* POSTGRES */ && columnSchema?.externalType?.includes("money")) {
+      return knex3.raw(
+        `${quotedIdentifier(
+          client,
+          [table, column].join(".")
+        )}::money::numeric as ${quote(client, field)}`
+      );
     }
-    if (knex3.client.config.client === "mssql" /* MS_SQL */ && columnSchema?.type === "datetime" /* DATETIME */ && columnSchema.timeOnly) {
+    if (client === "mssql" /* MS_SQL */ && columnSchema?.type === "datetime" /* DATETIME */ && columnSchema.timeOnly) {
       return knex3.raw(`CONVERT(varchar, ${field}, 108) as "${field}"`);
     }
-    return `${field} as ${field}`;
+    if (table) {
+      return knex3.raw(
+        `${quote(client, table)}.${quote(client, column)} as ${quote(
+          client,
+          field
+        )}`
+      );
+    } else {
+      return knex3.raw(`${quote(client, field)} as ${quote(client, field)}`);
+    }
   });
 }
 function getTableName(table) {
@@ -67780,9 +67797,10 @@ var InternalBuilder = class {
         query = query[fnc](key, "ilike", `%${value}%`);
       } else {
         const rawFnc = `${fnc}Raw`;
-        query = query[rawFnc](`LOWER(${likeKey(this.client, key)}) LIKE ?`, [
-          `%${value.toLowerCase()}%`
-        ]);
+        query = query[rawFnc](
+          `LOWER(${quotedIdentifier(this.client, key)}) LIKE ?`,
+          [`%${value.toLowerCase()}%`]
+        );
       }
     };
     const contains = (mode, any = false) => {
@@ -67829,7 +67847,10 @@ var InternalBuilder = class {
             } else {
               value[i] = `%${value[i]}%`;
             }
-            statement += (statement ? andOr : "") + `COALESCE(LOWER(${likeKey(this.client, key)}), '') LIKE ?`;
+            statement += (statement ? andOr : "") + `COALESCE(LOWER(${quotedIdentifier(
+              this.client,
+              key
+            )}), '') LIKE ?`;
           }
           if (statement === "") {
             return;
@@ -67857,9 +67878,10 @@ var InternalBuilder = class {
           query = query[fnc](key, "ilike", `${value}%`);
         } else {
           const rawFnc = `${fnc}Raw`;
-          query = query[rawFnc](`LOWER(${likeKey(this.client, key)}) LIKE ?`, [
-            `${value.toLowerCase()}%`
-          ]);
+          query = query[rawFnc](
+            `LOWER(${quotedIdentifier(this.client, key)}) LIKE ?`,
+            [`${value.toLowerCase()}%`]
+          );
         }
       });
     }
@@ -67892,12 +67914,15 @@ var InternalBuilder = class {
         const fnc = allOr ? "orWhereRaw" : "whereRaw";
         if (this.client === "mssql" /* MS_SQL */) {
           query = query[fnc](
-            `CASE WHEN ${likeKey(this.client, key)} = ? THEN 1 ELSE 0 END = 1`,
+            `CASE WHEN ${quotedIdentifier(
+              this.client,
+              key
+            )} = ? THEN 1 ELSE 0 END = 1`,
             [value]
           );
         } else {
           query = query[fnc](
-            `COALESCE(${likeKey(this.client, key)} = ?, FALSE)`,
+            `COALESCE(${quotedIdentifier(this.client, key)} = ?, FALSE)`,
             [value]
           );
         }
@@ -67908,12 +67933,15 @@ var InternalBuilder = class {
         const fnc = allOr ? "orWhereRaw" : "whereRaw";
         if (this.client === "mssql" /* MS_SQL */) {
           query = query[fnc](
-            `CASE WHEN ${likeKey(this.client, key)} = ? THEN 1 ELSE 0 END = 0`,
+            `CASE WHEN ${quotedIdentifier(
+              this.client,
+              key
+            )} = ? THEN 1 ELSE 0 END = 0`,
             [value]
           );
         } else {
           query = query[fnc](
-            `COALESCE(${likeKey(this.client, key)} != ?, TRUE)`,
+            `COALESCE(${quotedIdentifier(this.client, key)} != ?, TRUE)`,
             [value]
           );
         }