pqb 0.38.3 → 0.38.5

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { PoolConfig, Pool, PoolClient } from 'pg';
 import * as orchid_core from 'orchid-core';
-import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, SingleSqlItem, Sql, RecordUnknown, RecordKeyTrue, EmptyObject, QueryBaseCommon, QueryColumns, QueryMetaBase, QueryReturnType, QueryThen, Expression, MaybeArray, TemplateLiteralArgs, QueryColumn, MaybePromise, FnUnknownToUnknown, RecordString, ColumnsShapeBase, ColumnsParsers, PickQueryTable, BatchParsers, HookSelect, QueryLogObject, QueryLogger, QueryDataTransform, ExpressionChain, getValueKey, PickQueryShape, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, SelectableBase, PickQueryMetaShape, PickQueryTableMetaResultShape, PickQueryMetaResultWindows, PickOutputTypeAndOperators, PickQueryResult, ExpressionData, ValExpression, PickOutputType, SQLQueryArgs, ColumnSchemaConfig, DateColumnData, ColumnToCodeCtx, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, StaticSQLArgs, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ParseColumn, EncodeColumn, QueryColumnsInit, QueryLogOptions, DefaultSelectColumns, DbBase, QueryCatch, TransactionState, ColumnTypeBase, PickQueryUniqueProperties, PickQueryMetaResult, IsQuery, PickQueryTableMetaResultInputType, PickQueryResultUniqueColumns, QueryInternalBase, PickQueryReturnType, PickType, ColumnShapeOutput, OperatorsNullable, PickQueryMetaReturnType, UniqueColumn, TimestampHelpers, Codes, ColumnDataCheckBase } from 'orchid-core';
+import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, SingleSqlItem, Sql, RecordUnknown, RecordKeyTrue, EmptyObject, QueryBaseCommon, QueryColumns, QueryMetaBase, QueryReturnType, QueryThen, Expression, MaybeArray, TemplateLiteralArgs, QueryColumn, MaybePromise, FnUnknownToUnknown, RecordString, ColumnsShapeBase, ColumnsParsers, PickQueryTable, BatchParsers, HookSelect, QueryLogObject, QueryLogger, QueryDataTransform, ExpressionChain, PickQueryShape, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, SelectableBase, PickQueryMetaShape, PickQueryTableMetaResultShape, PickQueryMetaResultWindows, PickOutputTypeAndOperators, PickQueryResult, ExpressionData, ValExpression, PickOutputType, SQLQueryArgs, ColumnSchemaConfig, DateColumnData, ColumnToCodeCtx, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, StaticSQLArgs, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ParseColumn, EncodeColumn, QueryColumnsInit, QueryLogOptions, DefaultSelectColumns, DbBase, QueryCatch, TransactionState, ColumnTypeBase, PickQueryUniqueProperties, PickQueryMetaResult, IsQuery, PickQueryTableMetaResultInputType, getValueKey, PickQueryResultUniqueColumns, QueryInternalBase, PickQueryReturnType, PickType, ColumnShapeOutput, OperatorsNullable, PickQueryMetaReturnType, UniqueColumn, TimestampHelpers, Codes, ColumnDataCheckBase } from 'orchid-core';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
 
@@ -384,6 +384,11 @@ interface CommonQueryData {
     outerJoinOverrides?: JoinOverrides;
     schema?: string;
     select?: SelectItem[];
+    /**
+     * 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.
+     */
+    getColumn?: QueryColumn;
     expr?: Expression;
     as?: string;
     from?: MaybeArray<QueryDataFromItem>;
@@ -454,7 +459,6 @@ interface SelectQueryData extends CommonQueryData {
         tableNames?: string[] | Expression;
         mode?: 'NO WAIT' | 'SKIP LOCKED';
     };
-    [getValueKey]?: QueryColumn;
 }
 type CreateKind = 'object' | 'raw' | 'from';
 interface InsertQueryData extends CommonQueryData {

package/dist/index.js

@@ -3278,18 +3278,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)
@@ -3321,6 +3310,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;
@@ -3328,6 +3322,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) {
@@ -4002,19 +4009,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") {
@@ -4023,6 +4030,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) {
@@ -4457,7 +4474,7 @@ const getShapeFromSelect = (q, isSubQuery) => {
           } else if (it) {
             const { returnType } = it.q;
             if (returnType === "value" || returnType === "valueOrThrow") {
-              const type = it.q[orchidCore.getValueKey];
+              const type = it.q.getColumn;
               if (type)
                 result[key] = type;
             } else {
@@ -4573,7 +4590,7 @@ const _get = (query, returnType, arg) => {
         }
       }
     }
-    q[orchidCore.getValueKey] = type;
+    q.getColumn = type;
     const selected = setParserForSelectedString(
       query,
       arg,
@@ -4589,7 +4606,7 @@ const _get = (query, returnType, arg) => {
     ] : void 0;
   } else {
     type = arg.result.value;
-    q[orchidCore.getValueKey] = type;
+    q.getColumn = type;
     addParserForRawExpression(query, orchidCore.getValueKey, arg);
     q.select = [q.expr = arg];
   }
@@ -6434,7 +6451,7 @@ class FnExpression extends orchidCore.Expression {
     Object.assign(query, value.operators);
     query.q.returnType = "valueOrThrow";
     query.q.returnsOne = true;
-    query.q[orchidCore.getValueKey] = value;
+    query.q.getColumn = value;
     query.q.select = [this];
     const { parseFn } = value;
     if (parseFn) {
@@ -9153,7 +9170,6 @@ class MergeQueryMethods {
           break;
       }
     }
-    a[orchidCore.getValueKey] = b[orchidCore.getValueKey];
     if (b.returnType)
       a.returnType = b.returnType;
     return query;
@@ -12695,6 +12711,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;
         });
@@ -12703,6 +12720,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;
       });
     });