Unbind the transaction for unpooled connections (#3689)

Fixes #3686
npgsql · Apr 29, 2021 · 17cdb2e · 17cdb2e
1 parent ea77317
commit 17cdb2e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/src/Npgsql/NpgsqlConnection.cs b/src/Npgsql/NpgsqlConnection.cs
@@ -787,7 +787,11 @@ async Task CloseAsync(CancellationToken cancellationToken)
                 else
                 {
                     if (_pool == null)
+                    {
+                        // We're already doing the same in the NpgsqlConnector.Reset for pooled connections
+                        connector.Transaction?.UnbindIfNecessary();
                         connector.Close();
+                    }
                     else
                     {
                         // Clear the buffer, roll back any pending transaction and prepend a reset message if needed

diff --git a/test/Npgsql.Tests/TransactionTests.cs b/test/Npgsql.Tests/TransactionTests.cs
@@ -613,6 +613,29 @@ public async Task AccessConnectionOnCompletedTransaction()
             Assert.That(tx.Connection, Is.SameAs(conn));
         }
 
+
+        [Test, IssueLink("https://github.com/npgsql/npgsql/issues/3686")]
+        public async Task Bug3686()
+        {
+            if (IsMultiplexing)
+                return;
+
+            var csb = new NpgsqlConnectionStringBuilder(ConnectionString)
+            {
+                Pooling = false
+            };
+
+            await using var conn = await OpenConnectionAsync(csb);
+            await using var tx = await conn.BeginTransactionAsync();
+            await conn.ExecuteNonQueryAsync("SELECT 1", tx);
+            await tx.CommitAsync();
+            await conn.CloseAsync();
+            Assert.DoesNotThrow(() =>
+            {
+                _ = tx.Connection;
+            });
+        }
+
         class NoTransactionDatabaseInfoFactory : INpgsqlDatabaseInfoFactory
         {
             public async Task<NpgsqlDatabaseInfo?> Load(NpgsqlConnection conn, NpgsqlTimeout timeout, bool async)