Skip to content

[CALCITE-2733] Use catalog and schema from JDBC connection string to … #962

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

Closed
jcamachor wants to merge 1 commit into from
Closed

[CALCITE-2733] Use catalog and schema from JDBC connection string to … #962

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
12 changes: 12 additions & 0 deletions core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,18 @@ private ImmutableMap<String, JdbcTable> computeTables() {
try {
connection = dataSource.getConnection();
DatabaseMetaData metaData = connection.getMetaData();
String catalog;
String schema;
if (metaData.getJDBCMajorVersion() > 4
|| (metaData.getJDBCMajorVersion() == 4 && metaData.getJDBCMinorVersion() >= 1)) {
// From JDBC 4.1, catalog and schema can be retrieved from the connection object,
// hence try to get it from there if it was not specified by user
catalog = Util.first(this.catalog, connection.getCatalog());
schema = Util.first(this.schema, connection.getSchema());
} else {
catalog = this.catalog;
schema = this.schema;
}
resultSet = metaData.getTables(
catalog,
schema,
Expand Down