pqb 0.38.2 → 0.38.4

package/dist/index.mjs

@@ -2144,7 +2144,7 @@ const andOrToSql = (ctx, table, query, quotedAs, parens) => {
   } else {
     return;
   }
-  return parens ? `(${sql})` : sql;
+  return parens && sql ? `(${sql})` : sql;
 };
 const processAnds = (and, ctx, table, query, quotedAs, parens) => {
   const ands = [];
@@ -4000,19 +4000,19 @@ const filterResult = (q, returnType, queryResult, result, tempColumns, hasAfterH
     }
   }
   if (returnType === "value") {
-    return (_a = result[0]) == null ? void 0 : _a[queryResult.fields[0].name];
+    return (_a = result[0]) == null ? void 0 : _a[getFirstResultKey(q, queryResult)];
   }
   if (returnType === "valueOrThrow") {
     const row = result[0];
     if (!row)
       throw new NotFoundError(q);
-    return row[queryResult.fields[0].name];
+    return row[getFirstResultKey(q, queryResult)];
   }
   if (returnType === "rowCount") {
     return queryResult.rowCount;
   }
   if (returnType === "pluck") {
-    const key = queryResult.fields[0].name;
+    const key = getFirstResultKey(q, queryResult);
     return result.map((row) => row[key]);
   }
   if (returnType === "rows") {
@@ -4021,6 +4021,16 @@ const filterResult = (q, returnType, queryResult, result, tempColumns, hasAfterH
   }
   return;
 };
+const getFirstResultKey = (q, queryResult) => {
+  if (q.q.select) {
+    return queryResult.fields[0].name;
+  } else {
+    for (const key in q.q.selectedComputeds) {
+      return key;
+    }
+  }
+  return;
+};
 const filterAllResult = (result, tempColumns, hasAfterHook) => {
   if (tempColumns == null ? void 0 : tempColumns.size) {
     if (hasAfterHook) {
@@ -4455,7 +4465,7 @@ const getShapeFromSelect = (q, isSubQuery) => {
           } else if (it) {
             const { returnType } = it.q;
             if (returnType === "value" || returnType === "valueOrThrow") {
-              const type = it.q[getValueKey];
+              const type = it.q.getColumn;
               if (type)
                 result[key] = type;
             } else {
@@ -4571,7 +4581,7 @@ const _get = (query, returnType, arg) => {
         }
       }
     }
-    q[getValueKey] = type;
+    q.getColumn = type;
     const selected = setParserForSelectedString(
       query,
       arg,
@@ -4587,7 +4597,7 @@ const _get = (query, returnType, arg) => {
     ] : void 0;
   } else {
     type = arg.result.value;
-    q[getValueKey] = type;
+    q.getColumn = type;
     addParserForRawExpression(query, getValueKey, arg);
     q.select = [q.expr = arg];
   }
@@ -6432,7 +6442,7 @@ class FnExpression extends Expression {
     Object.assign(query, value.operators);
     query.q.returnType = "valueOrThrow";
     query.q.returnsOne = true;
-    query.q[getValueKey] = value;
+    query.q.getColumn = value;
     query.q.select = [this];
     const { parseFn } = value;
     if (parseFn) {
@@ -9151,7 +9161,6 @@ class MergeQueryMethods {
           break;
       }
     }
-    a[getValueKey] = b[getValueKey];
     if (b.returnType)
       a.returnType = b.returnType;
     return query;