Wrap connection exceptions in NpgsqlException

Closes npgsql#901
roji · Jun 17, 2019 · 68147c4 · 68147c4
1 parent 4ebb237
commit 68147c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Npgsql/NpgsqlConnector.cs b/src/Npgsql/NpgsqlConnector.cs
@@ -674,7 +674,7 @@ void Connect(NpgsqlTimeout timeout)
                     Log.Trace($"Failed to connect to {endpoint}", e);
 
                     if (i == endpoints.Length - 1)
-                        throw;
+                        throw new NpgsqlException("Exception while connecting", e);
                 }
             }
         }
@@ -737,7 +737,7 @@ await socket.ConnectAsync(endpoint)
 
                     if (i == endpoints.Length - 1)
                     {
-                        throw;
+                        throw new NpgsqlException("Exception while connecting", e);
                     }
                 }
             }

diff --git a/test/Npgsql.Tests/PoolTests.cs b/test/Npgsql.Tests/PoolTests.cs
@@ -322,7 +322,9 @@ public void PhysicalOpenFailure()
             using (var conn = new NpgsqlConnection(connString))
             {
                 for (var i = 0; i < 1; i++)
-                    Assert.That(() => conn.Open(), Throws.Exception.TypeOf<SocketException>());
+                    Assert.That(() => conn.Open(), Throws.Exception
+                        .TypeOf<NpgsqlException>()
+                        .With.InnerException.TypeOf<SocketException>());
                 Assert.True(PoolManager.TryGetValue(connString, out var pool));
                 AssertPoolState(pool, 0, 0);
             }