pqb 0.66.3 → 0.66.5

package/dist/index.d.ts

@@ -329,7 +329,7 @@ declare class QueryWithSchema {
   withSchema<T>(this: T, schema: QuerySchema | undefined): T;
 }
 interface AsyncState extends SqlSessionState {
-  transactionAdapter?: Adapter;
+  transactionAdapter?: TransactionAdapter;
   transactionId?: number;
   afterCommit?: TransactionAfterCommitHook[];
   log?: QueryLogObject;
@@ -457,10 +457,10 @@ interface Adapter {
   errorClass: new (...args: any[]) => Error;
   searchPath?: string;
   driverAdapter: DriverAdapter;
-  isInTransaction(): boolean;
+  isInTransaction(this: Adapter): this is TransactionAdapter;
   assignError(to: QueryError, from: Error): void;
-  query<T extends QueryResultRow = QueryResultRow>(text: string, values?: unknown[], startingSavepoint?: string, releasingSavepoint?: string, sqlSessionState?: SqlSessionState): Promise<QueryResult<T>>;
-  arrays<R extends any[] = any[]>(text: string, values?: unknown[], startingSavepoint?: string, releasingSavepoint?: string, sqlSessionState?: SqlSessionState): Promise<QueryArraysResult<R>>;
+  query<T extends QueryResultRow = QueryResultRow>(text: string, values?: unknown[], sqlSessionState?: SqlSessionState): Promise<QueryResult<T>>;
+  arrays<R extends any[] = any[]>(text: string, values?: unknown[], sqlSessionState?: SqlSessionState): Promise<QueryArraysResult<R>>;
   /**
    * Run a transaction
    *
@@ -479,7 +479,15 @@ interface Adapter {
  * Adapter interface for transaction contexts.
  */
 interface TransactionAdapter extends Adapter {
-  isInTransaction(): true;
+  isInTransaction(this: Adapter): this is TransactionAdapter;
+  savepoint<T>(name: string, cb: () => Promise<T>): Promise<T>;
+  /**
+   * This is a workaround for postgres-js savepoint limitations.
+   * Postgres-js dictates this:
+   * - must use its `savepoint` method over manual `SAVEPOINT` because when doing it manually there is no way to prevent transaction from being rolled back when a query in a savepoint fails.
+   * - must use its `sql` client from inside the `savepoint` method for the lifetime of the savepoint because of the reason above.
+   */
+  hackySavepoint<T extends QueryResultRow = QueryResultRow>(state: HackySavepointState, text: string, values?: unknown[], arraysMode?: boolean): Promise<QueryResult<T>>;
 }
 type Pool = any;
 type Client = any;
@@ -493,8 +501,10 @@ interface DriverAdapter {
   manualPool: boolean;
   borrow(pool: Pool): Client;
   release(client: Client): void;
-  queryClient<T extends QueryResultRow = QueryResultRow>(client: Client, text: string, values?: unknown[], startingSavepoint?: string, releasingSavepoint?: string, arraysMode?: boolean): Promise<QueryResult<T>>;
+  queryClient<T extends QueryResultRow = QueryResultRow>(client: Client, text: string, values?: unknown[], arraysMode?: boolean): Promise<QueryResult<T>>;
   begin<DriverClient, Result>(pool: Pool, cb: (client: DriverClient) => Promise<Result>, options?: string): Promise<Result>;
+  savepoint<T>(client: Client, setClient: (client: Client) => void, name: string, cb: () => Promise<T>): Promise<T>;
+  hackySavepoint<T extends QueryResultRow>(client: Client, setClient: (client: Client) => void, state: HackySavepointState, text: string, values?: unknown[], arraysMode?: boolean): Promise<QueryResult<T>>;
   close(pool: Pool): Promise<void>;
 }
 /**
@@ -521,10 +531,10 @@ declare class AdapterClass implements Adapter {
   private readonly config;
   private readonly connectionState;
   constructor(params: AdapterParams);
-  query<T extends QueryResultRow = QueryResultRow>(text: string, values?: unknown[], startingSavepoint?: string, releasingSavepoint?: string, sqlSessionState?: SqlSessionState): Promise<QueryResult<T>>;
-  arrays<R extends any[] = any[]>(text: string, values?: unknown[], startingSavepoint?: string, releasingSavepoint?: string, sqlSessionState?: SqlSessionState): Promise<QueryArraysResult<R>>;
+  query<T extends QueryResultRow = QueryResultRow>(text: string, values?: unknown[], sqlSessionState?: SqlSessionState): Promise<QueryResult<T>>;
+  arrays<R extends any[] = any[]>(text: string, values?: unknown[], sqlSessionState?: SqlSessionState): Promise<QueryArraysResult<R>>;
   clone(params?: AdapterConfigBase): Adapter;
-  isInTransaction(): boolean;
+  isInTransaction(this: Adapter): this is TransactionAdapter;
   getDatabase(): string;
   getUser(): string;
   getSearchPath(): string | undefined;
@@ -534,6 +544,14 @@ declare class AdapterClass implements Adapter {
   close: () => Promise<void>;
   assignError(to: QueryError, from: Error): void;
 }
+interface HackySavepointStateActiveSavepoint {
+  release(): Promise<void>;
+  rollback(err: unknown): Promise<void>;
+}
+interface HackySavepointState {
+  name: string;
+  activeSavepoint?: HackySavepointStateActiveSavepoint;
+}
 /**
  * Shared runtime transaction adapter orchestrator over a driver-specific transaction adapter.
  */
@@ -543,16 +561,18 @@ declare class TransactionAdapterClass implements TransactionAdapter {
   errorClass: new (...args: any[]) => Error;
   driverAdapter: DriverAdapter;
   constructor(adapter: Adapter, client: Client);
-  query<T extends QueryResultRow = QueryResultRow>(text: string, values?: unknown[], startingSavepoint?: string, releasingSavepoint?: string, sqlSessionState?: SqlSessionState): Promise<QueryResult<T>>;
-  arrays<R extends any[] = any[]>(text: string, values?: unknown[], startingSavepoint?: string, releasingSavepoint?: string, sqlSessionState?: SqlSessionState): Promise<QueryArraysResult<R>>;
+  query<T extends QueryResultRow = QueryResultRow>(text: string, values?: unknown[], sqlSessionState?: SqlSessionState): Promise<QueryResult<T>>;
+  arrays<R extends any[] = any[]>(text: string, values?: unknown[], sqlSessionState?: SqlSessionState): Promise<QueryArraysResult<R>>;
   clone(params?: AdapterConfigBase): Adapter;
-  isInTransaction(): true;
+  isInTransaction(this: Adapter): this is TransactionAdapter;
   getDatabase(): string;
   getUser(): string;
   getSearchPath(): string | undefined;
   getHost(): string;
   getSchema(): QuerySchema | undefined;
   transaction<T>(asyncStorage: AsyncLocalStorage<AsyncState> | undefined, options: AdapterTransactionOptions | undefined, cb: (adapter: TransactionAdapter) => Promise<T>): Promise<T>;
+  savepoint<T>(name: string, cb: () => Promise<T>): Promise<T>;
+  hackySavepoint<T extends QueryResultRow = QueryResultRow>(state: HackySavepointState, text: string, values?: unknown[], arraysMode?: boolean): Promise<QueryResult<T>>;
   close(): Promise<void>;
   assignError(to: QueryError, from: Error): void;
 }
@@ -9534,7 +9554,7 @@ interface QueryHelper<T extends PickQueryTableMetaShapeTableAs, Args extends any
   args: Args;
   result: Result;
 }
-type QueryHelperResult<T extends QueryHelper<PickQueryTableMetaShapeTableAs, any[], MergeQueryArg>> = T['result'];
+type QueryHelperResult<T extends IsQueryHelper> = T['result'];
 interface NarrowTypeSelf extends PickQueryResultReturnType {
   returnType: undefined | 'all' | 'one' | 'oneOrThrow' | 'value' | 'valueOrThrow' | 'pluck';
 }
@@ -10462,4 +10482,4 @@ declare const testTransaction: {
    */
   close(arg: Arg$1): Promise<void>;
 };
-export { type Adapter, AdapterClass, type AdapterConfigBase, type AdapterParams, type AfterCommitStandaloneHook, type AfterHook, ArrayColumn, type ArrayColumnValue, type ArrayData, type AsyncState, type BaseNumberData, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, type Code, type Codes, Column, type ColumnFromDbParams, type ColumnSchemaConfig, type ColumnSchemaGetterColumns, type ColumnSchemaGetterTableClass, type ColumnToCodeCtx, type ColumnTypeSchemaArg, type ColumnsByType, type ColumnsShape, type ComputedColumnsFromOptions, type ComputedOptionsConfig, type ComputedOptionsFactory, type CreateCtx, type CreateData, type CreateManyMethodsNames, type CreateMethodsNames, type CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, type DateColumnData, DateTimeBaseClass, DateTimeTzBaseClass, Db, type DbDomainArg, type DbExtension, type DbOptions, type DbResult, type DbRlsOptions, type DbSharedOptions, type DbSqlMethod, type DbStructureDomainsMap, type DbTableOptionScopes, type DbTableOptions, DecimalColumn, type DecimalColumnData, type DefaultColumnTypes, type DefaultPrivileges, type DefaultSchemaConfig, type DeleteMethodsNames, DomainColumn, DoublePrecisionColumn, type DriverAdapter, DynamicRawSQL, type EmptyObject, type EmptyTuple, EnumColumn, Expression, type FromArg, type FromResult, type GeneratorIgnore, type HookSelectValue, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, type IsQuery, type IsolationLevel, JSONColumn, JSONTextColumn, type JoinQueryMethod, type JoinedShapes, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, type MapTableScopesOption, type MaybeArray, type MaybePromise, type MergeQuery, MoneyColumn, type NoPrimaryKeyOption, type NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, type NumberColumnData, Operators, type OperatorsArray, type OperatorsJson, type OperatorsOrdinalText, OrchidOrmInternalError, type Ord, PathColumn, type PickQueryInputType, type PickQueryInternal, type PickQueryQ, type PickQueryRelations, type PickQuerySelectableRelations, type PickQueryShape, PointColumn, PolygonColumn, PostgisGeographyPointColumn, type Query, type QueryAfterHook, type QueryArraysResult, type QueryBeforeActionHook, type QueryBeforeHook, type QueryData, QueryError, type QueryHasWhere, type QueryHelperResult, QueryHookUtils, QueryHooks, type QueryInternal, type QueryLogObject, type QueryLogOptions, type QueryLogger, type QueryManyTake, type QueryManyTakeOptional, type QueryOrExpression, type QueryResult, type QueryResultRow, type QueryReturnType, type QuerySchema, type QueryScopes, RawSql, type RawSqlBase, RealColumn, type RecordKeyTrue, type RecordOptionalString, type RecordString, type RecordStringOrNumber, type RecordUnknown, type RelationConfigBase, type RelationJoinQuery, type RelationsBase, type SearchWeight, type SelectableFromShape, SerialColumn, type SerialColumnData, type ShallowSimplify, type ShapeColumnPrimaryKeys, type ShapeUniqueColumns, type SingleSql, type SingleSqlItem, SmallIntColumn, SmallSerialColumn, type Sql, type SqlFn, type SqlSessionState, type StorageOptions, StringColumn, type StringData, type TableData, type TableDataFn, type TableDataInput, type TableDataItem, type TableDataItemsUniqueColumnTuples, type TableDataItemsUniqueColumns, type TableDataItemsUniqueConstraints, type TableDataMethods, type TableRlsConfig, type TemplateLiteralArgs, TextBaseColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, type Timestamps, TransactionAdapterClass, type TransactionOptions, TsQueryColumn, TsVectorColumn, UUIDColumn, type UniqueConstraints, type UniqueTableDataItem, UnknownColumn, type UpdateData, type UpsertData, type UpsertThis, VarCharColumn, VirtualColumn, type WhereArg, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, copyTableData, createDbWithAdapter, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnInfo, getColumnTypes, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, testTransaction, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry };
+export { type Adapter, AdapterClass, type AdapterConfigBase, type AdapterParams, type AfterCommitStandaloneHook, type AfterHook, ArrayColumn, type ArrayColumnValue, type ArrayData, type AsyncState, type BaseNumberData, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, type Code, type Codes, Column, type ColumnFromDbParams, type ColumnSchemaConfig, type ColumnSchemaGetterColumns, type ColumnSchemaGetterTableClass, type ColumnToCodeCtx, type ColumnTypeSchemaArg, type ColumnsByType, type ColumnsShape, type ComputedColumnsFromOptions, type ComputedOptionsConfig, type ComputedOptionsFactory, type CreateCtx, type CreateData, type CreateManyMethodsNames, type CreateMethodsNames, type CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, type DateColumnData, DateTimeBaseClass, DateTimeTzBaseClass, Db, type DbDomainArg, type DbExtension, type DbOptions, type DbResult, type DbRlsOptions, type DbSharedOptions, type DbSqlMethod, type DbStructureDomainsMap, type DbTableOptionScopes, type DbTableOptions, DecimalColumn, type DecimalColumnData, type DefaultColumnTypes, type DefaultPrivileges, type DefaultSchemaConfig, type DeleteMethodsNames, DomainColumn, DoublePrecisionColumn, type DriverAdapter, DynamicRawSQL, type EmptyObject, type EmptyTuple, EnumColumn, Expression, type FromArg, type FromResult, type GeneratorIgnore, type HookSelectValue, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, type IsQuery, type IsolationLevel, JSONColumn, JSONTextColumn, type JoinQueryMethod, type JoinedShapes, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, type MapTableScopesOption, type MaybeArray, type MaybePromise, type MergeQuery, MoneyColumn, type NoPrimaryKeyOption, type NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, type NumberColumnData, Operators, type OperatorsArray, type OperatorsJson, type OperatorsOrdinalText, OrchidOrmInternalError, type Ord, PathColumn, type PickQueryInputType, type PickQueryInternal, type PickQueryQ, type PickQueryRelations, type PickQuerySelectableRelations, type PickQueryShape, PointColumn, PolygonColumn, PostgisGeographyPointColumn, type Query, type QueryAfterHook, type QueryArraysResult, type QueryBeforeActionHook, type QueryBeforeHook, type QueryData, QueryError, type QueryHasWhere, type QueryHelperResult, QueryHookUtils, QueryHooks, type QueryInternal, type QueryLogObject, type QueryLogOptions, type QueryLogger, type QueryManyTake, type QueryManyTakeOptional, type QueryOrExpression, type QueryResult, type QueryResultRow, type QueryReturnType, type QuerySchema, type QueryScopes, RawSql, type RawSqlBase, RealColumn, type RecordKeyTrue, type RecordOptionalString, type RecordString, type RecordStringOrNumber, type RecordUnknown, type RelationConfigBase, type RelationJoinQuery, type RelationsBase, type SearchWeight, type SelectableFromShape, SerialColumn, type SerialColumnData, type ShallowSimplify, type ShapeColumnPrimaryKeys, type ShapeUniqueColumns, type SingleSql, type SingleSqlItem, SmallIntColumn, SmallSerialColumn, type Sql, type SqlFn, type SqlSessionState, type StorageOptions, StringColumn, type StringData, type TableData, type TableDataFn, type TableDataInput, type TableDataItem, type TableDataItemsUniqueColumnTuples, type TableDataItemsUniqueColumns, type TableDataItemsUniqueConstraints, type TableDataMethods, type TableRlsConfig, type TemplateLiteralArgs, TextBaseColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, type Timestamps, type TransactionAdapter, TransactionAdapterClass, type TransactionOptions, TsQueryColumn, TsVectorColumn, UUIDColumn, type UniqueConstraints, type UniqueTableDataItem, UnknownColumn, type UpdateData, type UpsertData, type UpsertThis, VarCharColumn, VirtualColumn, type WhereArg, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, copyTableData, createDbWithAdapter, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnInfo, getColumnTypes, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, testTransaction, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry };

package/dist/index.js

@@ -4116,8 +4116,8 @@ const checkIfNeedResultAllForMutativeQueriesSelectRelations = (sql) => {
 const checkIfShouldReleaseSavepointForMutativeQueriesSelectRelations = (sql) => {
 	return sql.mutativeQueriesSelectRelationsState?.value;
 };
-const loadMutativeQueriesSelectRelations = (sql, result, adapter, startingSavepoint, renames) => sql.mutativeQueriesSelectRelationsState?.value ? loadRelations(sql.mutativeQueriesSelectRelationsState, result, adapter, startingSavepoint, renames) : void 0;
-const loadRelations = async (state, result, adapter, startingSavepoint, renames) => {
+const loadMutativeQueriesSelectRelations = (sql, result, savepointState, renames) => sql.mutativeQueriesSelectRelationsState?.value ? loadRelations(sql.mutativeQueriesSelectRelationsState, result, savepointState, renames) : void 0;
+const loadRelations = async (state, result, savepointState, renames) => {
 	const q = state.query;
 	const primaryKeys = requirePrimaryKeys(q, "Cannot select a relation of a table that has no primary keys");
 	const selectQuery = _unscope(q, "nonDeleted");
@@ -4140,9 +4140,9 @@ const loadRelations = async (state, result, adapter, startingSavepoint, renames)
 	});
 	selectQuery.q.select = select;
 	const relationsResult = await maybeWrappedThen.call(selectQuery, void 0, async (err) => {
-		await adapter.arrays(`ROLLBACK TO SAVEPOINT "${startingSavepoint}"`);
+		await savepointState?.activeSavepoint?.rollback(err);
 		throw err;
-	}, startingSavepoint);
+	}, savepointState);
 	for (const row of result) {
 		const relationRow = relationsResult.find((relationRow) => {
 			return !primaryKeys.some((key, i) => relationRow[relationKeyAliases[i]] !== row[key]);
@@ -4267,7 +4267,7 @@ const then = async (q, adapter, state, beforeHooks, afterHooks, afterSaveHooks,
 		let queryResult;
 		let cteData;
 		const startingSavepoint = setCatchingSavepoint(!parentSavepoint && shouldCatch && state);
-		const releasingSavepoint = checkIfShouldReleaseSavepointForMutativeQueriesSelectRelations(sql) || parentSavepoint ? void 0 : startingSavepoint;
+		const releasingSavepoint = checkIfShouldReleaseSavepointForMutativeQueriesSelectRelations(sql) || parentSavepoint ? void 0 : parentSavepoint || startingSavepoint;
 		if ("text" in sql) {
 			if (query.autoPreparedStatements) sql.name = queriesNames[sql.text] || (queriesNames[sql.text] = (nameI++).toString(36));
 			if (log) logData = log.beforeQuery(sql);
@@ -4442,7 +4442,7 @@ const then = async (q, adapter, state, beforeHooks, afterHooks, afterSaveHooks,
 				}
 			}
 		}
-		const promise = loadMutativeQueriesSelectRelations(localSql, result, adapter, startingSavepoint, renames) || parseBatch(q, queryResult);
+		const promise = loadMutativeQueriesSelectRelations(localSql, result, startingSavepoint, renames) || parseBatch(q, queryResult);
 		if (promise) await promise;
 		if (tableHook?.select || tempReturnType !== returnType) {
 			if (renames) {
@@ -4488,7 +4488,10 @@ const then = async (q, adapter, state, beforeHooks, afterHooks, afterSaveHooks,
 	}
 };
 const setCatchingSavepoint = (catchTrx) => {
-	return catchTrx ? `s${catchTrx.catchI = (catchTrx.catchI || 0) + 1}` : void 0;
+	return catchTrx && catchTrx.transactionAdapter ? {
+		transactionAdapter: catchTrx.transactionAdapter,
+		name: `s${catchTrx.catchI = (catchTrx.catchI || 0) + 1}`
+	} : void 0;
 };
 /**
 * Executes a query and in the case there are rows, but nothing was selected,
@@ -4496,7 +4499,17 @@ const setCatchingSavepoint = (catchTrx) => {
 * because user might expect empty objects to be returned for an empty select.
 */
 const execQuery = (adapter, method, sql, startingSavepoint, releasingSavepoint, sqlSessionState) => {
-	return adapter[method](sql.text, sql.values, startingSavepoint, releasingSavepoint, sqlSessionState).then((result) => {
+	let promise;
+	if (startingSavepoint) if (releasingSavepoint) promise = startingSavepoint.transactionAdapter.savepoint(startingSavepoint.name, () => {
+		return promise = adapter[method](sql.text, sql.values, sqlSessionState);
+	});
+	else promise = startingSavepoint.transactionAdapter.hackySavepoint(startingSavepoint, sql.text, sql.values, method === "arrays");
+	else promise = adapter[method](sql.text, sql.values, sqlSessionState);
+	if (!startingSavepoint && releasingSavepoint) promise = promise.then(async (res) => {
+		await releasingSavepoint.activeSavepoint?.release();
+		return res;
+	});
+	return promise.then((result) => {
 		if (result.rowCount && !result.rows.length) {
 			result.rows.length = result.rowCount;
 			result.rows.fill({});
@@ -13240,7 +13253,7 @@ const performQuery = async (q, args, method) => {
 	let logData;
 	if (log) logData = log.beforeQuery(sql);
 	try {
-		const result = await (trx?.transactionAdapter || q.adapterNotInTransaction)[method](sql.text, sql.values, void 0, void 0, sqlSessionContextGetStateFromAsyncState(trx));
+		const result = await (trx?.transactionAdapter || q.adapterNotInTransaction)[method](sql.text, sql.values, sqlSessionContextGetStateFromAsyncState(trx));
 		if (log) log.afterQuery(sql, logData);
 		return result;
 	} catch (err) {
@@ -13690,11 +13703,11 @@ var AdapterClass = class AdapterClass {
 		this.pool = this.driverAdapter.configure(this.config);
 		this.errorClass = this.driverAdapter.errorClass;
 	}
-	query(text, values, startingSavepoint, releasingSavepoint, sqlSessionState) {
-		return runQueryHandlePool(this.pool, this.driverAdapter, text, values, startingSavepoint, releasingSavepoint, sqlSessionState);
+	query(text, values, sqlSessionState) {
+		return runQueryHandlePool(this.pool, this.driverAdapter, text, values, sqlSessionState);
 	}
-	arrays(text, values, startingSavepoint, releasingSavepoint, sqlSessionState) {
-		return runQueryHandlePool(this.pool, this.driverAdapter, text, values, startingSavepoint, releasingSavepoint, sqlSessionState, true);
+	arrays(text, values, sqlSessionState) {
+		return runQueryHandlePool(this.pool, this.driverAdapter, text, values, sqlSessionState, true);
 	}
 	clone(params) {
 		return new AdapterClass({
@@ -13738,13 +13751,13 @@ var TransactionAdapterClass = class {
 		this.driverAdapter = adapter.driverAdapter;
 		this.errorClass = this.adapter.errorClass;
 	}
-	query(text, values, startingSavepoint, releasingSavepoint, sqlSessionState) {
+	query(text, values, sqlSessionState) {
 		const setup = sqlSessionContextComputeSetup(sqlSessionState);
-		return runQueryHandleSetupAndCleanup(this.driverAdapter, this.client, text, values, startingSavepoint, releasingSavepoint, setup);
+		return runQueryHandleSetupAndCleanup(this.driverAdapter, this.client, text, values, setup);
 	}
-	arrays(text, values, startingSavepoint, releasingSavepoint, sqlSessionState) {
+	arrays(text, values, sqlSessionState) {
 		const setup = sqlSessionContextComputeSetup(sqlSessionState);
-		return runQueryHandleSetupAndCleanup(this.driverAdapter, this.client, text, values, startingSavepoint, releasingSavepoint, setup, true);
+		return runQueryHandleSetupAndCleanup(this.driverAdapter, this.client, text, values, setup, true);
 	}
 	clone(params) {
 		return this.adapter.clone(params);
@@ -13770,6 +13783,16 @@ var TransactionAdapterClass = class {
 	async transaction(asyncStorage, options, cb) {
 		return transaction(asyncStorage, this.adapter, this.driverAdapter, this.client, options, cb, this);
 	}
+	savepoint(name, cb) {
+		return this.driverAdapter.savepoint(this.client, (client) => {
+			this.client = client;
+		}, name, cb);
+	}
+	hackySavepoint(state, text, values, arraysMode) {
+		return this.driverAdapter.hackySavepoint(this.client, (client) => {
+			this.client = client;
+		}, state, text, values, arraysMode);
+	}
 	close() {
 		return this.adapter.close();
 	}
@@ -13787,7 +13810,7 @@ const transaction = (asyncStorage, adapter, driverAdapter, poolOrClient, options
 	};
 	const transactionId = state?.transactionId !== void 0 ? state.transactionId + 1 : 0;
 	const fn = (transactionAdapter) => {
-		if (log) log.afterQuery(sql, ctx.logData);
+		if (log && sql.text) log.afterQuery(sql, ctx.logData);
 		if (log) ctx.logData = log.beforeQuery(commitSql);
 		if (state || !asyncStorage) {
 			const parentTransactionRole = state?.transactionRole;
@@ -13822,7 +13845,7 @@ const transaction = (asyncStorage, adapter, driverAdapter, poolOrClient, options
 		return asyncStorage.run(ctx.state, () => cb(transactionAdapter));
 	};
 	transactionAdapter ??= state?.transactionAdapter;
-	if (transactionAdapter) return nestedTransaction(adapter, driverAdapter, transactionAdapter, poolOrClient, options, fn, ctx, transactionId, sql, log);
+	if (transactionAdapter) return nestedTransaction(adapter, driverAdapter, transactionAdapter, poolOrClient, options, fn, ctx, transactionId);
 	else return realTransaction(adapter, driverAdapter, poolOrClient, options, fn, ctx, sql, log);
 };
 const realTransaction = async (adapter, driverAdapter, pool, options, cb, ctx, sql, log) => {
@@ -13856,36 +13879,26 @@ const realTransaction = async (adapter, driverAdapter, pool, options, cb, ctx, s
 	if (ctx.state) runAfterCommit(ctx.state.afterCommit, result);
 	return result;
 };
-const nestedTransaction = async (adapter, driverAdapter, transactionAdapter, client, options, cb, ctx, transactionId, sql, log) => {
+const nestedTransaction = async (adapter, driverAdapter, transactionAdapter, client, options, cb, ctx, transactionId) => {
 	const state = ctx.state;
 	const parentRole = state?.transactionRole;
 	const parentSetConfig = state?.transactionSetConfig;
-	sql.text = `SAVEPOINT "t${transactionId}"`;
-	if (log) ctx.logData = log.beforeQuery(sql);
-	await transactionAdapter.arrays(sql.text, sql.values);
-	const setRoleSql = getSetRoleSql(parentRole, options);
-	if (setRoleSql) driverAdapter.queryClient(client, setRoleSql);
-	const setConfigSql = getSetConfigSql(parentSetConfig, options);
-	if (setConfigSql) driverAdapter.queryClient(client, setConfigSql);
-	let result;
-	try {
-		result = await cb(new TransactionAdapterClass(adapter, client));
-	} catch (err) {
-		sql.text = `ROLLBACK TO SAVEPOINT "t${transactionId}"`;
-		if (log) ctx.logData = log.beforeQuery(sql);
-		await transactionAdapter.arrays(sql.text, sql.values);
-		if (log) log.afterQuery(sql, ctx.logData);
-		throw err;
-	} finally {
-		const resetRoleSql = getResetRoleSql(parentRole, options);
-		if (resetRoleSql) await driverAdapter.queryClient(client, resetRoleSql);
-	}
-	const resetSetConfigSql = getResetSetConfigSql(parentSetConfig, options);
-	if (resetSetConfigSql) driverAdapter.queryClient(client, resetSetConfigSql);
-	sql.text = `RELEASE SAVEPOINT "t${transactionId}"`;
-	if (log) ctx.logData = log.beforeQuery(sql);
-	await transactionAdapter.arrays(sql.text, sql.values);
-	if (log) log.afterQuery(sql, ctx.logData);
+	const result = await transactionAdapter.savepoint(`t${transactionId}`, async () => {
+		const setRoleSql = getSetRoleSql(parentRole, options);
+		if (setRoleSql) driverAdapter.queryClient(client, setRoleSql);
+		const setConfigSql = getSetConfigSql(parentSetConfig, options);
+		if (setConfigSql) driverAdapter.queryClient(client, setConfigSql);
+		let result;
+		try {
+			result = await cb(new TransactionAdapterClass(adapter, client));
+		} finally {
+			const resetRoleSql = getResetRoleSql(parentRole, options);
+			if (resetRoleSql) await driverAdapter.queryClient(client, resetRoleSql);
+		}
+		const resetSetConfigSql = getResetSetConfigSql(parentSetConfig, options);
+		if (resetSetConfigSql) driverAdapter.queryClient(client, resetSetConfigSql);
+		return result;
+	});
 	if (ctx.state && transactionId === ctx.state.testTransactionCount) {
 		const { afterCommit } = ctx.state;
 		ctx.state.afterCommit = void 0;
@@ -13936,19 +13949,19 @@ const runAfterCommit = (afterCommit, result) => {
 		}
 	});
 };
-const runQueryHandlePool = async (pool, driverAdapter, text, values, startingSavepoint, releasingSavepoint, sqlSessionState, arraysMode, client) => {
+const runQueryHandlePool = async (pool, driverAdapter, text, values, sqlSessionState, arraysMode, client) => {
 	const setup = sqlSessionContextComputeSetup(sqlSessionState);
-	if (client || !driverAdapter.manualPool && !setup) return runQueryHandleSetupAndCleanup(driverAdapter, client || pool, text, values, startingSavepoint, releasingSavepoint, setup, arraysMode);
+	if (client || !driverAdapter.manualPool && !setup) return runQueryHandleSetupAndCleanup(driverAdapter, client || pool, text, values, setup, arraysMode);
 	client = await driverAdapter.borrow(pool);
 	try {
-		return await runQueryHandleSetupAndCleanup(driverAdapter, client, text, values, startingSavepoint, releasingSavepoint, setup, arraysMode);
+		return await runQueryHandleSetupAndCleanup(driverAdapter, client, text, values, setup, arraysMode);
 	} finally {
 		driverAdapter.release(client);
 	}
 };
-const runQueryHandleSetupAndCleanup = (driverAdapter, client, text, values, startingSavepoint, releasingSavepoint, setup, arraysMode) => {
-	if (setup) return sqlSessionContextExecute((text, values) => driverAdapter.queryClient(client, text, values, void 0, void 0, true), setup, () => driverAdapter.queryClient(client, text, values, startingSavepoint, releasingSavepoint, arraysMode));
-	return driverAdapter.queryClient(client, text, values, startingSavepoint, releasingSavepoint, arraysMode);
+const runQueryHandleSetupAndCleanup = (driverAdapter, client, text, values, setup, arraysMode) => {
+	if (setup) return sqlSessionContextExecute((text, values) => driverAdapter.queryClient(client, text, values, true), setup, () => driverAdapter.queryClient(client, text, values, arraysMode));
+	return driverAdapter.queryClient(client, text, values, arraysMode);
 };
 const createAdapterConnectionState = (config) => {
 	const state = { originalConfig: { ...config } };