gajus · Apr 14, 2023
diff --git a/src/connectionMethods/transaction.ts b/src/connectionMethods/transaction.ts
@@ -40,15 +40,18 @@ const execTransaction: InternalTransactionFunction = async (
 
     if (
       poolClientState.mock === false &&
-      poolClientState.ignoreCommit === false
+      poolClientState.ignoreCommitAndRollback === false
     ) {
       await connection.query('COMMIT');
     }
 
     return result;
   } catch (error) {
     if (!poolClientState.terminated) {
-      if (poolClientState.mock === false) {
+      if (
+        poolClientState.mock === false &&
+        poolClientState.ignoreCommitAndRollback === false
+      ) {
         await connection.query('ROLLBACK');
       }
 

diff --git a/src/factories/createClientConfiguration.ts b/src/factories/createClientConfiguration.ts
@@ -17,7 +17,7 @@ export const createClientConfiguration = (
     connectionTimeout: 5_000,
     idleInTransactionSessionTimeout: 60_000,
     idleTimeout: 5_000,
-    ignoreCommit: false,
+    ignoreCommitAndRollback: false,
     interceptors: [],
     maximumPoolSize: 10,
     queryRetryLimit: 5,

diff --git a/src/factories/createConnection.ts b/src/factories/createConnection.ts
@@ -97,7 +97,7 @@ export const createConnection = async (
 
       poolClientStateMap.set(connection, {
         connectionId: createUid(),
-        ignoreCommit: poolState.ignoreCommit,
+        ignoreCommitAndRollback: poolState.ignoreCommitAndRollback,
         mock: poolState.mock,
         poolId: poolState.poolId,
         terminated: null,

diff --git a/src/factories/createMockPool.ts b/src/factories/createMockPool.ts
@@ -40,7 +40,7 @@ export const createMockPool = (
 
   poolStateMap.set(pool, {
     ended: false,
-    ignoreCommit: true,
+    ignoreCommitAndRollback: true,
     mock: true,
     poolId,
     typeOverrides: null,

diff --git a/src/factories/createPool.ts b/src/factories/createPool.ts
@@ -72,7 +72,7 @@ export const createPool = async (
 
   poolStateMap.set(pool, {
     ended: false,
-    ignoreCommit: clientConfiguration.ignoreCommit,
+    ignoreCommitAndRollback: clientConfiguration.ignoreCommitAndRollback,
     mock: false,
     poolId,
     typeOverrides: null,

diff --git a/src/state.ts b/src/state.ts
@@ -5,7 +5,7 @@ import { type Pool as PgPool, type PoolClient as PgClientPool } from 'pg';
 
 type PoolState = {
   ended: boolean;
-  ignoreCommit: boolean;
+  ignoreCommitAndRollback: boolean;
   mock: boolean;
   poolId: string;
   typeOverrides: Promise<TypeOverrides> | null;
@@ -14,7 +14,7 @@ type PoolState = {
 type PoolClientState = {
   activeQuery?: DeferredPromise<unknown>;
   connectionId: string;
-  ignoreCommit: boolean;
+  ignoreCommitAndRollback: boolean;
   mock: boolean;
   poolId: string;
   terminated: Error | null;

diff --git a/src/types.ts b/src/types.ts
@@ -102,7 +102,7 @@ export type ClientConfiguration = {
   /**
    * Do not send COMMIT after successful transaction. (Default: false)
    */
-  readonly ignoreCommit: boolean;
+  readonly ignoreCommitAndRollback: boolean;
   /**
    * An array of [Slonik interceptors](https://github.com/gajus/slonik#slonik-interceptors).
    */

diff --git a/test/helpers/createClientConfiguration.ts b/test/helpers/createClientConfiguration.ts
@@ -7,7 +7,7 @@ export const createClientConfiguration = (): ClientConfiguration => {
     connectionTimeout: 5_000,
     idleInTransactionSessionTimeout: 60_000,
     idleTimeout: 5_000,
-    ignoreCommit: false,
+    ignoreCommitAndRollback: false,
     interceptors: [],
     maximumPoolSize: 10,
     queryRetryLimit: 5,

diff --git a/test/helpers/createPool.ts b/test/helpers/createPool.ts
@@ -44,7 +44,7 @@ export const createPool = async (
 
   poolStateMap.set(internalPool, {
     ended: false,
-    ignoreCommit: false,
+    ignoreCommitAndRollback: false,
     mock: false,
     poolId: '1',
     typeOverrides: null,
@@ -62,7 +62,7 @@ export const createPool = async (
     connectionTimeout: 5_000,
     idleInTransactionSessionTimeout: 5_000,
     idleTimeout: 5_000,
-    ignoreCommit: false,
+    ignoreCommitAndRollback: false,
     interceptors: [],
     maximumPoolSize: 1,
     queryRetryLimit: 1,

diff --git a/test/slonik/factories/createClientConfiguration.ts b/test/slonik/factories/createClientConfiguration.ts
@@ -8,7 +8,7 @@ const defaultConfiguration = {
   connectionTimeout: 5_000,
   idleInTransactionSessionTimeout: 60_000,
   idleTimeout: 5_000,
-  ignoreCommit: false,
+  ignoreCommitAndRollback: false,
   interceptors: [],
   maximumPoolSize: 10,
   queryRetryLimit: 5,

diff --git a/test/slonik/integration/pg.ts b/test/slonik/integration/pg.ts
@@ -11,7 +11,7 @@ createIntegrationTests(test, PgPool);
 
 test('does not break out of a transaction', async (t) => {
   const pool = await createPool(t.context.dsn, {
-    ignoreCommit: true,
+    ignoreCommitAndRollback: true,
     PgPool,
   });
 

diff --git a/test/slonik/routines/executeQuery.ts b/test/slonik/routines/executeQuery.ts
@@ -30,7 +30,7 @@ beforeEach((t) => {
 
   poolClientStateMap.set(t.context.connection, {
     connectionId: '1',
-    ignoreCommit: false,
+    ignoreCommitAndRollback: false,
     mock: true,
     poolId: '1',
     terminated: null,
@@ -163,7 +163,7 @@ test('transaction errors are not handled if the function was called by a transac
 
   poolClientStateMap.set(connection, {
     connectionId: '1',
-    ignoreCommit: false,
+    ignoreCommitAndRollback: false,
     mock: true,
     poolId: '1',
     terminated: null,