pqb 0.48.4 → 0.48.6

package/dist/index.mjs

@@ -4335,14 +4335,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 {
@@ -4814,7 +4814,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;
             }
           }
@@ -4940,10 +4940,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(", ") || "*";
 };
@@ -6980,30 +6977,39 @@ const _chain = (fromQuery, toQuery, rel) => {
   const self = fromQuery;
   const toTable = toQuery;
   let query;
+  let q;
   if (self.q.subQuery) {
     query = toTable;
     query.q.subQuery = 2;
+    q = query.q;
+    if (
+      // `select({ q => q.rel })`: on the first relation it doesn't matter if the parent has chainMultiple
+      self.q.subQuery > 1 && self.q.chainMultiple
+    ) ; else if (!rel.query.q.returnsOne) {
+      q.chainMultiple = true;
+    }
   } else {
     query = _queryWhere(_queryAll(toTable), [
       {
         EXISTS: { q: rel.reverseJoin(self, toTable) }
       }
     ]);
+    q = query.q;
+    q.returnType = q.returnsOne = q.limit = void 0;
   }
   if (self.q.relChain) {
-    query.q.relChain = [...self.q.relChain, self];
-    query.q.returnType = "all";
+    q.relChain = [...self.q.relChain, self];
   } else {
-    query.q.relChain = [self];
+    q.relChain = [self];
   }
   const aliases = self.q.as ? { ...self.q.aliases } : { ...self.q.aliases, [self.table]: self.table };
-  const relAliases = query.q.aliases;
+  const relAliases = q.aliases;
   for (const as in relAliases) {
     aliases[as] = _queryResolveAlias(aliases, as);
   }
-  query.q.as = aliases[query.q.as];
-  query.q.aliases = aliases;
-  query.q.joinedShapes = {
+  q.as = aliases[q.as];
+  q.aliases = aliases;
+  q.joinedShapes = {
     [getQueryAs(self)]: self.q.shape,
     ...self.q.joinedShapes
   };
@@ -10238,7 +10244,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);
@@ -12740,20 +12746,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) {