This is an automated email from the ASF dual-hosted git repository.
cgivre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new 93470268e3 Bump org.postgresql:postgresql from 42.4.4 to 42.7.11 in
/contrib/storage-jdbc (#3048)
93470268e3 is described below
commit 93470268e312edd5ba4c92475a2443324d14b38a
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Jun 23 13:38:06 2026 -0400
Bump org.postgresql:postgresql from 42.4.4 to 42.7.11 in
/contrib/storage-jdbc (#3048)
* Bump org.postgresql:postgresql in /contrib/storage-jdbc
Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from
42.4.4 to 42.7.11.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.4...REL42.7.11)
---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
dependency-version: 42.7.11
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <[email protected]>
* Keep JDBC schemas at top level with postgresql 42.7+
The PostgreSQL JDBC driver 42.7+ reports the connection's own database as
the
TABLE_CATALOG for DatabaseMetaData.getSchemas(), whereas 42.4.x reported
null.
JdbcCatalogSchema used that catalog value to nest schemas under their
catalog,
so "pg.public" silently became "pg.<database>.public". This broke every
Postgres
storage test ("Schema [pg.public] is not valid") and would have changed the
schema paths existing Drill users query.
When the driver reports catalogs other than the connection's own (as servers
like PostgreSQL do, listing sibling databases a single connection cannot
query
across), register the connection's own catalog's schemas at the plugin top
level
rather than nested under the catalog. This restores the pre-42.7 paths
without
any dialect-specific code. Single-catalog sources such as H2 keep their
existing
catalog nesting, so "h2.tmp.drill_h2_test" is unaffected.
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cgivre <[email protected]>
---
contrib/storage-jdbc/pom.xml | 2 +-
.../drill/exec/store/jdbc/JdbcCatalogSchema.java | 31 +++++++++++++++++++---
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/contrib/storage-jdbc/pom.xml b/contrib/storage-jdbc/pom.xml
index a7c889cd20..d9fb721c4d 100644
--- a/contrib/storage-jdbc/pom.xml
+++ b/contrib/storage-jdbc/pom.xml
@@ -34,7 +34,7 @@
<mysql.connector.version>8.4.0</mysql.connector.version>
<clickhouse.jdbc.version>0.3.1</clickhouse.jdbc.version>
<h2.version>2.2.220</h2.version>
- <postgresql.version>42.4.4</postgresql.version>
+ <postgresql.version>42.7.11</postgresql.version>
<mssql-jdbc.version>13.2.1.jre11</mssql-jdbc.version>
<jtds.version>1.3.1</jtds.version>
</properties>
diff --git
a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcCatalogSchema.java
b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcCatalogSchema.java
index 333544afb3..027e1ff9b6 100644
---
a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcCatalogSchema.java
+++
b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcCatalogSchema.java
@@ -50,11 +50,14 @@ class JdbcCatalogSchema extends AbstractSchema {
super(Collections.emptyList(), name);
this.schemaMap = new HashMap<>();
String connectionSchemaName = null;
+ String connectionCatalogName = null;
+ boolean hasForeignCatalog = false;
try (Connection con = source.getConnection();
ResultSet set = con.getMetaData().getCatalogs()) {
try {
connectionSchemaName = con.getSchema();
+ connectionCatalogName = con.getCatalog();
} catch (AbstractMethodError ex) {
// DRILL-8227. Some Sybase JDBC drivers still don't implement this
method, e.g. JConnect, jTDS.
logger.warn(
@@ -70,6 +73,10 @@ class JdbcCatalogSchema extends AbstractSchema {
continue;
}
+ if (connectionCatalogName == null ||
!catalogName.equalsIgnoreCase(connectionCatalogName)) {
+ hasForeignCatalog = true;
+ }
+
CapitalizingJdbcSchema schema = new CapitalizingJdbcSchema(
getSchemaPath(), catalogName, source, dialect, convention,
catalogName, null, caseSensitive);
schemaMap.put(schema.getName(), schema);
@@ -78,11 +85,20 @@ class JdbcCatalogSchema extends AbstractSchema {
logger.warn("Failure while attempting to load JDBC schema.", e);
}
+ // When the driver reports catalogs other than the connection's own, the
catalog (database)
+ // level is not navigable within a single connection (e.g. PostgreSQL,
where each connection is
+ // bound to one database). In that case register the connection's own
catalog's schemas at the
+ // plugin top level (e.g. "pg.public") instead of nested under the catalog
("pg.<database>.public").
+ // Older drivers achieved this by reporting a null catalog from
getSchemas(); some newer ones
+ // (e.g. PostgreSQL JDBC 42.7+) report the database instead, which would
otherwise change the
+ // schema path. Single-catalog sources such as H2 keep the existing
catalog nesting.
+ String catalogToFlatten = hasForeignCatalog ? connectionCatalogName : null;
+
// unable to read catalog list.
if (schemaMap.isEmpty()) {
// try to add a list of schemas to the schema map.
- boolean schemasAdded = addSchemas(source, dialect, convention,
caseSensitive);
+ boolean schemasAdded = addSchemas(source, dialect, convention,
caseSensitive, catalogToFlatten);
if (!schemasAdded) {
// there were no schemas, just create a default one (the jdbc system
doesn't support catalogs/schemas).
@@ -91,7 +107,7 @@ class JdbcCatalogSchema extends AbstractSchema {
}
} else {
// We already have catalogs. Add schemas in this context of their
catalogs.
- addSchemas(source, dialect, convention, caseSensitive);
+ addSchemas(source, dialect, convention, caseSensitive, catalogToFlatten);
}
defaultSchema = determineDefaultSchema(connectionSchemaName);
@@ -114,13 +130,20 @@ class JdbcCatalogSchema extends AbstractSchema {
}
}
- private boolean addSchemas(DataSource source, SqlDialect dialect,
DrillJdbcConvention convention, boolean caseSensitive) {
+ private boolean addSchemas(DataSource source, SqlDialect dialect,
DrillJdbcConvention convention,
+ boolean caseSensitive, String catalogToFlatten) {
boolean added = false;
try (Connection con = source.getConnection();
ResultSet set = con.getMetaData().getSchemas()) {
while (set.next()) {
final String schemaName = set.getString(1);
- final String catalogName = set.getString(2);
+ String catalogName = set.getString(2);
+
+ // Hoist the connection's own catalog's schemas to the plugin top
level (see the catalog
+ // loop above) by dropping the catalog so they are not nested under it.
+ if (catalogToFlatten != null &&
catalogToFlatten.equalsIgnoreCase(catalogName)) {
+ catalogName = null;
+ }
String parentKey = StringUtils.lowerCase(catalogName);
CapitalizingJdbcSchema parentSchema = schemaMap.get(parentKey);
