Core: check catalog and schema for JdbcCatalog initialization

apache · Dec 24, 2024 · 71d0c9f · 71d0c9f
1 parent dbd7d1c
commit 71d0c9f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core/src/main/java/org/apache/iceberg/jdbc/JdbcCatalog.java b/core/src/main/java/org/apache/iceberg/jdbc/JdbcCatalog.java
@@ -162,8 +162,8 @@ private void initializeCatalogTables() {
             DatabaseMetaData dbMeta = conn.getMetaData();
             ResultSet tableExists =
                 dbMeta.getTables(
-                    null /* catalog name */,
-                    null /* schemaPattern */,
+                    conn.getCatalog() /* catalog name */,
+                    conn.getSchema() /* schemaPattern */,
                     JdbcUtil.CATALOG_TABLE_VIEW_NAME /* tableNamePattern */,
                     null /* types */);
             if (tableExists.next()) {
@@ -181,8 +181,8 @@ private void initializeCatalogTables() {
             DatabaseMetaData dbMeta = conn.getMetaData();
             ResultSet tableExists =
                 dbMeta.getTables(
-                    null /* catalog name */,
-                    null /* schemaPattern */,
+                    conn.getCatalog() /* catalog name */,
+                    conn.getSchema() /* schemaPattern */,
                     JdbcUtil.NAMESPACE_PROPERTIES_TABLE_NAME /* tableNamePattern */,
                     null /* types */);