pqb 0.51.0 → 0.51.1

package/dist/index.mjs

@@ -1999,18 +1999,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(".");
@@ -2028,7 +2024,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(".");
@@ -2042,12 +2038,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) => {
@@ -2065,7 +2061,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}"`;
   }
@@ -2105,13 +2101,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}"`}`;
@@ -2124,13 +2114,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}"`}`;
@@ -2146,7 +2130,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) {
@@ -3077,10 +3061,23 @@ const applyComputedColumns = (q, fn) => {
         [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;
@@ -4179,58 +4176,49 @@ const processSelectArg = (q, as, arg, columnAs) => {
 const setParserForSelectedString = (query, arg, as, columnAs) => {
   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) setObjectValueImmutable(q, "parsers", columnAs, parser2);
-      }
-      return handleComputed(query, q.computeds, column);
-    }
-    const parser = q.joinedParsers?.[table]?.[column];
-    if (parser) 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);
+  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);
+  }
+  const parser = q.joinedParsers?.[table]?.[column];
+  if (parser) 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}` });
-      }
-      setObjectValueImmutable(q, "selectedComputeds", column, computed);
-      return;
-    }
-    return arg;
-  } else {
-    if (columnAs && q.parsers) {
-      const parser = q.parsers?.[arg];
-      if (parser) setObjectValueImmutable(q, "parsers", columnAs, parser);
+  }
+  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}` });
     }
-    return handleComputed(query, q.computeds, arg);
+    setObjectValueImmutable(q, "selectedComputeds", column, computed);
+    return;
   }
+  return arg;
+};
+const selectColumn = (query, q, key, columnAs) => {
+  if (columnAs && q.parsers) {
+    const parser = q.parsers[key];
+    if (parser) setObjectValueImmutable(q, "parsers", columnAs, parser);
+  }
+  return handleComputed(query, q.computeds, key);
 };
 const handleComputed = (q, computeds, column) => {
   if (computeds?.[column]) {
@@ -4952,7 +4940,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;
@@ -5834,13 +5822,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) {
@@ -5848,7 +5830,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`;
@@ -7388,6 +7370,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`);
@@ -7397,6 +7380,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);
@@ -11720,8 +11705,6 @@ class ColumnRefExpression extends 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