[misc] handling connection error when no database is provided

mariadb-corporation · Aug 22, 2017 · 562aeb2 · 562aeb2
1 parent 39885f4
commit 562aeb2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java
@@ -621,7 +621,7 @@ private void additionalData() throws IOException, SQLException {
         sendPipelineCheckMaster();
         readPipelineCheckMaster();
 
-        if (options.createDatabaseIfNotExist) {
+        if (options.createDatabaseIfNotExist && !database.isEmpty()) {
             // Try to create the database if it does not exist
             String quotedDb = MariaDbConnection.quoteIdentifier(this.database);
             sendCreateDatabaseIfNotExist(quotedDb);
@@ -845,7 +845,7 @@ private long initializeClientCapabilities(long serverCapabilities) {
 
         // If a database is given, but createDatabaseIfNotExist is not defined or is false,
         // then just try to connect to the given database
-        if (database != null && !options.createDatabaseIfNotExist) {
+        if (!database.isEmpty() && !options.createDatabaseIfNotExist) {
             capabilities |= MariaDbServerCapabilities.CONNECT_WITH_DB;
         }
         return capabilities;

diff --git a/src/test/java/org/mariadb/jdbc/BaseTest.java b/src/test/java/org/mariadb/jdbc/BaseTest.java
@@ -205,7 +205,8 @@ public static void beforeClassBaseTest() throws SQLException {
     }
 
     private static void setUri() {
-        connU = "jdbc:mariadb://" + ((hostname == null) ? "localhost" : hostname) + ":" + port + "/" + database;
+        connU = "jdbc:mariadb://" + ((hostname == null) ? "localhost" : hostname) + ":" + port + "/"
+                + ((database == null) ? "" : database);
         connUri = connU + "?user=" + username
                 + (password != null && !"".equals(password) ? "&password=" + password : "")
                 + (parameters != null ? "&" + parameters : "");
@@ -511,15 +512,17 @@ protected Connection setConnection(String parameters) throws SQLException {
     }
 
     protected Connection setConnection(String additionnallParameters, String database) throws SQLException {
-        String connU = "jdbc:mariadb://" + ((hostname == null) ? "localhost" : hostname) + ":" + port + "/" + database;
+        String connU = "jdbc:mariadb://" + ((hostname == null) ? "localhost" : hostname) + ":" + port + "/"
+                + ((database == null) ? "" : database);
         String connUri = connU + "?user=" + username
                 + (password != null && !"".equals(password) ? "&password=" + password : "")
                 + (parameters != null ? "&" + parameters : "");
         return openConnection(connUri + additionnallParameters, null);
     }
 
     protected Connection setDnsConnection(String parameters) throws SQLException {
-        String connU = "jdbc:mariadb://mariadb.example.com:" + port + "/" + database;
+        String connU = "jdbc:mariadb://mariadb.example.com:" + port + "/"
+                + ((database == null) ? "" : database);
         String connUri = connU + "?user=" + username
                 + (password != null && !"".equals(password) ? "&password=" + password : "")
                 + (parameters != null ? "&" + parameters : "");