pqb 0.36.1 → 0.36.2

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-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, QueryDataTransform, ExpressionChain, getValueKey, PickQueryShape, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, SelectableBase, PickQueryMetaShape, PickQueryTableMetaResultShape, PickQueryMetaResultWindows, PickOutputTypeAndOperators, PickQueryResult, ExpressionData, ValExpression, PickOutputType, SQLQueryArgs, ColumnSchemaConfig, DateColumnData, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, StaticSQLArgs, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ParseColumn, EncodeColumn, QueryColumnsInit, DefaultSelectColumns, DbBase, QueryCatch, TransactionState, ColumnTypeBase, PickQueryUniqueProperties, PickQueryMetaResult, IsQuery, PickQueryTableMetaResultInputType, SingleSql, MergeObjects, PickQueryResultUniqueColumns, QueryInternalBase, PickQueryReturnType, PickType, ColumnShapeOutput, OperatorsNullable, PickQueryMetaReturnType, UniqueColumn, TimestampHelpers, Codes, ColumnDataCheckBase } from 'orchid-core';
 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, 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, MergeObjects, 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';
 
@@ -5005,28 +5005,6 @@ declare abstract class JsonMethods {
     json<T>(this: T, coalesce?: boolean): SetQueryReturnsColumnOptional<T, QueryColumn<string>>;
 }
 
