pqb 0.31.4 → 0.31.6

package/dist/index.js

@@ -1776,35 +1776,68 @@ function simpleExistingColumnToSQL(ctx, key, column, quotedAs) {
   return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
 const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
-  var _a, _b, _c, _d, _e;
+  var _a;
   const index = column.indexOf(".");
   if (index !== -1) {
-    const table = column.slice(0, index);
-    const key = column.slice(index + 1);
-    if (key === "*") {
-      if ((_a = data.joinedShapes) == null ? void 0 : _a[table]) {
-        return select ? `row_to_json("${table}".*)` : `"${table}".r`;
+    return columnWithDotToSql(
+      ctx,
+      data,
+      shape,
+      column,
+      index,
+      quotedAs,
+      select
+    );
+  }
+  if (!select && ((_a = data.joinedShapes) == null ? void 0 : _a[column])) {
+    return `"${column}".r`;
+  }
+  return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
+};
+const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
+  var _a;
+  const index = column.indexOf(".");
+  if (index !== -1) {
+    return columnWithDotToSql(ctx, data, data.shape, column, index, quotedAs);
+  } else {
+    if ((_a = data.joinedShapes) == null ? void 0 : _a[column]) {
+      return `"${column}".r`;
+    }
+    if (data.select) {
+      for (const s of data.select) {
+        if (typeof s === "object" && "selectAs" in s) {
+          if (column in s.selectAs) {
+            return simpleColumnToSQL(ctx, column, data.shape[column]);
+          }
+        }
       }
-      return column;
     }
-    const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
-    const quoted = `"${table}"`;
-    const col = quoted === quotedAs ? shape[key] : (_d = (_c = data.joinedShapes) == null ? void 0 : _c[tableName]) == null ? void 0 : _d[key];
-    if (col) {
-      if (col.data.name) {
-        return `"${tableName}"."${col.data.name}"`;
-      }
-      if (col.data.computed) {
-        return `${col.data.computed.toSQL(ctx, quoted)}`;
-      }
-      return `"${tableName}"."${key}"`;
+    return simpleColumnToSQL(ctx, column, data.shape[column], quotedAs);
+  }
+};
+const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) => {
+  var _a, _b, _c, _d;
+  const table = column.slice(0, index);
+  const key = column.slice(index + 1);
+  if (key === "*") {
+    if ((_a = data.joinedShapes) == null ? void 0 : _a[table]) {
+      return select ? `row_to_json("${table}".*)` : `"${table}".r`;
     }
-    return `"${tableName}"."${key}"`;
+    return column;
   }
-  if (!select && ((_e = data.joinedShapes) == null ? void 0 : _e[column])) {
-    return `"${column}".r`;
+  const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
+  const quoted = `"${table}"`;
+  const col = quoted === quotedAs ? shape[key] : (_d = (_c = data.joinedShapes) == null ? void 0 : _c[tableName]) == null ? void 0 : _d[key];
+  if (col) {
+    if (col.data.name) {
+      return `"${tableName}"."${col.data.name}"`;
+    }
+    if (col.data.computed) {
+      return `${col.data.computed.toSQL(ctx, quoted)}`;
+    }
+    return `"${tableName}"."${key}"`;
   }
-  return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
+  return `"${tableName}"."${key}"`;
 };
 const columnToSqlWithAs = (ctx, data, column, quotedAs, select) => {
   var _a, _b, _c, _d;
@@ -4036,7 +4069,7 @@ const addOrder = (ctx, data, column, quotedAs, dir) => {
     const order = dir || (!search.order || search.order === true ? orchidCore.emptyObject : search.order);
     return `${order.coverDensity ? "ts_rank_cd" : "ts_rank"}(${order.weights ? `${orchidCore.addValue(ctx.values, `{${order.weights}}`)}, ` : ""}${search.vectorSQL}, "${column}"${order.normalization !== void 0 ? `, ${orchidCore.addValue(ctx.values, order.normalization)}` : ""}) ${order.dir || "DESC"}`;
   }
-  return `${columnToSql(ctx, data, data.shape, column, quotedAs)} ${dir || "ASC"}`;
+  return `${maybeSelectedColumnToSql(ctx, data, column, quotedAs)} ${dir || "ASC"}`;
 };
 
 const windowToSql = (ctx, data, window, quotedAs) => {
@@ -4354,14 +4387,7 @@ const pushInsertSql = (ctx, q, query, quotedAs) => {
           const name = ((_c = shape[merge]) == null ? void 0 : _c.data.name) || merge;
           sql = `"${name}" = excluded."${name}"`;
         } else if ("except" in merge) {
-          const notExcluded = [];
-          const except = orchidCore.toArray(merge.except);
-          for (let i = 0; i < columns.length; i++) {
-            if (!except.includes(columns[i])) {
-              notExcluded.push(quotedColumns[i]);
-            }
-          }
-          sql = mergeColumnsSql(notExcluded);
+          sql = mergeColumnsSql(columns, quotedColumns, target, merge.except);
         } else {
           sql = merge.reduce((sql2, item, i) => {
             var _a2;
@@ -4370,7 +4396,7 @@ const pushInsertSql = (ctx, q, query, quotedAs) => {
           }, "");
         }
       } else {
-        sql = mergeColumnsSql(quotedColumns);
+        sql = mergeColumnsSql(columns, quotedColumns, target);
       }
       ctx.sql.push("DO UPDATE SET", sql);
     } else if (query.onConflict.set) {
@@ -4398,8 +4424,22 @@ const pushInsertSql = (ctx, q, query, quotedAs) => {
   pushWhereStatementSql(ctx, q, query, quotedAs);
   return pushReturningSql(ctx, q, query, quotedAs, query.afterCreateSelect);
 };
-const mergeColumnsSql = (quotedColumns2) => {
-  return quotedColumns2.map((column) => `${column} = excluded.${column}`).join(", ");
+const mergeColumnsSql = (columns, quotedColumns2, target, except) => {
+  const notExcluded = [];
+  const exclude = typeof target === "string" ? [target] : Array.isArray(target) ? [...target] : [];
+  if (except) {
+    if (typeof except === "string") {
+      exclude.push(except);
+    } else {
+      exclude.push(...except);
+    }
+  }
+  for (let i = 0; i < columns.length; i++) {
+    if (!exclude.includes(columns[i])) {
+      notExcluded.push(quotedColumns2[i]);
+    }
+  }
+  return notExcluded.map((column) => `${column} = excluded.${column}`).join(", ");
 };
 const encodeRow = (ctx, q, QueryClass, row, runtimeDefaults, quotedAs) => {
   const arr = row.map((value) => {
@@ -4786,7 +4826,7 @@ const makeSQL = (table, options) => {
     }
     if (query.group) {
       const group = query.group.map(
-        (item) => orchidCore.isExpression(item) ? item.toSQL(ctx, quotedAs) : columnToSql(ctx, table.q, table.q.shape, item, quotedAs)
+        (item) => orchidCore.isExpression(item) ? item.toSQL(ctx, quotedAs) : maybeSelectedColumnToSql(ctx, table.q, item, quotedAs)
       );
       sql.push(`GROUP BY ${group.join(", ")}`);
     }