Skip to content

Prepend jdbc: to DatabaseMetaData.getURL result #23397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tdcmeehan merged 1 commit into from
Aug 7, 2024
Merged

Prepend jdbc: to DatabaseMetaData.getURL result #23397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion presto-jdbc/src/main/java/com/facebook/presto/jdbc/PrestoDatabaseMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
public class PrestoDatabaseMetaData
implements DatabaseMetaData
{
private static final String JDBC_URL_START = "jdbc:";
private static final String SEARCH_STRING_ESCAPE = "\\";

private final PrestoConnection connection;
Expand Down Expand Up @@ -60,7 +61,7 @@ public boolean allTablesAreSelectable()
public String getURL()
throws SQLException
{
return connection.getURI().toString();
return JDBC_URL_START + connection.getURI().toString();
}

@Override
Expand Down
8 changes: 8 additions & 0 deletions presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestPrestoDatabaseMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,14 @@ public void testGetClientInfoProperties()
}
}

@Test
public void testGetUrl()
throws Exception
{
DatabaseMetaData metaData = connection.getMetaData();
assertEquals(metaData.getURL(), "jdbc:presto://" + server.getAddress());
}

private static void assertColumnSpec(ResultSet rs, int dataType, Long precision, Long numPrecRadix, String typeName)
throws SQLException
{
Expand Down
11 changes: 11 additions & 0 deletions presto-product-tests/src/main/java/com/facebook/presto/tests/jdbc/JdbcTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,17 @@ public void testDeallocate()
}
}

@Test(groups = JDBC)
@Requires(ImmutableNationTable.class)
public void testMetaDataGetURL()
throws SQLException
{
DatabaseMetaData metaData = metaData();
String url = metaData.getURL();
assertThat(url).startsWith("jdbc:presto://");
assertThat(url).isEqualTo(prestoJdbcURL);
}

private QueryResult queryResult(Statement statement, String query)
throws SQLException
{
Expand Down