-interface QueryLogObject {
-    colors: boolean;
-    beforeQuery(sql: SingleSql): unknown;
-    afterQuery(sql: SingleSql, logData: unknown): void;
-    onError(error: Error, sql: SingleSql, logData: unknown): void;
-}
-interface QueryLogger {
-    log(message: string): void;
-    warn(message: string): void;
-    error(message: string): void;
-}
-interface QueryLogOptions {
-    log?: boolean | Partial<QueryLogObject>;
-    logger?: QueryLogger;
-}
-declare const logColors: {
-    boldCyanBright: (message: string) => string;
-    boldBlue: (message: string) => string;
-    boldYellow: (message: string) => string;
-    boldMagenta: (message: string) => string;
-    boldRed: (message: string) => string;
-};
 declare const logParamToLogObject: (logger: QueryLogger, log: QueryLogOptions['log']) => QueryLogObject | undefined;
 declare class QueryLog {
     log<T>(this: T, log?: boolean): T;
@@ -5901,9 +5879,10 @@ declare const commitSql: SingleSqlItem;
 declare const rollbackSql: SingleSqlItem;
 type IsolationLevel = 'SERIALIZABLE' | 'REPEATABLE READ' | 'READ COMMITTED' | 'READ UNCOMMITTED';
 interface TransactionOptions {
-    level: IsolationLevel;
+    level?: IsolationLevel;
     readOnly?: boolean;
     deferrable?: boolean;
+    log?: boolean;
 }
 declare class Transaction {
     transaction<T extends PickQueryQAndInternal, Result>(this: T, cb: () => Promise<Result>): Promise<Result>;
@@ -7997,4 +7976,4 @@ type CopyResult<T extends PickQueryMeta> = SetQueryKind<T, 'copy'>;
  */
 declare function copyTableData<T extends PickQueryMetaShape>(query: T, arg: CopyArg<T>): CopyResult<T>;
 
-export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AfterHook, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfoQueryData, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumn, ComputedColumns, ComputedColumnsFromOptions, ComputedMethods, ComputedOptionsFactory, CopyOptions, CopyQueryData, Create, CreateBelongsToData, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbDomainArg, DbDomainArgRecord, DbExtension, DbOptions, DbResult, DbSharedOptions, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultSchemaConfig, Delete, DeleteArgs, DeleteMethodsNames, DeleteQueryData, DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, FromArg, FromMethods, FromQuerySelf, FromResult, GetArg, GetColumnInfo, GetQueryResult, GetResult, GetResultOptional, GetStringArg, GroupArgs, HandleResult, Having, HavingItem, HookAction, HookSelectArg, IdentityColumn, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgToQuery, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinItemArgs, JoinLateralItem, JoinLateralResult, JoinOverrides, JoinQueryBuilder, JoinQueryMethod, JoinResult, JoinedParsers, JoinedShapes, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumnData, OnConflictMerge, OnConflictQueryBuilder, OnConflictSet, OnConflictTarget, OnMethods, Operator, Operators, OperatorsAny, OperatorsArray, OperatorsBoolean, OperatorsDate, OperatorsJson, OperatorsNumber, OperatorsText, OperatorsTime, OrCreateArg, OrExpression, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgSelf, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PickColumnData, PickQueryBaseQuery, PickQueryColumnTypes, PickQueryDataShapeAndJoinedShapes, PickQueryInternal, PickQueryMetaRelations, PickQueryMetaResultRelations, PickQueryMetaResultRelationsWindows, PickQueryMetaResultRelationsWindowsColumnTypes, PickQueryMetaResultRelationsWithDataReturnType, PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryMetaResultReturnTypeWithDataWindows, PickQueryMetaResultReturnTypeWithDataWindowsTable, PickQueryMetaShapeRelationsWithData, PickQueryMetaTable, PickQueryMetaTableShape, PickQueryMetaTableShapeReturnTypeWithData, PickQueryMetaWithData, PickQueryMetaWithDataColumnTypes, PickQueryQ, PickQueryQAndBaseQuery, PickQueryQAndInternal, PickQueryRelations, PickQueryRelationsWithData, PickQueryResultColumnTypes, PickQueryShapeResultSinglePrimaryKey, PickQueryShapeSinglePrimaryKey, PickQuerySinglePrimaryKey, PickQueryWindows, PickQueryWithData, PickQueryWithDataColumnTypes, PointColumn, PolygonColumn, Query, QueryAfterHook, QueryArraysResult, QueryBase, QueryBaseThen, QueryBatchResult, QueryBeforeHook, QueryComputedArg, QueryData, QueryDataFromItem, QueryDataJoinTo, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryGetSelf, QueryHelperResult, QueryHooks, QueryInternal, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMetaHasSelect, QueryMetaHasWhere, QueryMethods, QueryOrExpression, QueryOrExpressionBooleanOrNullResult, QueryResult, QueryScopeData, QueryScopes, QuerySourceItem, QueryUpsertOrCreate, QueryWithTable, RawSQL, RealColumn, RecordOfColumnsShapeBase, RefExpression, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQuery, RelationQueryBase, RelationsBase, RuntimeComputedQueryColumn, SearchArg, SearchMethods, SearchWeight, SearchWeightRecord, Select, SelectArg, SelectArgs, SelectAs, SelectAsValue, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SelectableOrExpressions, SerialColumn, SerialColumnData, SetQueryKind, SetQueryKindResult, SetQueryReturnsAll, SetQueryReturnsAllKind, SetQueryReturnsAllKindResult, SetQueryReturnsColumnInfo, SetQueryReturnsColumnKind, SetQueryReturnsColumnKindResult, SetQueryReturnsColumnOptional, SetQueryReturnsColumnOrThrow, SetQueryReturnsOne, SetQueryReturnsOneKind, SetQueryReturnsOneKindResult, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsPluckColumnKind, SetQueryReturnsPluckColumnKindResult, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValueOptional, SetQueryReturnsValueOrThrow, SetQueryReturnsVoid, SetQueryReturnsVoidKind, SetQueryTableAlias, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SimpleJoinItem, SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, SortDir, SqlFn, SqlMethod, StringColumn$1 as StringColumn, TableData, TableDataFn, TableDataInput, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableDataMethods, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, ToSQLCtx, ToSQLOptions, ToSQLQuery, Transaction, TransactionAdapter, TransactionOptions, TransformMethods, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArgs, UnionItem, UnionKind, UnionSet, UniqueConstraints, UniqueQueryTypeOrExpression, UniqueTableDataItem, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateCtxCollect, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdateSelf, UpdatedAtDataInjector, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, WithArgsOptions, WithConfigs, WithDataItem, WithDataItems, WithItem, WithMethods, WithOptions, WithQueryBuilder, WithRecursiveOptions, WithResult, WithSqlResult, WrapQueryArg, 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, _queryWhereNotSql, _queryWhereSql, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, 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, logColors, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
+export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AfterHook, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfoQueryData, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumn, ComputedColumns, ComputedColumnsFromOptions, ComputedMethods, ComputedOptionsFactory, CopyOptions, CopyQueryData, Create, CreateBelongsToData, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbDomainArg, DbDomainArgRecord, DbExtension, DbOptions, DbResult, DbSharedOptions, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultSchemaConfig, Delete, DeleteArgs, DeleteMethodsNames, DeleteQueryData, DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, FromArg, FromMethods, FromQuerySelf, FromResult, GetArg, GetColumnInfo, GetQueryResult, GetResult, GetResultOptional, GetStringArg, GroupArgs, HandleResult, Having, HavingItem, HookAction, HookSelectArg, IdentityColumn, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgToQuery, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinItemArgs, JoinLateralItem, JoinLateralResult, JoinOverrides, JoinQueryBuilder, JoinQueryMethod, JoinResult, JoinedParsers, JoinedShapes, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumnData, OnConflictMerge, OnConflictQueryBuilder, OnConflictSet, OnConflictTarget, OnMethods, Operator, Operators, OperatorsAny, OperatorsArray, OperatorsBoolean, OperatorsDate, OperatorsJson, OperatorsNumber, OperatorsText, OperatorsTime, OrCreateArg, OrExpression, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgSelf, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PickColumnData, PickQueryBaseQuery, PickQueryColumnTypes, PickQueryDataShapeAndJoinedShapes, PickQueryInternal, PickQueryMetaRelations, PickQueryMetaResultRelations, PickQueryMetaResultRelationsWindows, PickQueryMetaResultRelationsWindowsColumnTypes, PickQueryMetaResultRelationsWithDataReturnType, PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryMetaResultReturnTypeWithDataWindows, PickQueryMetaResultReturnTypeWithDataWindowsTable, PickQueryMetaShapeRelationsWithData, PickQueryMetaTable, PickQueryMetaTableShape, PickQueryMetaTableShapeReturnTypeWithData, PickQueryMetaWithData, PickQueryMetaWithDataColumnTypes, PickQueryQ, PickQueryQAndBaseQuery, PickQueryQAndInternal, PickQueryRelations, PickQueryRelationsWithData, PickQueryResultColumnTypes, PickQueryShapeResultSinglePrimaryKey, PickQueryShapeSinglePrimaryKey, PickQuerySinglePrimaryKey, PickQueryWindows, PickQueryWithData, PickQueryWithDataColumnTypes, PointColumn, PolygonColumn, Query, QueryAfterHook, QueryArraysResult, QueryBase, QueryBaseThen, QueryBatchResult, QueryBeforeHook, QueryComputedArg, QueryData, QueryDataFromItem, QueryDataJoinTo, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryGetSelf, QueryHelperResult, QueryHooks, QueryInternal, QueryLog, QueryMetaHasSelect, QueryMetaHasWhere, QueryMethods, QueryOrExpression, QueryOrExpressionBooleanOrNullResult, QueryResult, QueryScopeData, QueryScopes, QuerySourceItem, QueryUpsertOrCreate, QueryWithTable, RawSQL, RealColumn, RecordOfColumnsShapeBase, RefExpression, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQuery, RelationQueryBase, RelationsBase, RuntimeComputedQueryColumn, SearchArg, SearchMethods, SearchWeight, SearchWeightRecord, Select, SelectArg, SelectArgs, SelectAs, SelectAsValue, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SelectableOrExpressions, SerialColumn, SerialColumnData, SetQueryKind, SetQueryKindResult, SetQueryReturnsAll, SetQueryReturnsAllKind, SetQueryReturnsAllKindResult, SetQueryReturnsColumnInfo, SetQueryReturnsColumnKind, SetQueryReturnsColumnKindResult, SetQueryReturnsColumnOptional, SetQueryReturnsColumnOrThrow, SetQueryReturnsOne, SetQueryReturnsOneKind, SetQueryReturnsOneKindResult, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsPluckColumnKind, SetQueryReturnsPluckColumnKindResult, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValueOptional, SetQueryReturnsValueOrThrow, SetQueryReturnsVoid, SetQueryReturnsVoidKind, SetQueryTableAlias, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SimpleJoinItem, SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, SortDir, SqlFn, SqlMethod, StringColumn$1 as StringColumn, TableData, TableDataFn, TableDataInput, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableDataMethods, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, ToSQLCtx, ToSQLOptions, ToSQLQuery, Transaction, TransactionAdapter, TransactionOptions, TransformMethods, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArgs, UnionItem, UnionKind, UnionSet, UniqueConstraints, UniqueQueryTypeOrExpression, UniqueTableDataItem, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateCtxCollect, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdateSelf, UpdatedAtDataInjector, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, WithArgsOptions, WithConfigs, WithDataItem, WithDataItems, WithItem, WithMethods, WithOptions, WithQueryBuilder, WithRecursiveOptions, WithResult, WithSqlResult, WrapQueryArg, 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, _queryWhereNotSql, _queryWhereSql, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, 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, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };

package/dist/index.js

@@ -3081,6 +3081,107 @@ const defaultSchemaConfig = {
   timestamp: (precision) => new TimestampTZColumn(defaultSchemaConfig, precision)
 };
 
+const singleQuoteRegex = /'/g;
+const doubleQuoteRegex = /"/g;
+const quoteValue = (value) => {
+  const type = typeof value;
+  if (type === "number")
+    return String(value);
+  else if (type === "string")
+    return `"${value.replace(doubleQuoteRegex, '\\"').replace(singleQuoteRegex, "''")}"`;
+  else if (type === "boolean")
+    return value ? "true" : "false";
+  else if (value instanceof Date)
+    return `"${value.toISOString()}"`;
+  else if (Array.isArray(value))
+    return quoteArray(value);
+  else if (value === null || value === void 0)
+    return "NULL";
+  else
+    return `"${JSON.stringify(value).replace(doubleQuoteRegex, '\\"').replace(singleQuoteRegex, "''")}"`;
+};
+const quoteArray = (array) => `'{${array.map(quoteValue).join(",")}}'`;
+const quote = (value) => {
+  const type = typeof value;
+  if (type === "number")
+    return `${value}`;
+  else if (type === "string")
+    return quoteString(value);
+  else if (type === "boolean")
+    return value ? "true" : "false";
+  else if (value instanceof Date)
+    return `'${value.toISOString()}'`;
+  else if (Array.isArray(value))
+    return quoteArray(value);
+  else if (value === null || value === void 0)
+    return "NULL";
+  else
+    return `'${JSON.stringify(value).replace(singleQuoteRegex, "''")}'`;
+};
+const quoteString = (value) => {
+  return `'${value.replace(singleQuoteRegex, "''")}'`;
+};
+
+const makeMessage = (colors, timeColor, time, sqlColor, sql, valuesColor, values) => {
+  const elapsed = process.hrtime(time);
+  const formattedTime = `(${elapsed[0] ? `${elapsed[0]}s ` : ""}${(elapsed[1] / 1e6).toFixed(1)}ms)`;
+  const result = `${colors ? timeColor(formattedTime) : formattedTime} ${colors ? sqlColor(sql) : sql}`;
+  if (!(values == null ? void 0 : values.length)) {
+    return result;
+  }
+  const formattedValues = `[${values.map(quote).join(", ")}]`;
+  return `${result} ${colors ? valuesColor(formattedValues) : formattedValues}`;
+};
+const logParamToLogObject = (logger, log) => {
+  if (!log)
+    return;
+  const logObject = Object.assign(
+    {
+      colors: true,
+      beforeQuery() {
+        return process.hrtime();
+      },
+      afterQuery(sql, time) {
+        logger.log(
+          makeMessage(
+            colors,
+            orchidCore.logColors.boldCyanBright,
+            time,
+            orchidCore.logColors.boldBlue,
+            sql.text,
+            orchidCore.logColors.boldYellow,
+            sql.values
+          )
+        );
+      },
+      onError(error, sql, time) {
+        const message = `Error: ${error.message}`;
+        logger.error(
+          `${makeMessage(
+            colors,
+            orchidCore.logColors.boldMagenta,
+            time,
+            orchidCore.logColors.boldRed,
+            sql.text,
+            orchidCore.logColors.boldYellow,
+            sql.values
+          )} ${colors ? orchidCore.logColors.boldRed(message) : message}`
+        );
+      }
+    },
+    log === true ? {} : log
+  );
+  const colors = logObject.colors;
+  return logObject;
+};
+class QueryLog {
+  log(log = true) {
+    const q = this.clone();
+    q.q.log = logParamToLogObject(q.q.logger, log);
+    return q;
+  }
+}
+
 const commitSql$1 = {
   text: "COMMIT"
 };
@@ -3089,6 +3190,7 @@ const rollbackSql$1 = {
 };
 class Transaction {
   async transaction(cbOrOptions, cb) {
+    var _a;
     let options;
     let fn;
     if (typeof cbOrOptions === "function") {
@@ -3101,7 +3203,7 @@ class Transaction {
     const sql = {
       values: orchidCore.emptyArray
     };
-    const log = this.q.log;
+    const log = options.log !== void 0 ? (_a = this.q.log) != null ? _a : logParamToLogObject(this.q.logger, options.log) : this.q.log;
     let logData;
     let trx = this.internal.transactionStorage.getStore();
     const transactionId = trx ? trx.transactionId + 1 : 0;
@@ -3118,6 +3220,9 @@ class Transaction {
         adapter,
         transactionId
       };
+      if (options.log !== void 0) {
+        trx.log = log;
+      }
       return this.internal.transactionStorage.run(trx, fn);
     };
     if (!trx) {
@@ -3496,10 +3601,11 @@ const callAfterHook = function(cb) {
 };
 const beginSql = { text: "BEGIN" };
 const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks, resolve, reject) => {
-  var _a, _b;
+  var _a, _b, _c;
   const { q: query } = q;
   let sql;
   let logData;
+  const log = (_a = trx == null ? void 0 : trx.log) != null ? _a : query.log;
   const localError = queryError;
   try {
     if (beforeHooks || query.before) {
@@ -3520,31 +3626,31 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
       if (query.autoPreparedStatements) {
         sql.name = queriesNames[sql.text] || (queriesNames[sql.text] = (nameI++).toString(36));
       }
-      if (query.log) {
-        logData = query.log.beforeQuery(sql);
+      if (log) {
+        logData = log.beforeQuery(sql);
       }
       queryResult = await adapter[queryMethodByReturnType[tempReturnType]](sql);
       if (query.patchResult) {
         await query.patchResult(q, queryResult);
       }
-      if (query.log) {
-        query.log.afterQuery(sql, logData);
+      if (log) {
+        log.afterQuery(sql, logData);
         sql = void 0;
       }
       result = query.handleResult(q, tempReturnType, queryResult);
     } else {
       const queryMethod = queryMethodByReturnType[tempReturnType];
       if (!trx) {
-        if (query.log)
-          logData = query.log.beforeQuery(beginSql);
+        if (log)
+          logData = log.beforeQuery(beginSql);
         await adapter.arrays(beginSql);
-        if (query.log)
-          query.log.afterQuery(beginSql, logData);
+        if (log)
+          log.afterQuery(beginSql, logData);
       }
       for (const item of sql.batch) {
         sql = item;
-        if (query.log) {
-          logData = query.log.beforeQuery(sql);
+        if (log) {
+          logData = log.beforeQuery(sql);
         }
         const result2 = await adapter[queryMethod](sql);
         if (queryResult) {
@@ -3553,17 +3659,17 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
         } else {
           queryResult = result2;
         }
-        if (query.log) {
-          query.log.afterQuery(sql, logData);
+        if (log) {
+          log.afterQuery(sql, logData);
           sql = void 0;
         }
       }
       if (!trx) {
-        if (query.log)
-          logData = query.log.beforeQuery(commitSql$1);
+        if (log)
+          logData = log.beforeQuery(commitSql$1);
         await adapter.arrays(commitSql$1);
-        if (query.log)
-          query.log.afterQuery(commitSql$1, logData);
+        if (log)
+          log.afterQuery(commitSql$1, logData);
       }
       if (query.patchResult) {
         await query.patchResult(q, queryResult);
@@ -3580,7 +3686,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
         const as = hookSelect.get(column).as;
         if (as)
           (renames != null ? renames : renames = {})[column] = as;
-        (_a = tempColumns != null ? tempColumns : tempColumns = /* @__PURE__ */ new Set()) == null ? void 0 : _a.add(as || column);
+        (_b = tempColumns != null ? tempColumns : tempColumns = /* @__PURE__ */ new Set()) == null ? void 0 : _b.add(as || column);
       }
       if (renames) {
         for (const record of result) {
@@ -3610,7 +3716,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
           );
         }
         if (afterCommitHooks && trx) {
-          ((_b = trx.afterCommit) != null ? _b : trx.afterCommit = []).push(
+          ((_c = trx.afterCommit) != null ? _c : trx.afterCommit = []).push(
             result,
             q,
             afterCommitHooks
@@ -3658,8 +3764,8 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
         error.cause = localError;
       }
     }
-    if (query.log && sql) {
-      query.log.onError(error, sql, logData);
+    if (log && sql) {
+      log.onError(error, sql, logData);
     }
     return reject == null ? void 0 : reject(error);
   }
@@ -5519,47 +5625,6 @@ const pushColumnInfoSql = (ctx, table, query) => {
   }
 };
 
-const singleQuoteRegex = /'/g;
-const doubleQuoteRegex = /"/g;
-const quoteValue = (value) => {
-  const type = typeof value;
-  if (type === "number")
-    return String(value);
-  else if (type === "string")
-    return `"${value.replace(doubleQuoteRegex, '\\"').replace(singleQuoteRegex, "''")}"`;
-  else if (type === "boolean")
-    return value ? "true" : "false";
-  else if (value instanceof Date)
-    return `"${value.toISOString()}"`;
-  else if (Array.isArray(value))
-    return quoteArray(value);
-  else if (value === null || value === void 0)
-    return "NULL";
-  else
-    return `"${JSON.stringify(value).replace(doubleQuoteRegex, '\\"').replace(singleQuoteRegex, "''")}"`;
-};
-const quoteArray = (array) => `'{${array.map(quoteValue).join(",")}}'`;
-const quote = (value) => {
-  const type = typeof value;
-  if (type === "number")
-    return `${value}`;
-  else if (type === "string")
-    return quoteString(value);
-  else if (type === "boolean")
-    return value ? "true" : "false";
-  else if (value instanceof Date)
-    return `'${value.toISOString()}'`;
-  else if (Array.isArray(value))
-    return quoteArray(value);
-  else if (value === null || value === void 0)
-    return "NULL";
-  else
-    return `'${JSON.stringify(value).replace(singleQuoteRegex, "''")}'`;
-};
-const quoteString = (value) => {
-  return `'${value.replace(singleQuoteRegex, "''")}'`;
-};
-
 const pushCopySql = (ctx, table, query, quotedAs) => {
   const { sql } = ctx;
   const { copy } = query;
@@ -8981,73 +9046,6 @@ class JsonMethods {
   }
 }
 
-const logColors = {
-  boldCyanBright: (message) => `\x1B[1m\x1B[96m${message}\x1B[39m\x1B[22m`,
-  boldBlue: (message) => `\x1B[1m\x1B[34m${message}\x1B[39m\x1B[22m`,
-  boldYellow: (message) => `\x1B[1m\x1B[33m${message}\x1B[39m\x1B[22m`,
-  boldMagenta: (message) => `\x1B[1m\x1B[33m${message}\x1B[39m\x1B[22m`,
-  boldRed: (message) => `\x1B[1m\x1B[31m${message}\x1B[39m\x1B[22m`
-};
-const makeMessage = (colors, timeColor, time, sqlColor, sql, valuesColor, values) => {
-  const elapsed = process.hrtime(time);
-  const formattedTime = `(${elapsed[0] ? `${elapsed[0]}s ` : ""}${(elapsed[1] / 1e6).toFixed(1)}ms)`;
-  const result = `${colors ? timeColor(formattedTime) : formattedTime} ${colors ? sqlColor(sql) : sql}`;
-  if (!(values == null ? void 0 : values.length)) {
-    return result;
-  }
-  const formattedValues = `[${values.map(quote).join(", ")}]`;
-  return `${result} ${colors ? valuesColor(formattedValues) : formattedValues}`;
-};
-const logParamToLogObject = (logger, log) => {
-  if (!log)
-    return;
-  const logObject = Object.assign(
-    {
-      colors: true,
-      beforeQuery() {
-        return process.hrtime();
-      },
-      afterQuery(sql, time) {
-        logger.log(
-          makeMessage(
-            colors,
-            logColors.boldCyanBright,
-            time,
-            logColors.boldBlue,
-            sql.text,
-            logColors.boldYellow,
-            sql.values
-          )
-        );
-      },
-      onError(error, sql, time) {
-        const message = `Error: ${error.message}`;
-        logger.error(
-          `${makeMessage(
-            colors,
-            logColors.boldMagenta,
-            time,
-            logColors.boldRed,
-            sql.text,
-            logColors.boldYellow,
-            sql.values
-          )} ${colors ? logColors.boldRed(message) : message}`
-        );
-      }
-    },
-    log === true ? {} : log
-  );
-  const colors = logObject.colors;
-  return logObject;
-};
-class QueryLog {
-  log(log = true) {
-    const q = this.clone();
-    q.q.log = logParamToLogObject(q.q.logger, log);
-    return q;
-  }
-}
-
 var __defProp$5 = Object.defineProperty;
 var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
 var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
@@ -12449,6 +12447,7 @@ class Db {
   }
 }
 const performQuery = async (q, args, method) => {
+  var _a;
   const trx = q.internal.transactionStorage.getStore();
   let sql;
   if (orchidCore.isRawSQL(args[0])) {
@@ -12468,7 +12467,7 @@ const performQuery = async (q, args, method) => {
       values
     };
   }
-  const { log } = q.q;
+  const log = (_a = trx == null ? void 0 : trx.log) != null ? _a : q.q.log;
   let logData;
   if (log)
     logData = log.beforeQuery(sql);
@@ -12889,7 +12888,6 @@ exports.isDefaultTimeStamp = isDefaultTimeStamp;
 exports.isQueryReturnsAll = isQueryReturnsAll;
 exports.isSelectingCount = isSelectingCount;
 exports.joinSubQuery = joinSubQuery;
-exports.logColors = logColors;
 exports.logParamToLogObject = logParamToLogObject;
 exports.makeColumnTypes = makeColumnTypes;
 exports.makeColumnsByType = makeColumnsByType;