pqb 0.48.5 → 0.48.6

package/dist/index.d.ts

@@ -373,7 +373,7 @@ interface CommonQueryData {
         aliases: string[];
     };
     selectAllColumns?: string[];
-    selectAllKeys?: RecordUnknown;
+    selectableShape: 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

@@ -4337,14 +4337,14 @@ function queryFrom(self, arg) {
     data.batchParsers = q.q.batchParsers;
   }
   data.from = arg;
-  data.selectAllColumns = data.selectAllKeys = data.scopes = void 0;
+  data.selectAllColumns = data.scopes = void 0;
   return self;
 }
 function queryFromSql(self, args) {
   const data = self.q;
   data.as || (data.as = "t");
   data.from = sqlQueryArgsToExpression(args);
-  data.selectAllColumns = data.selectAllKeys = void 0;
+  data.selectAllColumns = void 0;
   return self;
 }
 class FromMethods {
@@ -4816,7 +4816,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
         if (item === "*") {
           if (hookSelect) {
             selected ?? (selected = {});
-            for (const key in query.selectAllKeys || query.shape) {
+            for (const key in query.selectableShape) {
               selected[key] = quotedAs;
             }
           }
@@ -4942,10 +4942,7 @@ function selectedObjectToSQL(ctx, quotedAs, item) {
 }
 const selectAllSql = (query, quotedAs, jsonList) => {
   if (jsonList) {
-    Object.assign(
-      jsonList,
-      query.selectAllKeys || query.shape
-    );
+    Object.assign(jsonList, query.selectableShape);
   }
   return query.join?.length ? query.selectAllColumns?.map((item) => `${quotedAs}.${item}`).join(", ") || `${quotedAs}.*` : query.selectAllColumns?.join(", ") || "*";
 };
@@ -10249,7 +10246,7 @@ const mergableObjects = /* @__PURE__ */ new Set([
   "joinedBatchParsers",
   "selectedComputeds"
 ]);
-const dontMergeArrays = /* @__PURE__ */ new Set(["selectAllColumns", "selectAllKeys"]);
+const dontMergeArrays = /* @__PURE__ */ new Set(["selectAllColumns"]);
 class MergeQueryMethods {
   merge(q) {
     const query = _clone(this);
@@ -12751,20 +12748,26 @@ class Db extends QueryMethods {
     );
     this.columns = columns;
     if (options.computed) applyComputedColumns(this, options.computed);
+    const selectableShape = this.q.selectableShape = {};
     if (prepareSelectAll) {
       const list = [];
-      const keys = {};
       for (const key in shape) {
         const column = shape[key];
-        if (!column.data.explicitSelect) {
+        if (!column.data.explicitSelect && !(column instanceof VirtualColumn)) {
           list.push(
             column.data.name ? `"${column.data.name}" "${key}"` : `"${key}"`
           );
-          keys[key] = column;
+          selectableShape[key] = column;
         }
       }
       this.q.selectAllColumns = list;
-      this.q.selectAllKeys = keys;
+    } else {
+      for (const key in shape) {
+        const column = shape[key];
+        if (column instanceof VirtualColumn) {
+          selectableShape[key] = column;
+        }
+      }
     }
     if (modifyQuery) {
       for (const cb of modifyQuery) {