Skip to content

Commit 7b02b88

Browse files
authored
[PECO-2052] Return null in driver if jdbc url is not accepted (#562)
* return null if jdbc url is not accepted * modify integ test
1 parent 8d54184 commit 7b02b88

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/main/java/com/databricks/client/jdbc/Driver.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ public boolean acceptsURL(String url) {
4343

4444
@Override
4545
public Connection connect(String url, Properties info) throws DatabricksSQLException {
46+
if (!acceptsURL(url)) {
47+
// Return null connection if URL is not accepted - as per JDBC standard.
48+
return null;
49+
}
4650
IDatabricksConnectionContext connectionContext =
4751
DatabricksConnectionContextFactory.create(url, info);
4852

src/test/java/com/databricks/jdbc/integration/fakeservice/tests/ErrorHandlingIntegrationTests.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static com.databricks.jdbc.integration.IntegrationTestUtil.*;
44
import static org.junit.jupiter.api.Assertions.*;
55

6-
import com.databricks.jdbc.exception.DatabricksParsingException;
76
import com.databricks.jdbc.exception.DatabricksSQLException;
87
import com.databricks.jdbc.exception.DatabricksSQLFeatureNotSupportedException;
98
import com.databricks.jdbc.integration.fakeservice.AbstractFakeServiceIntegrationTests;
@@ -39,10 +38,8 @@ void testFailureToLoadDriver() {
3938
@Test
4039
void testInvalidURL() {
4140
Exception exception =
42-
assertThrows(
43-
DatabricksParsingException.class,
44-
() -> getConnection("jdbc:abcde://invalidhost:0000/db"));
45-
assertTrue(exception.getMessage().contains("Invalid url"));
41+
assertThrows(SQLException.class, () -> getConnection("jdbc:abcde://invalidhost:0000/db"));
42+
assertTrue(exception.getMessage().contains("No suitable driver found for"));
4643
}
4744

4845
@Test

0 commit comments

Comments
 (0)