pqb 0.38.4 → 0.38.6

package/dist/index.mjs

@@ -1095,9 +1095,9 @@ class NumberAsStringBaseColumn extends ColumnType {
     this.operators = Operators.number;
   }
 }
-class DecimalColumn extends ColumnType {
+class DecimalColumn extends NumberAsStringBaseColumn {
   constructor(schema, numericPrecision, numericScale) {
-    super(schema, schema.stringSchema());
+    super(schema);
     this.operators = Operators.number;
     this.dataType = "numeric";
     this.data.numericPrecision = numericPrecision;
@@ -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) {
@@ -4562,25 +4569,29 @@ class SelectItemExpression extends Expression {
   }
 }
 
-const _get = (query, returnType, arg) => {
+const _getSelectableColumn = (q, arg) => {
   var _a, _b;
+  let type = q.q.shape[arg];
+  if (!type) {
+    const index = arg.indexOf(".");
+    if (index !== -1) {
+      const table = arg.slice(0, index);
+      const column = arg.slice(index + 1);
+      if (table === (q.q.as || q.table)) {
+        type = q.shape[column];
+      } else {
+        type = (_b = (_a = q.q.joinedShapes) == null ? void 0 : _a[table]) == null ? void 0 : _b[column];
+      }
+    }
+  }
+  return type;
+};
+const _get = (query, returnType, arg) => {
   const q = query.q;
   q.returnType = returnType;
   let type;
   if (typeof arg === "string") {
-    type = q.shape[arg];
-    if (!type) {
-      const index = arg.indexOf(".");
-      if (index !== -1) {
-        const table = arg.slice(0, index);
-        const column = arg.slice(index + 1);
-        if (table === (q.as || query.table)) {
-          type = q.shape[column];
-        } else {
-          type = (_b = (_a = q.joinedShapes) == null ? void 0 : _a[table]) == null ? void 0 : _b[column];
-        }
-      }
-    }
+    type = _getSelectableColumn(query, arg);
     q.getColumn = type;
     const selected = setParserForSelectedString(
       query,
@@ -6543,6 +6554,13 @@ const nullableInt = new IntegerColumn(defaultSchemaConfig);
 nullableInt.parseItem = nullableInt.parseFn = (input) => input === null ? null : parseInt(input);
 const nullableFloat = new RealColumn(defaultSchemaConfig);
 nullableFloat.parseItem = nullableFloat.parseFn = (input) => input === null ? null : parseFloat(input);
+const stringAsNumber = new NumberAsStringBaseColumn(
+  defaultSchemaConfig
+);
+const numericResultColumn = (q, arg) => {
+  const type = typeof arg === "string" ? _getSelectableColumn(q, arg) : arg.result.value;
+  return type instanceof NumberBaseColumn ? nullableFloat : stringAsNumber;
+};
 class AggregateMethods {
   /**
    * Use `exists()` to check if there is at least one record-matching condition.
@@ -6613,7 +6631,7 @@ class AggregateMethods {
   min(arg, options) {
     return makeFnExpression(
       this,
-      nullableFloat,
+      numericResultColumn(this, arg),
       "min",
       [arg],
       options
@@ -6643,7 +6661,7 @@ class AggregateMethods {
   max(arg, options) {
     return makeFnExpression(
       this,
-      nullableFloat,
+      numericResultColumn(this, arg),
       "max",
       [arg],
       options
@@ -6672,7 +6690,7 @@ class AggregateMethods {
   sum(arg, options) {
     return makeFnExpression(
       this,
-      nullableFloat,
+      numericResultColumn(this, arg),
       "sum",
       [arg],
       options
@@ -6698,7 +6716,7 @@ class AggregateMethods {
   avg(arg, options) {
     return makeFnExpression(
       this,
-      nullableFloat,
+      numericResultColumn(this, arg),
       "avg",
       [arg],
       options
@@ -6727,7 +6745,7 @@ class AggregateMethods {
   bitAnd(arg, options) {
     return makeFnExpression(
       this,
-      nullableFloat,
+      numericResultColumn(this, arg),
       "bit_and",
       [arg],
       options
@@ -6753,7 +6771,7 @@ class AggregateMethods {
   bitOr(arg, options) {
     return makeFnExpression(
       this,
-      nullableFloat,
+      numericResultColumn(this, arg),
       "bit_or",
       [arg],
       options
@@ -12702,6 +12720,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;
         });
@@ -12710,6 +12729,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;
       });
     });
@@ -12787,5 +12810,5 @@ function copyTableData(query, arg) {
   return q;
 }
 
-export { Adapter, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, QueryBase, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql$1 as rollbackSql, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
+export { Adapter, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, QueryBase, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql$1 as rollbackSql, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
 //# sourceMappingURL=index.mjs.map