fixed custom database name

firebolt-db · Nov 16, 2023 · a329fab · a329fab
1 parent 8872eaf
commit a329fab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/com/firebolt/jdbc/connection/FireboltConnectionUserPassword.java b/src/main/java/com/firebolt/jdbc/connection/FireboltConnectionUserPassword.java
@@ -49,7 +49,10 @@ protected void authenticate() throws SQLException {
         String accessToken = getAccessToken(loginProperties).orElse(StringUtils.EMPTY);
         FireboltProperties propertiesWithAccessToken = loginProperties.toBuilder().accessToken(accessToken).build();
         Engine engine = fireboltEngineService.getEngine(propertiesWithAccessToken);
-        String database = loginProperties.isSystemEngine() ? loginProperties.getDatabase() : engine.getDatabase();
+        String database = loginProperties.getDatabase();
+        if (engine.getDatabase() != null) {
+           database = engine.getDatabase();
+        }
         this.sessionProperties = loginProperties.toBuilder().host(engine.getEndpoint()).engine(engine.getName()).database(database).build();
     }
 

diff --git a/src/test/java/com/firebolt/jdbc/client/query/StatementClientImplTest.java b/src/test/java/com/firebolt/jdbc/client/query/StatementClientImplTest.java
@@ -18,7 +18,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
@@ -66,7 +65,7 @@ void shouldPostSqlQueryWithExpectedUrl() throws FireboltException, IOException {
 	void shouldPostSqlQueryForSystemEngine() throws FireboltException, IOException {
 		String url = shouldPostSqlQueryForSystemEngine(true).getValue();
 		assertEquals(
-				"http://firebolt1:555/?account_id=12345&output_format=TabSeparatedWithNamesAndTypes",
+				"http://firebolt1:555/?database=db1&account_id=12345&output_format=TabSeparatedWithNamesAndTypes",
 				url);
 	}