pqb 0.51.0 → 0.51.2

package/dist/index.js

@@ -448,8 +448,7 @@ const simplifyColumnDefault = (value) => {
   }
   return;
 };
-const instantiateColumn = (typeFn, params) => {
-  const column = typeFn();
+const assignDbDataToColumn = (column, params) => {
   const { dateTimePrecision } = params;
   Object.assign(column.data, {
     ...params,
@@ -2001,18 +2000,14 @@ const getFullColumnTable = (q, column, index, as) => {
   return as && table !== as && q.q.aliases?.[table] === as ? as : table;
 };
 
-const applySqlComputed = (ctx, q, computed, as, quotedAs) => {
-  addColumnParserToQuery(q, as, computed.result.value);
-  return computed.toSQL(ctx, quotedAs);
-};
-function simpleColumnToSQL(ctx, q, key, column, quotedAs) {
+function simpleColumnToSQL(ctx, key, column, quotedAs) {
   if (!column) return `"${key}"`;
   const { data } = column;
-  return data.computed ? applySqlComputed(ctx, q, data.computed, key, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
+  return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
-function simpleExistingColumnToSQL(ctx, q, key, column, quotedAs) {
+function simpleExistingColumnToSQL(ctx, key, column, quotedAs) {
   const { data } = column;
-  return data.computed ? applySqlComputed(ctx, q, data.computed, key, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
+  return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
 const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
   const index = column.indexOf(".");
@@ -2030,7 +2025,7 @@ const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
   if (!select && data.joinedShapes?.[column]) {
     return `"${column}".r`;
   }
-  return simpleColumnToSQL(ctx, data, column, shape[column], quotedAs);
+  return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
 };
 const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
   const index = column.indexOf(".");
@@ -2044,12 +2039,12 @@ const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
       for (const s of data.select) {
         if (typeof s === "object" && "selectAs" in s) {
           if (column in s.selectAs) {
-            return simpleColumnToSQL(ctx, data, column, data.shape[column]);
+            return simpleColumnToSQL(ctx, column, data.shape[column]);
           }
         }
       }
     }
-    return simpleColumnToSQL(ctx, data, column, data.shape[column], quotedAs);
+    return simpleColumnToSQL(ctx, column, data.shape[column], quotedAs);
   }
 };
 const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) => {
@@ -2067,7 +2062,7 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
       return `"${tableName}"."${col.data.name}"`;
     }
     if (col.data.computed) {
-      return applySqlComputed(ctx, data, col.data.computed, column, quoted);
+      return col.data.computed.toSQL(ctx, quoted);
     }
     return `"${tableName}"."${key}"`;
   }
@@ -2107,13 +2102,7 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
       return `"${tableName}"."${col.data.name}" "${as}"`;
     }
     if (col.data.computed) {
-      return `${applySqlComputed(
-        ctx,
-        data,
-        col.data.computed,
-        as,
-        quoted
-      )} "${as}"`;
+      return `${col.data.computed.toSQL(ctx, quoted)} "${as}"`;
     }
   }
   return `"${tableName}"."${key}"${key === as ? "" : ` "${as}"`}`;
@@ -2126,13 +2115,7 @@ const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList)
       return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}"${col.data.name === as ? "" : ` "${as}"`}`;
     }
     if (col.data.computed) {
-      return `${applySqlComputed(
-        ctx,
-        data,
-        col.data.computed,
-        as,
-        quotedAs
-      )} "${as}"`;
+      return `${col.data.computed.toSQL(ctx, quotedAs)} "${as}"`;
     }
   }
   return `${quotedAs ? `${quotedAs}.` : ""}"${column}"${column === as ? "" : ` "${as}"`}`;
