Stop sending Database to PG to default to username (#4643)

roji · web-flow · commit ee8a3782b51c · 2022-09-10T15:59:26.000Z
By @Brar
diff --git a/src/Npgsql/Internal/NpgsqlConnector.cs b/src/Npgsql/Internal/NpgsqlConnector.cs
@@ -536,8 +536,6 @@ static async Task OpenCore(
             await conn.RawOpen(sslMode, timeout, async, cancellationToken, isFirstAttempt);
 
             var username = conn.GetUsername();
-            if (conn.Settings.Database == null)
-                conn.Settings.Database = username;
 
             timeout.CheckAndApply(conn);
             conn.WriteStartupMessage(username);
@@ -680,10 +678,12 @@ void WriteStartupMessage(string username)
             ["user"] = username,
             ["client_encoding"] = Settings.ClientEncoding ??
                                   PostgresEnvironment.ClientEncoding ??
-                                  "UTF8",
-            ["database"] = Settings.Database!
+                                  "UTF8"
         };
 
+        if (Settings.Database is not null)
+            startupParams["database"] = Settings.Database;
+
         if (Settings.ApplicationName?.Length > 0)
             startupParams["application_name"] = Settings.ApplicationName;
 
