kysely 0.28.18 → 0.28.19

package/README.md

@@ -1,7 +1,7 @@
 [![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://stand-with-ukraine.pp.ua)
 
 [![NPM Version](https://img.shields.io/npm/v/kysely?style=flat&label=latest)](https://github.com/kysely-org/kysely/releases/latest)
-[![Socket Badge](https://badge.socket.dev/npm/package/kysely/0.28.18)](https://socket.dev/npm/package/kysely/overview/0.28.18)
+[![Socket Badge](https://badge.socket.dev/npm/package/kysely/0.28.19)](https://socket.dev/npm/package/kysely/overview/0.28.19)
 [![Tests](https://github.com/kysely-org/kysely/actions/workflows/test.yml/badge.svg)](https://github.com/kysely-org/kysely)
 [![License](https://img.shields.io/github/license/kysely-org/kysely?style=flat)](https://github.com/kysely-org/kysely/blob/master/LICENSE)
 [![Issues](https://img.shields.io/github/issues-closed/kysely-org/kysely?logo=github)](https://github.com/kysely-org/kysely/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc)

package/dist/cjs/dialect/mssql/mssql-driver.d.ts

@@ -25,6 +25,9 @@ export declare class MssqlDriver implements Driver {
     beginTransaction(connection: MssqlConnection, settings: TransactionSettings): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(connection: MssqlConnection): Promise<void>;
     /**

package/dist/cjs/dialect/mysql/mysql-driver.d.ts

@@ -24,6 +24,9 @@ export declare class MysqlDriver implements Driver {
     beginTransaction(connection: DatabaseConnection, settings: TransactionSettings): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(connection: DatabaseConnection): Promise<void>;
     /**

package/dist/cjs/dialect/postgres/postgres-dialect-config.d.ts

@@ -61,7 +61,7 @@ export interface PostgresPool {
 export interface PostgresPoolClient {
     query<R>(sql: string, parameters: ReadonlyArray<unknown>): Promise<PostgresQueryResult<R>>;
     query<R>(cursor: PostgresCursor<R>): PostgresCursor<R>;
-    release(): void;
+    release(destroy?: boolean): void;
 }
 export interface PostgresCursor<T> {
     read(rowsCount: number): Promise<T[]>;
@@ -69,7 +69,7 @@ export interface PostgresCursor<T> {
 }
 export type PostgresCursorConstructor = new <T>(sql: string, parameters: unknown[]) => PostgresCursor<T>;
 export interface PostgresQueryResult<R> {
-    command: 'UPDATE' | 'DELETE' | 'INSERT' | 'SELECT' | 'MERGE';
+    command: 'UPDATE' | 'DELETE' | 'INSERT' | 'SELECT' | 'MERGE' | 'COMMIT' | 'ROLLBACK';
     rowCount: number;
     rows: R[];
 }

package/dist/cjs/dialect/postgres/postgres-driver.d.ts

@@ -4,6 +4,7 @@ import { CompiledQuery } from '../../query-compiler/compiled-query.js';
 import type { QueryCompiler } from '../../query-compiler/query-compiler.js';
 import type { PostgresCursorConstructor, PostgresDialectConfig, PostgresPoolClient } from './postgres-dialect-config.js';
 declare const PRIVATE_RELEASE_METHOD: unique symbol;
+declare const PRIVATE_MARK_FOR_DISCARD_METHOD: unique symbol;
 export declare class PostgresDriver implements Driver {
     #private;
     constructor(config: PostgresDialectConfig);
@@ -24,12 +25,15 @@ export declare class PostgresDriver implements Driver {
     beginTransaction(connection: DatabaseConnection, settings: TransactionSettings): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(connection: DatabaseConnection): Promise<void>;
     /**
      * Rolls back a transaction.
      */
-    rollbackTransaction(connection: DatabaseConnection): Promise<void>;
+    rollbackTransaction(connection: PostgresConnection): Promise<void>;
     savepoint(connection: DatabaseConnection, savepointName: string, compileQuery: QueryCompiler['compileQuery']): Promise<void>;
     rollbackToSavepoint(connection: DatabaseConnection, savepointName: string, compileQuery: QueryCompiler['compileQuery']): Promise<void>;
     releaseSavepoint(connection: DatabaseConnection, savepointName: string, compileQuery: QueryCompiler['compileQuery']): Promise<void>;
@@ -51,5 +55,6 @@ declare class PostgresConnection implements DatabaseConnection {
     executeQuery<O>(compiledQuery: CompiledQuery): Promise<QueryResult<O>>;
     streamQuery<O>(compiledQuery: CompiledQuery, chunkSize: number): AsyncIterableIterator<QueryResult<O>>;
     [PRIVATE_RELEASE_METHOD](): void;
+    [PRIVATE_MARK_FOR_DISCARD_METHOD](): void;
 }
 export {};

package/dist/cjs/dialect/postgres/postgres-driver.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgresDriver = void 0;
+const aborted_transaction_error_js_1 = require("../../driver/aborted-transaction-error.js");
 const savepoint_parser_js_1 = require("../../parser/savepoint-parser.js");
 const compiled_query_js_1 = require("../../query-compiler/compiled-query.js");
 const object_utils_js_1 = require("../../util/object-utils.js");
 const query_id_js_1 = require("../../util/query-id.js");
 const stack_trace_utils_js_1 = require("../../util/stack-trace-utils.js");
 const PRIVATE_RELEASE_METHOD = Symbol();
+const PRIVATE_MARK_FOR_DISCARD_METHOD = Symbol();
 class PostgresDriver {
     #config;
     #connections = new WeakMap();
@@ -60,10 +62,21 @@ class PostgresDriver {
         }
     }
     async commitTransaction(connection) {
-        await connection.executeQuery(compiled_query_js_1.CompiledQuery.raw('commit'));
+        const { rows } = await connection.executeQuery(compiled_query_js_1.CompiledQuery.raw('commit'));
+        // PostgreSQL completes COMMIT with a ROLLBACK tag if an earlier
+        // statement error left the transaction aborted.
+        if (rows[0]?.command === 'ROLLBACK') {
+            throw new aborted_transaction_error_js_1.AbortedTransactionError();
+        }
     }
     async rollbackTransaction(connection) {
-        await connection.executeQuery(compiled_query_js_1.CompiledQuery.raw('rollback'));
+        try {
+            await connection.executeQuery(compiled_query_js_1.CompiledQuery.raw('rollback'));
+        }
+        catch (err) {
+            connection[PRIVATE_MARK_FOR_DISCARD_METHOD]();
+            throw err;
+        }
     }
     async savepoint(connection, savepointName, compileQuery) {
         await connection.executeQuery(compileQuery((0, savepoint_parser_js_1.parseSavepointCommand)('savepoint', savepointName), (0, query_id_js_1.createQueryId)()));
@@ -89,13 +102,18 @@ exports.PostgresDriver = PostgresDriver;
 class PostgresConnection {
     #client;
     #options;
+    #discarded;
     constructor(client, options) {
         this.#client = client;
         this.#options = options;
     }
     async executeQuery(compiledQuery) {
+        this.#assertNotDiscarded();
         try {
             const { command, rowCount, rows } = await this.#client.query(compiledQuery.sql, [...compiledQuery.parameters]);
+            if (command === 'ROLLBACK' || command === 'COMMIT') {
+                return { rows: [{ command }] };
+            }
             return {
                 numAffectedRows: command === 'INSERT' ||
                     command === 'UPDATE' ||
@@ -117,6 +135,7 @@ class PostgresConnection {
         if (!Number.isInteger(chunkSize) || chunkSize <= 0) {
             throw new Error('chunkSize must be a positive integer');
         }
+        this.#assertNotDiscarded();
         const cursor = this.#client.query(new this.#options.cursor(compiledQuery.sql, compiledQuery.parameters.slice()));
         try {
             while (true) {
@@ -134,6 +153,14 @@ class PostgresConnection {
         }
     }
     [PRIVATE_RELEASE_METHOD]() {
-        this.#client.release();
+        this.#client.release(Boolean(this.#discarded));
+    }
+    [PRIVATE_MARK_FOR_DISCARD_METHOD]() {
+        this.#discarded = true;
+    }
+    #assertNotDiscarded() {
+        if (this.#discarded) {
+            throw new Error('Postgres connection has been discarded');
+        }
     }
 }

package/dist/cjs/dialect/sqlite/sqlite-driver.d.ts

@@ -22,6 +22,9 @@ export declare class SqliteDriver implements Driver {
     beginTransaction(connection: DatabaseConnection): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(connection: DatabaseConnection): Promise<void>;
     /**

package/dist/cjs/driver/aborted-transaction-error.d.ts

@@ -0,0 +1,11 @@
+declare const ABORTED_TRANSACTION_ERROR: unique symbol;
+/**
+ * Thrown when the database rolls back a transaction instead of committing it.
+ */
+export declare class AbortedTransactionError extends Error {
+    name: string;
+    readonly [ABORTED_TRANSACTION_ERROR] = true;
+    constructor();
+}
+export declare function isAbortedTransactionError(error: unknown): error is AbortedTransactionError;
+export {};

package/dist/cjs/driver/aborted-transaction-error.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbortedTransactionError = void 0;
+exports.isAbortedTransactionError = isAbortedTransactionError;
+const object_utils_js_1 = require("../util/object-utils.js");
+const ABORTED_TRANSACTION_ERROR = Symbol.for('kysely.AbortedTransactionError');
+/**
+ * Thrown when the database rolls back a transaction instead of committing it.
+ */
+class AbortedTransactionError extends Error {
+    name = 'AbortedTransactionError';
+    [ABORTED_TRANSACTION_ERROR] = true;
+    constructor() {
+        super('Transaction was rolled back instead of committed');
+    }
+}
+exports.AbortedTransactionError = AbortedTransactionError;
+function isAbortedTransactionError(error) {
+    return (0, object_utils_js_1.isObject)(error) && ABORTED_TRANSACTION_ERROR in error;
+}

package/dist/cjs/driver/driver.d.ts

@@ -23,6 +23,9 @@ export interface Driver {
     beginTransaction(connection: DatabaseConnection, settings: TransactionSettings): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(connection: DatabaseConnection): Promise<void>;
     /**

package/dist/cjs/driver/dummy-driver.d.ts

@@ -55,6 +55,9 @@ export declare class DummyDriver implements Driver {
     beginTransaction(): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(): Promise<void>;
     /**

package/dist/cjs/driver/runtime-driver.d.ts

@@ -31,6 +31,9 @@ export declare class RuntimeDriver implements Driver {
     beginTransaction(connection: DatabaseConnection, settings: TransactionSettings): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(connection: DatabaseConnection): Promise<void>;
     /**

package/dist/cjs/index.d.ts

@@ -57,6 +57,7 @@ export * from './dynamic/dynamic.js';
 export * from './dynamic/dynamic-reference-builder.js';
 export * from './dynamic/dynamic-table-builder.js';
 export * from './driver/driver.js';
+export * from './driver/aborted-transaction-error.js';
 export * from './driver/database-connection.js';
 export * from './driver/connection-provider.js';
 export * from './driver/default-connection-provider.js';

package/dist/cjs/index.js

@@ -75,6 +75,7 @@ __exportStar(require("./dynamic/dynamic.js"), exports);
 __exportStar(require("./dynamic/dynamic-reference-builder.js"), exports);
 __exportStar(require("./dynamic/dynamic-table-builder.js"), exports);
 __exportStar(require("./driver/driver.js"), exports);
+__exportStar(require("./driver/aborted-transaction-error.js"), exports);
 __exportStar(require("./driver/database-connection.js"), exports);
 __exportStar(require("./driver/connection-provider.js"), exports);
 __exportStar(require("./driver/default-connection-provider.js"), exports);

package/dist/cjs/kysely.d.ts

@@ -665,6 +665,9 @@ export declare class ControlledTransaction<DB, S extends string[] = []> extends
     /**
      * Commits the transaction.
      *
+     * If the database rolls back instead of committing, marks the transaction
+     * as rolled back, releases the connection and throws {@link AbortedTransactionError}.
+     *
      * Waits for ongoing queries to finish. Streams must be exhausted or closed
      * before awaiting this command. When consuming a stream with `for await`,
      * exit the loop before committing.
@@ -694,6 +697,9 @@ export declare class ControlledTransaction<DB, S extends string[] = []> extends
     /**
      * Rolls back the transaction.
      *
+     * If a commit already reported that the database rolled back the transaction,
+     * succeeds without sending another rollback command.
+     *
      * The connection is released even if the rollback fails, so the transaction
      * cannot be used afterwards in either case.
      *
@@ -876,13 +882,12 @@ export declare class ControlledTransaction<DB, S extends string[] = []> extends
      */
     withTables<T extends Record<string, Record<string, any>>>(): ControlledTransaction<DrainOuterGeneric<DB & T>, S>;
 }
-interface ControlledTransctionState {
-    isCommitted: boolean;
-    isRolledBack: boolean;
+interface ControlledTransactionState {
+    status: 'active' | 'committed' | 'rolled back' | 'aborted';
 }
 interface ControlledTransactionProps extends KyselyProps {
     readonly connection: ControlledConnection;
-    readonly state?: ControlledTransctionState;
+    readonly transactionState?: ControlledTransactionState;
 }
 export declare class Command<T> {
     #private;

package/dist/cjs/kysely.js

@@ -9,6 +9,7 @@ const query_creator_js_1 = require("./query-creator.js");
 const default_query_executor_js_1 = require("./query-executor/default-query-executor.js");
 const object_utils_js_1 = require("./util/object-utils.js");
 const runtime_driver_js_1 = require("./driver/runtime-driver.js");
+const aborted_transaction_error_js_1 = require("./driver/aborted-transaction-error.js");
 const single_connection_provider_js_1 = require("./driver/single-connection-provider.js");
 const driver_js_1 = require("./driver/driver.js");
 const function_module_js_1 = require("./query-builder/function-module.js");
@@ -575,8 +576,10 @@ class TransactionBuilder {
         const settings = { isolationLevel, accessMode };
         (0, driver_js_1.validateTransactionSettings)(settings);
         return this.#props.executor.provideConnection(async (connection) => {
-            const state = { isCommitted: false, isRolledBack: false };
-            const executor = new NotCommittedOrRolledBackAssertingExecutor(this.#props.executor.withConnectionProvider(new single_connection_provider_js_1.SingleConnectionProvider(connection)), state);
+            const transactionState = {
+                status: 'active',
+            };
+            const executor = new NotCommittedOrRolledBackAssertingExecutor(this.#props.executor.withConnectionProvider(new single_connection_provider_js_1.SingleConnectionProvider(connection)), transactionState);
             const transaction = new Transaction({
                 ...kyselyProps,
                 executor,
@@ -587,13 +590,16 @@ class TransactionBuilder {
                 transactionBegun = true;
                 const result = await callback(transaction);
                 await this.#props.driver.commitTransaction(connection);
-                state.isCommitted = true;
+                transactionState.status = 'committed';
                 return result;
             }
             catch (error) {
-                if (transactionBegun) {
+                if ((0, aborted_transaction_error_js_1.isAbortedTransactionError)(error)) {
+                    transactionState.status = 'aborted';
+                }
+                else if (transactionBegun) {
                     await this.#props.driver.rollbackTransaction(connection);
-                    state.isRolledBack = true;
+                    transactionState.status = 'rolled back';
                 }
                 throw error;
             }
@@ -633,7 +639,7 @@ class ControlledTransactionBuilder {
         return new ControlledTransaction({
             ...props,
             connection,
-            state: { isCommitted: false, isRolledBack: false },
+            transactionState: { status: 'active' },
             executor: this.#props.executor.withConnectionProvider(new single_connection_provider_js_1.SingleConnectionProvider(connection.connection)),
         });
     }
@@ -643,30 +649,33 @@ class ControlledTransaction extends Transaction {
     #props;
     #compileQuery;
     constructor(props) {
-        const transactionState = props.state ?? {
-            isCommitted: false,
-            isRolledBack: false,
+        const controlledState = props.transactionState ?? {
+            status: 'active',
         };
         const controlledProps = {
             ...props,
-            state: transactionState,
-            executor: new NotCommittedOrRolledBackAssertingExecutor(props.executor, transactionState),
+            transactionState: controlledState,
+            executor: new NotCommittedOrRolledBackAssertingExecutor(props.executor, controlledState),
         };
-        const { connection, state, ...transactionProps } = controlledProps;
+        const { connection, transactionState, ...transactionProps } = controlledProps;
         super(transactionProps);
         this.#props = (0, object_utils_js_1.freeze)(controlledProps);
         const queryId = (0, query_id_js_1.createQueryId)();
         this.#compileQuery = (node) => controlledProps.executor.compileQuery(node, queryId);
     }
     get isCommitted() {
-        return this.#props.state.isCommitted;
+        return this.#props.transactionState.status === 'committed';
     }
     get isRolledBack() {
-        return this.#props.state.isRolledBack;
+        return (this.#props.transactionState.status === 'rolled back' ||
+            this.#props.transactionState.status === 'aborted');
     }
     /**
      * Commits the transaction.
      *
+     * If the database rolls back instead of committing, marks the transaction
+     * as rolled back, releases the connection and throws {@link AbortedTransactionError}.
+     *
      * Waits for ongoing queries to finish. Streams must be exhausted or closed
      * before awaiting this command. When consuming a stream with `for await`,
      * exit the loop before committing.
@@ -695,8 +704,17 @@ class ControlledTransaction extends Transaction {
     commit() {
         return new Command(async () => {
             await this.#props.executor.provideConnection(async (connection) => {
-                await this.#props.driver.commitTransaction(connection);
-                this.#props.state.isCommitted = true;
+                try {
+                    await this.#props.driver.commitTransaction(connection);
+                }
+                catch (error) {
+                    if ((0, aborted_transaction_error_js_1.isAbortedTransactionError)(error)) {
+                        this.#props.transactionState.status = 'aborted';
+                        this.#props.connection.release();
+                    }
+                    throw error;
+                }
+                this.#props.transactionState.status = 'committed';
                 this.#props.connection.release();
             });
         });
@@ -704,6 +722,9 @@ class ControlledTransaction extends Transaction {
     /**
      * Rolls back the transaction.
      *
+     * If a commit already reported that the database rolled back the transaction,
+     * succeeds without sending another rollback command.
+     *
      * The connection is released even if the rollback fails, so the transaction
      * cannot be used afterwards in either case.
      *
@@ -734,13 +755,16 @@ class ControlledTransaction extends Transaction {
      */
     rollback() {
         return new Command(async () => {
+            if (this.#props.transactionState.status === 'aborted') {
+                return;
+            }
             await this.#props.executor.provideConnection(async (connection) => {
                 // A failed rollback can't be meaningfully retried (e.g. dead connection).
                 try {
                     await this.#props.driver.rollbackTransaction(connection);
                 }
                 finally {
-                    this.#props.state.isRolledBack = true;
+                    this.#props.transactionState.status = 'rolled back';
                     this.#props.connection.release();
                 }
             });
@@ -912,11 +936,11 @@ class Command {
     }
 }
 exports.Command = Command;
-function assertNotCommittedOrRolledBack(state) {
-    if (state.isCommitted) {
+function assertNotCommittedOrRolledBack(transactionState) {
+    if (transactionState.status === 'committed') {
         throw new Error('Transaction is already committed');
     }
-    if (state.isRolledBack) {
+    if (transactionState.status !== 'active') {
         throw new Error('Transaction is already rolled back');
     }
 }
@@ -928,15 +952,13 @@ function assertNotCommittedOrRolledBack(state) {
  */
 class NotCommittedOrRolledBackAssertingExecutor {
     #executor;
-    #state;
-    constructor(executor, state) {
-        if (executor instanceof NotCommittedOrRolledBackAssertingExecutor) {
-            this.#executor = executor.#executor;
-        }
-        else {
-            this.#executor = executor;
-        }
-        this.#state = state;
+    #transactionState;
+    constructor(executor, transactionState) {
+        this.#executor =
+            executor instanceof NotCommittedOrRolledBackAssertingExecutor
+                ? executor.#executor
+                : executor;
+        this.#transactionState = transactionState;
     }
     get adapter() {
         return this.#executor.adapter;
@@ -951,37 +973,37 @@ class NotCommittedOrRolledBackAssertingExecutor {
         return this.#executor.compileQuery(node, queryId);
     }
     provideConnection(consumer) {
-        assertNotCommittedOrRolledBack(this.#state);
+        assertNotCommittedOrRolledBack(this.#transactionState);
         return this.#executor.provideConnection(async (connection) => {
-            assertNotCommittedOrRolledBack(this.#state);
+            assertNotCommittedOrRolledBack(this.#transactionState);
             return await consumer(connection);
         });
     }
     executeQuery(compiledQuery) {
-        assertNotCommittedOrRolledBack(this.#state);
+        assertNotCommittedOrRolledBack(this.#transactionState);
         return this.#executor
             .withConnectionProvider(this)
             .executeQuery(compiledQuery);
     }
     stream(compiledQuery, chunkSize) {
-        assertNotCommittedOrRolledBack(this.#state);
+        assertNotCommittedOrRolledBack(this.#transactionState);
         return this.#executor
             .withConnectionProvider(this)
             .stream(compiledQuery, chunkSize);
     }
     withConnectionProvider(connectionProvider) {
-        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withConnectionProvider(connectionProvider), this.#state);
+        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withConnectionProvider(connectionProvider), this.#transactionState);
     }
     withPlugin(plugin) {
-        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withPlugin(plugin), this.#state);
+        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withPlugin(plugin), this.#transactionState);
     }
     withPlugins(plugins) {
-        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withPlugins(plugins), this.#state);
+        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withPlugins(plugins), this.#transactionState);
     }
     withPluginAtFront(plugin) {
-        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withPluginAtFront(plugin), this.#state);
+        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withPluginAtFront(plugin), this.#transactionState);
     }
     withoutPlugins() {
-        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withoutPlugins(), this.#state);
+        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withoutPlugins(), this.#transactionState);
     }
 }

package/dist/esm/dialect/mssql/mssql-driver.d.ts

@@ -25,6 +25,9 @@ export declare class MssqlDriver implements Driver {
     beginTransaction(connection: MssqlConnection, settings: TransactionSettings): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(connection: MssqlConnection): Promise<void>;
     /**

package/dist/esm/dialect/mysql/mysql-driver.d.ts

@@ -24,6 +24,9 @@ export declare class MysqlDriver implements Driver {
     beginTransaction(connection: DatabaseConnection, settings: TransactionSettings): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(connection: DatabaseConnection): Promise<void>;
     /**

package/dist/esm/dialect/postgres/postgres-dialect-config.d.ts

@@ -61,7 +61,7 @@ export interface PostgresPool {
 export interface PostgresPoolClient {
     query<R>(sql: string, parameters: ReadonlyArray<unknown>): Promise<PostgresQueryResult<R>>;
     query<R>(cursor: PostgresCursor<R>): PostgresCursor<R>;
-    release(): void;
+    release(destroy?: boolean): void;
 }
 export interface PostgresCursor<T> {
     read(rowsCount: number): Promise<T[]>;
@@ -69,7 +69,7 @@ export interface PostgresCursor<T> {
 }
 export type PostgresCursorConstructor = new <T>(sql: string, parameters: unknown[]) => PostgresCursor<T>;
 export interface PostgresQueryResult<R> {
-    command: 'UPDATE' | 'DELETE' | 'INSERT' | 'SELECT' | 'MERGE';
+    command: 'UPDATE' | 'DELETE' | 'INSERT' | 'SELECT' | 'MERGE' | 'COMMIT' | 'ROLLBACK';
     rowCount: number;
     rows: R[];
 }

package/dist/esm/dialect/postgres/postgres-driver.d.ts

@@ -4,6 +4,7 @@ import { CompiledQuery } from '../../query-compiler/compiled-query.js';
 import type { QueryCompiler } from '../../query-compiler/query-compiler.js';
 import type { PostgresCursorConstructor, PostgresDialectConfig, PostgresPoolClient } from './postgres-dialect-config.js';
 declare const PRIVATE_RELEASE_METHOD: unique symbol;
+declare const PRIVATE_MARK_FOR_DISCARD_METHOD: unique symbol;
 export declare class PostgresDriver implements Driver {
     #private;
     constructor(config: PostgresDialectConfig);
@@ -24,12 +25,15 @@ export declare class PostgresDriver implements Driver {
     beginTransaction(connection: DatabaseConnection, settings: TransactionSettings): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(connection: DatabaseConnection): Promise<void>;
     /**
      * Rolls back a transaction.
      */
-    rollbackTransaction(connection: DatabaseConnection): Promise<void>;
+    rollbackTransaction(connection: PostgresConnection): Promise<void>;
     savepoint(connection: DatabaseConnection, savepointName: string, compileQuery: QueryCompiler['compileQuery']): Promise<void>;
     rollbackToSavepoint(connection: DatabaseConnection, savepointName: string, compileQuery: QueryCompiler['compileQuery']): Promise<void>;
     releaseSavepoint(connection: DatabaseConnection, savepointName: string, compileQuery: QueryCompiler['compileQuery']): Promise<void>;
@@ -51,5 +55,6 @@ declare class PostgresConnection implements DatabaseConnection {
     executeQuery<O>(compiledQuery: CompiledQuery): Promise<QueryResult<O>>;
     streamQuery<O>(compiledQuery: CompiledQuery, chunkSize: number): AsyncIterableIterator<QueryResult<O>>;
     [PRIVATE_RELEASE_METHOD](): void;
+    [PRIVATE_MARK_FOR_DISCARD_METHOD](): void;
 }
 export {};

package/dist/esm/dialect/postgres/postgres-driver.js

@@ -1,10 +1,12 @@
 /// <reference types="./postgres-driver.d.ts" />
+import { AbortedTransactionError } from '../../driver/aborted-transaction-error.js';
 import { parseSavepointCommand } from '../../parser/savepoint-parser.js';
 import { CompiledQuery } from '../../query-compiler/compiled-query.js';
 import { isFunction, freeze } from '../../util/object-utils.js';
 import { createQueryId } from '../../util/query-id.js';
 import { extendStackTrace } from '../../util/stack-trace-utils.js';
 const PRIVATE_RELEASE_METHOD = Symbol();
+const PRIVATE_MARK_FOR_DISCARD_METHOD = Symbol();
 export class PostgresDriver {
     #config;
     #connections = new WeakMap();
@@ -58,10 +60,21 @@ export class PostgresDriver {
         }
     }
     async commitTransaction(connection) {
-        await connection.executeQuery(CompiledQuery.raw('commit'));
+        const { rows } = await connection.executeQuery(CompiledQuery.raw('commit'));
+        // PostgreSQL completes COMMIT with a ROLLBACK tag if an earlier
+        // statement error left the transaction aborted.
+        if (rows[0]?.command === 'ROLLBACK') {
+            throw new AbortedTransactionError();
+        }
     }
     async rollbackTransaction(connection) {
-        await connection.executeQuery(CompiledQuery.raw('rollback'));
+        try {
+            await connection.executeQuery(CompiledQuery.raw('rollback'));
+        }
+        catch (err) {
+            connection[PRIVATE_MARK_FOR_DISCARD_METHOD]();
+            throw err;
+        }
     }
     async savepoint(connection, savepointName, compileQuery) {
         await connection.executeQuery(compileQuery(parseSavepointCommand('savepoint', savepointName), createQueryId()));
@@ -86,13 +99,18 @@ export class PostgresDriver {
 class PostgresConnection {
     #client;
     #options;
+    #discarded;
     constructor(client, options) {
         this.#client = client;
         this.#options = options;
     }
     async executeQuery(compiledQuery) {
+        this.#assertNotDiscarded();
         try {
             const { command, rowCount, rows } = await this.#client.query(compiledQuery.sql, [...compiledQuery.parameters]);
+            if (command === 'ROLLBACK' || command === 'COMMIT') {
+                return { rows: [{ command }] };
+            }
             return {
                 numAffectedRows: command === 'INSERT' ||
                     command === 'UPDATE' ||
@@ -114,6 +132,7 @@ class PostgresConnection {
         if (!Number.isInteger(chunkSize) || chunkSize <= 0) {
             throw new Error('chunkSize must be a positive integer');
         }
+        this.#assertNotDiscarded();
         const cursor = this.#client.query(new this.#options.cursor(compiledQuery.sql, compiledQuery.parameters.slice()));
         try {
             while (true) {
@@ -131,6 +150,14 @@ class PostgresConnection {
         }
     }
     [PRIVATE_RELEASE_METHOD]() {
-        this.#client.release();
+        this.#client.release(Boolean(this.#discarded));
+    }
+    [PRIVATE_MARK_FOR_DISCARD_METHOD]() {
+        this.#discarded = true;
+    }
+    #assertNotDiscarded() {
+        if (this.#discarded) {
+            throw new Error('Postgres connection has been discarded');
+        }
     }
 }

package/dist/esm/dialect/sqlite/sqlite-driver.d.ts

@@ -22,6 +22,9 @@ export declare class SqliteDriver implements Driver {
     beginTransaction(connection: DatabaseConnection): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(connection: DatabaseConnection): Promise<void>;
     /**

package/dist/esm/driver/aborted-transaction-error.d.ts

@@ -0,0 +1,11 @@
+declare const ABORTED_TRANSACTION_ERROR: unique symbol;
+/**
+ * Thrown when the database rolls back a transaction instead of committing it.
+ */
+export declare class AbortedTransactionError extends Error {
+    name: string;
+    readonly [ABORTED_TRANSACTION_ERROR] = true;
+    constructor();
+}
+export declare function isAbortedTransactionError(error: unknown): error is AbortedTransactionError;
+export {};

package/dist/esm/driver/aborted-transaction-error.js

@@ -0,0 +1,16 @@
+/// <reference types="./aborted-transaction-error.d.ts" />
+import { isObject } from '../util/object-utils.js';
+const ABORTED_TRANSACTION_ERROR = Symbol.for('kysely.AbortedTransactionError');
+/**
+ * Thrown when the database rolls back a transaction instead of committing it.
+ */
+export class AbortedTransactionError extends Error {
+    name = 'AbortedTransactionError';
+    [ABORTED_TRANSACTION_ERROR] = true;
+    constructor() {
+        super('Transaction was rolled back instead of committed');
+    }
+}
+export function isAbortedTransactionError(error) {
+    return isObject(error) && ABORTED_TRANSACTION_ERROR in error;
+}

package/dist/esm/driver/driver.d.ts

@@ -23,6 +23,9 @@ export interface Driver {
     beginTransaction(connection: DatabaseConnection, settings: TransactionSettings): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(connection: DatabaseConnection): Promise<void>;
     /**

package/dist/esm/driver/dummy-driver.d.ts

@@ -55,6 +55,9 @@ export declare class DummyDriver implements Driver {
     beginTransaction(): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(): Promise<void>;
     /**

package/dist/esm/driver/runtime-driver.d.ts

@@ -31,6 +31,9 @@ export declare class RuntimeDriver implements Driver {
     beginTransaction(connection: DatabaseConnection, settings: TransactionSettings): Promise<void>;
     /**
      * Commits a transaction.
+     *
+     * Throws {@link AbortedTransactionError} if the database confirms that
+     * the transaction was rolled back instead of committed.
      */
     commitTransaction(connection: DatabaseConnection): Promise<void>;
     /**

package/dist/esm/index.d.ts

@@ -57,6 +57,7 @@ export * from './dynamic/dynamic.js';
 export * from './dynamic/dynamic-reference-builder.js';
 export * from './dynamic/dynamic-table-builder.js';
 export * from './driver/driver.js';
+export * from './driver/aborted-transaction-error.js';
 export * from './driver/database-connection.js';
 export * from './driver/connection-provider.js';
 export * from './driver/default-connection-provider.js';

package/dist/esm/index.js

@@ -58,6 +58,7 @@ export * from './dynamic/dynamic.js';
 export * from './dynamic/dynamic-reference-builder.js';
 export * from './dynamic/dynamic-table-builder.js';
 export * from './driver/driver.js';
+export * from './driver/aborted-transaction-error.js';
 export * from './driver/database-connection.js';
 export * from './driver/connection-provider.js';
 export * from './driver/default-connection-provider.js';

package/dist/esm/kysely.d.ts

@@ -665,6 +665,9 @@ export declare class ControlledTransaction<DB, S extends string[] = []> extends
     /**
      * Commits the transaction.
      *
+     * If the database rolls back instead of committing, marks the transaction
+     * as rolled back, releases the connection and throws {@link AbortedTransactionError}.
+     *
      * Waits for ongoing queries to finish. Streams must be exhausted or closed
      * before awaiting this command. When consuming a stream with `for await`,
      * exit the loop before committing.
@@ -694,6 +697,9 @@ export declare class ControlledTransaction<DB, S extends string[] = []> extends
     /**
      * Rolls back the transaction.
      *
+     * If a commit already reported that the database rolled back the transaction,
+     * succeeds without sending another rollback command.
+     *
      * The connection is released even if the rollback fails, so the transaction
      * cannot be used afterwards in either case.
      *
@@ -876,13 +882,12 @@ export declare class ControlledTransaction<DB, S extends string[] = []> extends
      */
     withTables<T extends Record<string, Record<string, any>>>(): ControlledTransaction<DrainOuterGeneric<DB & T>, S>;
 }
-interface ControlledTransctionState {
-    isCommitted: boolean;
-    isRolledBack: boolean;
+interface ControlledTransactionState {
+    status: 'active' | 'committed' | 'rolled back' | 'aborted';
 }
 interface ControlledTransactionProps extends KyselyProps {
     readonly connection: ControlledConnection;
-    readonly state?: ControlledTransctionState;
+    readonly transactionState?: ControlledTransactionState;
 }
 export declare class Command<T> {
     #private;

package/dist/esm/kysely.js

@@ -6,6 +6,7 @@ import { QueryCreator } from './query-creator.js';
 import { DefaultQueryExecutor } from './query-executor/default-query-executor.js';
 import { freeze, isObject, isUndefined } from './util/object-utils.js';
 import { RuntimeDriver } from './driver/runtime-driver.js';
+import { isAbortedTransactionError, } from './driver/aborted-transaction-error.js';
 import { SingleConnectionProvider } from './driver/single-connection-provider.js';
 import { validateTransactionSettings, } from './driver/driver.js';
 import { createFunctionModule, } from './query-builder/function-module.js';
@@ -569,8 +570,10 @@ export class TransactionBuilder {
         const settings = { isolationLevel, accessMode };
         validateTransactionSettings(settings);
         return this.#props.executor.provideConnection(async (connection) => {
-            const state = { isCommitted: false, isRolledBack: false };
-            const executor = new NotCommittedOrRolledBackAssertingExecutor(this.#props.executor.withConnectionProvider(new SingleConnectionProvider(connection)), state);
+            const transactionState = {
+                status: 'active',
+            };
+            const executor = new NotCommittedOrRolledBackAssertingExecutor(this.#props.executor.withConnectionProvider(new SingleConnectionProvider(connection)), transactionState);
             const transaction = new Transaction({
                 ...kyselyProps,
                 executor,
@@ -581,13 +584,16 @@ export class TransactionBuilder {
                 transactionBegun = true;
                 const result = await callback(transaction);
                 await this.#props.driver.commitTransaction(connection);
-                state.isCommitted = true;
+                transactionState.status = 'committed';
                 return result;
             }
             catch (error) {
-                if (transactionBegun) {
+                if (isAbortedTransactionError(error)) {
+                    transactionState.status = 'aborted';
+                }
+                else if (transactionBegun) {
                     await this.#props.driver.rollbackTransaction(connection);
-                    state.isRolledBack = true;
+                    transactionState.status = 'rolled back';
                 }
                 throw error;
             }
@@ -626,7 +632,7 @@ export class ControlledTransactionBuilder {
         return new ControlledTransaction({
             ...props,
             connection,
-            state: { isCommitted: false, isRolledBack: false },
+            transactionState: { status: 'active' },
             executor: this.#props.executor.withConnectionProvider(new SingleConnectionProvider(connection.connection)),
         });
     }
@@ -635,30 +641,33 @@ export class ControlledTransaction extends Transaction {
     #props;
     #compileQuery;
     constructor(props) {
-        const transactionState = props.state ?? {
-            isCommitted: false,
-            isRolledBack: false,
+        const controlledState = props.transactionState ?? {
+            status: 'active',
         };
         const controlledProps = {
             ...props,
-            state: transactionState,
-            executor: new NotCommittedOrRolledBackAssertingExecutor(props.executor, transactionState),
+            transactionState: controlledState,
+            executor: new NotCommittedOrRolledBackAssertingExecutor(props.executor, controlledState),
         };
-        const { connection, state, ...transactionProps } = controlledProps;
+        const { connection, transactionState, ...transactionProps } = controlledProps;
         super(transactionProps);
         this.#props = freeze(controlledProps);
         const queryId = createQueryId();
         this.#compileQuery = (node) => controlledProps.executor.compileQuery(node, queryId);
     }
     get isCommitted() {
-        return this.#props.state.isCommitted;
+        return this.#props.transactionState.status === 'committed';
     }
     get isRolledBack() {
-        return this.#props.state.isRolledBack;
+        return (this.#props.transactionState.status === 'rolled back' ||
+            this.#props.transactionState.status === 'aborted');
     }
     /**
      * Commits the transaction.
      *
+     * If the database rolls back instead of committing, marks the transaction
+     * as rolled back, releases the connection and throws {@link AbortedTransactionError}.
+     *
      * Waits for ongoing queries to finish. Streams must be exhausted or closed
      * before awaiting this command. When consuming a stream with `for await`,
      * exit the loop before committing.
@@ -687,8 +696,17 @@ export class ControlledTransaction extends Transaction {
     commit() {
         return new Command(async () => {
             await this.#props.executor.provideConnection(async (connection) => {
-                await this.#props.driver.commitTransaction(connection);
-                this.#props.state.isCommitted = true;
+                try {
+                    await this.#props.driver.commitTransaction(connection);
+                }
+                catch (error) {
+                    if (isAbortedTransactionError(error)) {
+                        this.#props.transactionState.status = 'aborted';
+                        this.#props.connection.release();
+                    }
+                    throw error;
+                }
+                this.#props.transactionState.status = 'committed';
                 this.#props.connection.release();
             });
         });
@@ -696,6 +714,9 @@ export class ControlledTransaction extends Transaction {
     /**
      * Rolls back the transaction.
      *
+     * If a commit already reported that the database rolled back the transaction,
+     * succeeds without sending another rollback command.
+     *
      * The connection is released even if the rollback fails, so the transaction
      * cannot be used afterwards in either case.
      *
@@ -726,13 +747,16 @@ export class ControlledTransaction extends Transaction {
      */
     rollback() {
         return new Command(async () => {
+            if (this.#props.transactionState.status === 'aborted') {
+                return;
+            }
             await this.#props.executor.provideConnection(async (connection) => {
                 // A failed rollback can't be meaningfully retried (e.g. dead connection).
                 try {
                     await this.#props.driver.rollbackTransaction(connection);
                 }
                 finally {
-                    this.#props.state.isRolledBack = true;
+                    this.#props.transactionState.status = 'rolled back';
                     this.#props.connection.release();
                 }
             });
@@ -902,11 +926,11 @@ export class Command {
         return await this.#cb();
     }
 }
-function assertNotCommittedOrRolledBack(state) {
-    if (state.isCommitted) {
+function assertNotCommittedOrRolledBack(transactionState) {
+    if (transactionState.status === 'committed') {
         throw new Error('Transaction is already committed');
     }
-    if (state.isRolledBack) {
+    if (transactionState.status !== 'active') {
         throw new Error('Transaction is already rolled back');
     }
 }
@@ -918,15 +942,13 @@ function assertNotCommittedOrRolledBack(state) {
  */
 class NotCommittedOrRolledBackAssertingExecutor {
     #executor;
-    #state;
-    constructor(executor, state) {
-        if (executor instanceof NotCommittedOrRolledBackAssertingExecutor) {
-            this.#executor = executor.#executor;
-        }
-        else {
-            this.#executor = executor;
-        }
-        this.#state = state;
+    #transactionState;
+    constructor(executor, transactionState) {
+        this.#executor =
+            executor instanceof NotCommittedOrRolledBackAssertingExecutor
+                ? executor.#executor
+                : executor;
+        this.#transactionState = transactionState;
     }
     get adapter() {
         return this.#executor.adapter;
@@ -941,37 +963,37 @@ class NotCommittedOrRolledBackAssertingExecutor {
         return this.#executor.compileQuery(node, queryId);
     }
     provideConnection(consumer) {
-        assertNotCommittedOrRolledBack(this.#state);
+        assertNotCommittedOrRolledBack(this.#transactionState);
         return this.#executor.provideConnection(async (connection) => {
-            assertNotCommittedOrRolledBack(this.#state);
+            assertNotCommittedOrRolledBack(this.#transactionState);
             return await consumer(connection);
         });
     }
     executeQuery(compiledQuery) {
-        assertNotCommittedOrRolledBack(this.#state);
+        assertNotCommittedOrRolledBack(this.#transactionState);
         return this.#executor
             .withConnectionProvider(this)
             .executeQuery(compiledQuery);
     }
     stream(compiledQuery, chunkSize) {
-        assertNotCommittedOrRolledBack(this.#state);
+        assertNotCommittedOrRolledBack(this.#transactionState);
         return this.#executor
             .withConnectionProvider(this)
             .stream(compiledQuery, chunkSize);
     }
     withConnectionProvider(connectionProvider) {
-        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withConnectionProvider(connectionProvider), this.#state);
+        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withConnectionProvider(connectionProvider), this.#transactionState);
     }
     withPlugin(plugin) {
-        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withPlugin(plugin), this.#state);
+        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withPlugin(plugin), this.#transactionState);
     }
     withPlugins(plugins) {
-        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withPlugins(plugins), this.#state);
+        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withPlugins(plugins), this.#transactionState);
     }
     withPluginAtFront(plugin) {
-        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withPluginAtFront(plugin), this.#state);
+        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withPluginAtFront(plugin), this.#transactionState);
     }
     withoutPlugins() {
-        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withoutPlugins(), this.#state);
+        return new NotCommittedOrRolledBackAssertingExecutor(this.#executor.withoutPlugins(), this.#transactionState);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kysely",
-  "version": "0.28.18",
+  "version": "0.28.19",
   "description": "Type safe SQL query builder",
   "repository": {
     "type": "git",