init: Don't set username on upgrade if database.type is JDBC

The username may already appear in the url and be working correctly
from a prior installation.  Setting database.username will confuse
Gerrit when it tries to connect without a matching database.password.

Bug: issue 1870
Change-Id: Ib25b48bd8587562e56613815f497efab850a80e8

1 files changed, 2 insertions, 1 deletions

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java
index ac3e7287a3..20034c121e 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java
@@ -21,10 +21,11 @@ import com.google.common.base.Strings;
 class JDBCInitializer implements DatabaseConfigInitializer {
   @Override
   public void initConfig(Section database) {
+    boolean hasUrl = Strings.emptyToNull(database.get("url")) != null;
     database.string("URL", "url", null);
     guessDriver(database);
     database.string("Driver class name", "driver", null);
-    database.string("Database username", "username", username());
+    database.string("Database username", "username", hasUrl ? null : username());
     database.password("username", "password");
   }