pqb 0.51.2 → 0.51.3

package/dist/index.d.ts

@@ -380,7 +380,10 @@ interface CommonQueryData {
         aliases: string[];
     };
     selectAllColumns?: string[];
-    selectableShape: RecordUnknown;
+    /**
+     * Subset of the `shape` that only includes columns with no `data.explicitSelect`.
+     */
+    selectAllShape: RecordUnknown;
     /**
      * column type for query with 'value' or 'valueOrThrow' return type
      * Is needed in {@link getShapeFromSelect} to get shape of sub-select that returns a single value.

package/dist/index.js

@@ -4232,9 +4232,6 @@ const setParserForSelectedString = (query, arg, as, columnAs, columnAlias) => {
   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);
@@ -4271,7 +4268,9 @@ const getShapeFromSelect = (q, isSubQuery) => {
       result = {};
       for (const key in shape) {
         const column = shape[key];
-        result[key] = column.data.name ? orchidCore.setColumnData(column, "name", void 0) : column;
+        if (!column.data.explicitSelect) {
+          result[key] = column.data.name ? orchidCore.setColumnData(column, "name", void 0) : column;
+        }
       }
     } else {
       result = shape;
@@ -4331,10 +4330,12 @@ const addColumnToShapeFromSelect = (q, arg, shape, query, result, isSubQuery, ke
     }
   } else if (arg === "*") {
     for (const key2 in shape) {
-      result[key2] = mapSubSelectColumn(
-        shape[key2],
-        isSubQuery
-      );
+      if (!shape[key2].data.explicitSelect) {
+        result[key2] = mapSubSelectColumn(
+          shape[key2],
+          isSubQuery
+        );
+      }
     }
   } else {
     result[key || arg] = mapSubSelectColumn(
@@ -4863,7 +4864,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
           if (hookSelect) {
             selected ?? (selected = {});
             selectedAs ?? (selectedAs = {});
-            for (const key in query.selectableShape) {
+            for (const key in query.selectAllShape) {
               selected[key] = quotedAs;
               selectedAs[key] = key;
             }
@@ -5012,7 +5013,7 @@ function selectedObjectToSQL(ctx, quotedAs, item) {
 }
 const selectAllSql = (query, quotedAs, jsonList) => {
   if (jsonList) {
-    Object.assign(jsonList, query.selectableShape);
+    Object.assign(jsonList, query.selectAllShape);
   }
   return query.join?.length ? query.selectAllColumns?.map((item) => `${quotedAs}.${item}`).join(", ") || `${quotedAs}.*` : query.selectAllColumns?.join(", ") || "*";
 };
@@ -11812,7 +11813,7 @@ class ExpressionMethods {
   column(name) {
     const column = this.shape[name];
     return new ColumnRefExpression(
-      column,
+      column || UnknownColumn.instance,
       name
     );
   }
@@ -11854,12 +11855,12 @@ class ExpressionMethods {
       if (table === as) {
         column = shape[col];
       } else {
-        column = q.q.joinedShapes[table][col];
+        column = q.q.joinedShapes?.[table][col];
       }
     } else {
       column = shape[arg];
     }
-    return new RefExpression(column, q, arg);
+    return new RefExpression(column || UnknownColumn.instance, q, arg);
   }
   val(value) {
     return new orchidCore.ValExpression(value);
@@ -12739,7 +12740,7 @@ const parseIndexOrExclude = (item) => {
 
 const anyShape = {};
 class Db extends QueryMethods {
-  constructor(adapter, queryBuilder, table = void 0, shape = anyShape, columnTypes, transactionStorage, options, tableData = orchidCore.emptyObject) {
+  constructor(adapter, queryBuilder, table = void 0, shape = anyShape, columnTypes, transactionStorage, options, tableData = {}) {
     super();
     this.adapter = adapter;
     this.queryBuilder = queryBuilder;
@@ -12833,26 +12834,21 @@ class Db extends QueryMethods {
     );
     this.columns = columns;
     if (options.computed) applyComputedColumns(this, options.computed);
-    const selectableShape = this.q.selectableShape = {};
     if (prepareSelectAll) {
+      const selectAllShape = this.q.selectAllShape = {};
       const list = [];
       for (const key in shape) {
         const column = shape[key];
-        if (!column.data.explicitSelect && !(column instanceof VirtualColumn)) {
+        if (!column.data.explicitSelect) {
           list.push(
             column.data.name ? `"${column.data.name}" "${key}"` : `"${key}"`
           );
-          selectableShape[key] = column;
+          selectAllShape[key] = column;
         }
       }
       this.q.selectAllColumns = list;
     } else {
-      for (const key in shape) {
-        const column = shape[key];
-        if (column instanceof VirtualColumn) {
-          selectableShape[key] = column;
-        }
-      }
+      this.q.selectAllShape = shape;
     }
     if (modifyQuery) {
       for (const cb of modifyQuery) {