@@ -2148,7 +2131,7 @@ const makeRowToJson = (table, shape, aliasName) => {
   const list = [];
   for (const key in shape) {
     const column = shape[key];
-    if (column.data.explicitSelect || column instanceof VirtualColumn) {
+    if (column.data.explicitSelect) {
       continue;
     }
     if (aliasName && column.data.name || column.data.jsonCast) {
@@ -3072,17 +3055,31 @@ const applyComputedColumns = (q, fn) => {
   q.computeBatchAtRuntime = computeBatchAtRuntime;
   const computed = fn(q);
   for (const key in computed) {
-    const item = computed[key];
+    let item = computed[key];
+    if (typeof item === "function") item = item.call(computed);
     if (item instanceof ComputedColumn) {
       q.q.computeds = {
         ...q.q.computeds,
         [key]: item
       };
     } else {
-      const data = (q.shape[key] = item.result.value || UnknownColumn.instance).data;
+      let col = item.result.value;
+      if (!col) {
+        item.result.value = col = Object.create(
+          UnknownColumn.instance
+        );
+        col.data = { ...col.data };
+      }
+      q.shape[key] = col;
+      const { data } = col;
       data.computed = item;
       data.explicitSelect = true;
       data.readonly = true;
+      addColumnParserToQuery(
+        q.q,
+        key,
+        item.result.value
+      );
     }
   }
   q.computeAtRuntime = q.computeBatchAtRuntime = void 0;
@@ -3372,9 +3369,13 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     let renames;
     if (hookSelect) {
       for (const column of hookSelect.keys()) {
-        const as = hookSelect.get(column).as;
-        if (as) (renames ?? (renames = {}))[column] = as;
-        (tempColumns ?? (tempColumns = /* @__PURE__ */ new Set()))?.add(as || column);
+        const { as, temp } = hookSelect.get(column);
+        if (as) {
+          (renames ?? (renames = {}))[column] = as;
+        }
+        if (temp) {
+          (tempColumns ?? (tempColumns = /* @__PURE__ */ new Set()))?.add(temp);
+        }
       }
       if (renames) {
         for (const record of result) {
@@ -3441,9 +3442,11 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     }
     if (hookSelect || tempReturnType !== returnType) {
       if (renames) {
-        for (const record of result) {
-          for (const a in renames) {
+        for (const a in renames) {
+          for (const record of result) {
+            const value = record[a];
             record[a] = record[renames[a]];
+            record[renames[a]] = value;
           }
         }
       }
@@ -3486,7 +3489,8 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     if (log && sql) {
       log.onError(error, sql, logData);
     }
-    return reject?.(error);
+    if (reject) return reject(error);
+    throw error;
   }
 };
 const execQuery = (adapter, method, sql) => {
@@ -3909,7 +3913,7 @@ const addParsersForSelectJoined = (q, arg, as = arg) => {
     );
   }
 };
-const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
+const addParserForSelectItem = (q, as, key, arg, columnAlias, joinQuery) => {
   if (typeof arg === "object" || typeof arg === "function") {
     const { q: query } = arg;
     if (query.batchParsers) {
@@ -4081,7 +4085,13 @@ const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
     }
     return arg;
   }
-  return setParserForSelectedString(q, arg, as, key);
+  return setParserForSelectedString(
+    q,
+    arg,
+    as,
+    key,
+    columnAlias
+  );
 };
 const collectNestedSelectBatches = (batches, rows, path, last) => {
   const stack = rows.map(
@@ -4173,78 +4183,75 @@ const processSelectArg = (q, as, arg, columnAs) => {
       as,
       key,
       value,
+      key,
       joinQuery
     );
   }
   return { selectAs };
 };
-const setParserForSelectedString = (query, arg, as, columnAs) => {
+const setParserForSelectedString = (query, arg, as, columnAs, columnAlias) => {
   const { q } = query;
   const index = arg.indexOf(".");
-  if (index !== -1) {
-    const table = getFullColumnTable(
-      query,
-      arg,
-      index,
-      as
-    );
-    const column = arg.slice(index + 1);
-    if (column === "*") {
-      addParsersForSelectJoined(query, table, columnAs);
-      return table === as ? column : arg;
-    }
-    if (table === as) {
-      if (columnAs && q.parsers) {
-        const parser2 = q.parsers[column];
-        if (parser2) orchidCore.setObjectValueImmutable(q, "parsers", columnAs, parser2);
-      }
-      return handleComputed(query, q.computeds, column);
-    }
-    const parser = q.joinedParsers?.[table]?.[column];
-    if (parser) orchidCore.setParserToQuery(q, columnAs || column, parser);
-    const batchParsers = q.joinedBatchParsers?.[table];
-    if (batchParsers) {
-      let cloned = false;
-      for (const bp of batchParsers) {
-        if (bp.path[0] === column) {
-          if (!cloned) {
-            q.batchParsers = [...q.batchParsers || []];
-            cloned = true;
-          }
-          q.batchParsers.push(bp);
+  if (index === -1) {
+    return selectColumn(query, q, arg, columnAs, columnAlias);
+  }
+  const table = getFullColumnTable(query, arg, index, as);
+  const column = arg.slice(index + 1);
+  if (column === "*") {
+    addParsersForSelectJoined(query, table, columnAs);
+    return table === as ? column : arg;
+  }
+  if (table === as) {
+    return selectColumn(query, q, column, columnAs, columnAlias);
+  }
+  const parser = q.joinedParsers?.[table]?.[column];
+  if (parser) orchidCore.setParserToQuery(q, columnAs || column, parser);
+  const batchParsers = q.joinedBatchParsers?.[table];
+  if (batchParsers) {
+    let cloned = false;
+    for (const bp of batchParsers) {
+      if (bp.path[0] === column) {
+        if (!cloned) {
+          q.batchParsers = [...q.batchParsers || []];
+          cloned = true;
         }
+        q.batchParsers.push(bp);
       }
     }
-    const computeds = q.joinedComputeds?.[table];
-    if (computeds?.[column]) {
-      const computed = computeds[column];
-      const map = q.hookSelect = new Map(q.hookSelect);
-      for (const column2 of computed.deps) {
-        map.set(column2, { select: `${table}.${column2}` });
-      }
-      orchidCore.setObjectValueImmutable(q, "selectedComputeds", column, computed);
-      return;
-    }
-    return arg;
-  } else {
-    if (columnAs && q.parsers) {
-      const parser = q.parsers?.[arg];
-      if (parser) orchidCore.setObjectValueImmutable(q, "parsers", columnAs, parser);
-    }
-    return handleComputed(query, q.computeds, arg);
   }
-};
-const handleComputed = (q, computeds, column) => {
+  const computeds = q.joinedComputeds?.[table];
   if (computeds?.[column]) {
     const computed = computeds[column];
-    const map = q.q.hookSelect = new Map(q.q.hookSelect);
+    const map = q.hookSelect = new Map(q.hookSelect);
     for (const column2 of computed.deps) {
-      map.set(column2, { select: column2 });
+      map.set(column2, { select: `${table}.${column2}` });
     }
-    q.q.selectedComputeds = { ...q.q.selectedComputeds, [column]: computed };
+    orchidCore.setObjectValueImmutable(q, "selectedComputeds", column, computed);
     return;
   }
-  return column;
+  return arg;
+};
+const selectColumn = (query, q, key, columnAs, columnAlias) => {
+  if (columnAlias === "pluck") {
+    throw new Error("?");
+  }
+  if (columnAs && q.parsers) {
+    const parser = q.parsers[key];
+    if (parser) orchidCore.setObjectValueImmutable(q, "parsers", columnAs, parser);
+  }
+  if (q.computeds?.[key]) {
+    const computed = q.computeds[key];
+    const map = query.q.hookSelect = new Map(query.q.hookSelect);
+    for (const key2 of computed.deps) {
+      map.set(key2, { select: key2 });
+    }
+    query.q.selectedComputeds = {
+      ...query.q.selectedComputeds,
+      [columnAlias || key]: computed
+    };
+    return;
+  }
+  return key;
 };
 const getShapeFromSelect = (q, isSubQuery) => {
   const query = q.q;
@@ -4846,6 +4853,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
     return query.inCTE.selectNum || !select ? select ? "0, " + select : "0" : select;
   }
   let selected;
+  let selectedAs;
   const list = [];
   if (query.select) {
     for (const item of query.select) {
@@ -4854,8 +4862,10 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
         if (item === "*") {
           if (hookSelect) {
             selected ?? (selected = {});
+            selectedAs ?? (selectedAs = {});
             for (const key in query.selectableShape) {
               selected[key] = quotedAs;
+              selectedAs[key] = key;
             }
           }
           sql = selectAllSql(query, quotedAs, jsonList);
@@ -4866,6 +4876,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
             const key = item.slice(index + 1);
             if (hookSelect?.get(key)) {
               (selected ?? (selected = {}))[key] = `"${tableName}"`;
+              (selectedAs ?? (selectedAs = {}))[key] = key;
             }
             sql = tableColumnToSqlWithAs(
               ctx,
@@ -4879,7 +4890,10 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
               jsonList
             );
           } else {
-            if (hookSelect?.get(item)) (selected ?? (selected = {}))[item] = quotedAs;
+            if (hookSelect?.get(item)) {
+              (selected ?? (selected = {}))[item] = quotedAs;
+              (selectedAs ?? (selectedAs = {}))[item] = item;
+            }
             sql = ownColumnToSqlWithAs(
               ctx,
               table.q,
@@ -4897,7 +4911,9 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
         if ("selectAs" in item) {
           const obj = item.selectAs;
           for (const as in obj) {
-            if (hookSelect) (selected ?? (selected = {}))[as] = true;
+            if (hookSelect) {
+              (selected ?? (selected = {}))[as] = true;
+            }
             const value = obj[as];
             if (typeof value === "object") {
               if (orchidCore.isExpression(value)) {
@@ -4913,6 +4929,9 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
                 }
               }
             } else if (value) {
+              if (hookSelect) {
+                (selectedAs ?? (selectedAs = {}))[value] = as;
+              }
               list.push(
                 columnToSqlWithAs(
                   ctx,
@@ -4954,7 +4973,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
           quotedTable = quotedAs;
           columnName = select;
           col = query.shape[select];
-          sql = simpleColumnToSQL(ctx, query, select, col, quotedAs);
+          sql = simpleColumnToSQL(ctx, select, col, quotedAs);
         }
       } else {
         columnName = column;
@@ -4969,9 +4988,17 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
         let i = 2;
         while (selected[name = `${column}${i}`]) i++;
         item.as = name;
+        item.temp = name;
         sql += ` "${name}"`;
-      } else if (col?.data.name || typeof select === "object") {
-        sql += ` "${columnName}"`;
+      } else if (selectedAs?.[columnName]) {
+        item.as = selectedAs[columnName];
+        item.temp = columnName;
+        continue;
+      } else {
+        if (col?.data.name || typeof select === "object") {
+          sql += ` "${columnName}"`;
+        }
+        item.temp = columnName;
       }
       if (jsonList) jsonList[name] = col;
       list.push(sql);
@@ -5836,13 +5863,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
         let column = query.shape[key];
         let quotedColumn;
         if (column) {
-          quotedColumn = simpleExistingColumnToSQL(
-            ctx,
-            query,
-            key,
-            column,
-            quotedAs
-          );
+          quotedColumn = simpleExistingColumnToSQL(ctx, key, column, quotedAs);
         } else if (!column) {
           const index = key.indexOf(".");
           if (index !== -1) {
@@ -5850,7 +5871,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
             const quoted = `"${table2}"`;
             const name = key.slice(index + 1);
             column = quotedAs === quoted ? query.shape[name] : query.joinedShapes?.[table2]?.[name];
-            quotedColumn = simpleColumnToSQL(ctx, query, name, column, quoted);
+            quotedColumn = simpleColumnToSQL(ctx, name, column, quoted);
           } else {
             column = query.joinedShapes?.[key]?.value;
             quotedColumn = `"${key}".r`;
@@ -7390,6 +7411,7 @@ class VirtualColumn extends ColumnType {
     super(schema, inputSchema);
     this.dataType = "";
     this.operators = Operators.any;
+    this.data.explicitSelect = true;
   }
   toCode() {
     throw new Error(`toCode is not implemented for virtual column`);
@@ -7399,6 +7421,8 @@ class VirtualColumn extends ColumnType {
 const _UnknownColumn = class _UnknownColumn extends VirtualColumn {
   constructor(schema) {
     super(schema, schema.unknown());
+    this.selectable = true;
+    this.data.explicitSelect = void 0;
   }
 };
 _UnknownColumn.instance = new _UnknownColumn(defaultSchemaConfig);
@@ -11722,8 +11746,6 @@ class ColumnRefExpression extends orchidCore.Expression {
   makeSQL(ctx, quotedAs) {
     return simpleExistingColumnToSQL(
       ctx,
-      // it's for parsers for computed SQL. In the column ref case, parsers should be set when selecting the column ref.
-      {},
       this.name,
       this.result.value,
       quotedAs
@@ -13357,6 +13379,7 @@ exports.addParserForSelectItem = addParserForSelectItem;
 exports.addQueryOn = addQueryOn;
 exports.anyShape = anyShape;
 exports.applyComputedColumns = applyComputedColumns;
+exports.assignDbDataToColumn = assignDbDataToColumn;
 exports.checkIfASimpleQuery = checkIfASimpleQuery;
 exports.cloneQueryBaseUnscoped = cloneQueryBaseUnscoped;
 exports.columnCheckToCode = columnCheckToCode;
@@ -13392,7 +13415,6 @@ exports.handleResult = handleResult;
 exports.identityToCode = identityToCode;
 exports.indexInnerToCode = indexInnerToCode;
 exports.indexToCode = indexToCode;
-exports.instantiateColumn = instantiateColumn;
 exports.isDefaultTimeStamp = isDefaultTimeStamp;
 exports.isQueryReturnsAll = isQueryReturnsAll;
 exports.isSelectingCount = isSelectingCount;