pqb 0.38.3 → 0.38.5

package/dist/index.mjs

@@ -3276,18 +3276,7 @@ class Transaction {
         const result = await this.q.adapter.transaction(sql, callback);
         if (log)
           log.afterQuery(commitSql$1, logData);
-        const { afterCommit } = trx;
-        if (afterCommit) {
-          const promises = [];
-          for (let i = 0, len = afterCommit.length; i < len; i += 2) {
-            const q = afterCommit[i];
-            const result2 = afterCommit[i + 1];
-            for (const fn2 of afterCommit[i + 2]) {
-              promises.push(fn2(result2, q));
-            }
-          }
-          await Promise.all(promises);
-        }
+        await runAfterCommit(trx.afterCommit);
         return result;
       } catch (err) {
         if (log)
@@ -3319,6 +3308,11 @@ class Transaction {
         await adapter.query(sql);
         if (log)
           log.afterQuery(sql, logData);
+        if (transactionId === trx.testTransactionCount) {
+          await runAfterCommit(
+            trx.afterCommit
+          );
+        }
         return result;
       } finally {
         trx.transactionId = transactionId - 1;
@@ -3326,6 +3320,19 @@ class Transaction {
     }
   }
 }
+const runAfterCommit = async (afterCommit) => {
+  if (afterCommit) {
+    const promises = [];
+    for (let i = 0, len = afterCommit.length; i < len; i += 3) {
+      const result = afterCommit[i];
+      const q = afterCommit[i + 1];
+      for (const fn of afterCommit[i + 2]) {
+        promises.push(fn(result, q));
+      }
+    }
+    await Promise.all(promises);
+  }
+};
 
 const applyBatchTransforms = (query, batches) => {
   if (query.transform) {
@@ -4000,19 +4007,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 +4028,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 +4472,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 +4588,7 @@ const _get = (query, returnType, arg) => {
         }
       }
     }
-    q[getValueKey] = type;
+    q.getColumn = type;
     const selected = setParserForSelectedString(
       query,
       arg,
@@ -4587,7 +4604,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 +6449,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 +9168,6 @@ class MergeQueryMethods {
           break;
       }
     }
-    a[getValueKey] = b[getValueKey];
     if (b.returnType)
       a.returnType = b.returnType;
     return query;
@@ -12693,6 +12709,7 @@ const testTransaction = {
             adapter.query = t.query.bind(t);
             adapter.arrays = t.arrays.bind(t);
             adapter.transaction = t.transaction.bind(t);
+            trx.testTransactionCount = trx.testTransactionCount ? trx.testTransactionCount + 1 : 1;
           }
           data.reject = rej;
         });
@@ -12701,6 +12718,10 @@ const testTransaction = {
           throw err;
         }
       }).finally(() => {
+        const trx = db.internal.transactionStorage.getStore();
+        if (trx == null ? void 0 : trx.testTransactionCount) {
+          trx.testTransactionCount--;
+        }
         db.internal.transactionStorage.getStore = getStore;
       });
     });