fix savepoint with auto-rollback (#62)

Author: vadv

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "pg_doorman"
-version = "2.4.2"
+version = "2.4.3"
 edition = "2021"
 rust-version = "1.87.0"
 license = "MIT"

Cargo.toml

@@ -4,6 +4,12 @@ title: Changelog
 
 # Changelog
 
+### 2.4.3 <small>Nov 15, 2025</small> { id="2.4.3" }
+
+**Bug Fixes:**
+- Fixed handling of nested transactions via `SAVEPOINT`: auto-rollback now correctly rolls back to the savepoint instead of breaking the outer transaction. This prevents clients from getting stuck in an inconsistent transactional state.
+
+
 ### 2.4.2 <small>Nov 13, 2025</small> { id="2.4.2" }
 
 **Improvements:**

documentation/docs/changelog.md

@@ -315,6 +315,9 @@ pub struct Server {
     /// Is the server inside a transaction and aborted.
     is_aborted: bool,
 
+    /// Nested transaction level, e.g. if we're in a transaction, then we're in level > 1.
+    nested_transaction_level: i32,
+
     /// Is there more data for the client to read.
     data_available: bool,
 
@@ -524,12 +527,14 @@ impl Server {
                     match transaction_state {
                         // In transaction.
                         'T' => {
+                            self.nested_transaction_level += 1;
                             self.is_aborted = false;
                             self.in_transaction = true;
                         }
 
                         // Idle, transaction over.
                         'I' => {
+                            self.nested_transaction_level -= 1;
                             self.is_aborted = false;
                             self.in_transaction = false;
                         }
@@ -845,9 +850,11 @@ impl Server {
         self.in_transaction
     }
 
+    /// If the server is in a transaction and the transaction was aborted.
+    /// If the client disconnects while the server is in a transaction, we will clean it up.
     #[inline(always)]
     pub fn in_aborted(&self) -> bool {
-        self.in_transaction && self.is_aborted
+        self.in_transaction && self.is_aborted && self.nested_transaction_level == 1
     }
 
     #[inline(always)]
@@ -929,6 +936,9 @@ impl Server {
             }
             self.cleanup_state.reset();
         }
+        self.nested_transaction_level = 0;
+        self.in_transaction = false;
+        self.is_aborted = false;
         Ok(())
     }
 
@@ -1578,6 +1588,7 @@ impl Server {
                         secret_key,
                         in_transaction: false,
                         is_aborted: false,
+                        nested_transaction_level: 0,
                         in_copy_mode: false,
                         data_available: false,
                         bad: false,

src/server.rs

@@ -0,0 +1,47 @@
+package doorman_test
+
+import (
+	"context"
+	"database/sql"
+	"os"
+	"testing"
+
+	"github.com/jackc/pgx/v4"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_RollbackSavePoint(t *testing.T) {
+	ctx := context.Background()
+	session, errOpen := pgx.Connect(ctx, os.Getenv("DATABASE_URL_ROLLBACK"))
+	assert.NoError(t, errOpen)
+	tx, errTx := session.Begin(ctx)
+	assert.NoError(t, errTx)
+	tx.Exec(ctx, `select 1`)
+	checkIdleInTx(t)
+	_, err := tx.Exec(ctx, `
+create table test_savepoint(id serial primary key, value integer);
+insert into test_savepoint(value) values (1);
+savepoint sp;
+insert into test_savepoint(value) values (2);
+`)
+	assert.NoError(t, err)
+	_, err = tx.Exec(ctx, `select * from test_savepoint_unknown;`)
+	assert.Error(t, err)
+	_, err = tx.Exec(ctx, `ROLLBACK TO SAVEPOINT sp;`)
+	assert.NoError(t, err)
+	checkIdleInTx(t)
+	var count int
+	assert.NoError(t, tx.QueryRow(ctx, `select count(*) from test_savepoint;`).Scan(&count))
+	assert.Equal(t, count, 1)
+	_, err = tx.Exec(ctx, `ROLLback /*kek*/;`)
+	assert.NoError(t, err)
+}
+
+func checkIdleInTx(t *testing.T) {
+	db, errOpenNew := sql.Open("postgres", os.Getenv("DATABASE_URL"))
+	assert.NoError(t, errOpenNew)
+	var count int
+	assert.NoError(t, db.QueryRow("select count(*) from pg_stat_activity where usename = 'example_user_rollback' and state = 'idle in transaction'").Scan(&count))
+	assert.Equal(t, 1, count)
+	_ = db.Close()
+}