This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch branch-1.2-lts in repository https://gitbox.apache.org/repos/asf/doris.git
commit 71df9d983c07b3bdabd27f693a620c937c9118d3 Author: yongkang.zhong <[email protected]> AuthorDate: Fri Apr 14 17:51:50 2023 +0800 [fix](trino catalog) To specify both catalog and database, run the show table command (#18645) * [fix](trino catalog) To specify both catalog and database, run the show table command * fix --- .../java/org/apache/doris/external/jdbc/JdbcClient.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClient.java b/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClient.java index 38a6f07b04..3b8e3d73f7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClient.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClient.java @@ -250,6 +250,7 @@ public class JdbcClient { String[] types = {"TABLE", "VIEW"}; try { DatabaseMetaData databaseMetaData = conn.getMetaData(); + String catalogName = conn.getCatalog(); switch (dbType) { case JdbcResource.MYSQL: rs = databaseMetaData.getTables(dbName, null, null, types); @@ -259,9 +260,11 @@ public class JdbcClient { case JdbcResource.CLICKHOUSE: case JdbcResource.SQLSERVER: case JdbcResource.SAP_HANA: - case JdbcResource.TRINO: rs = databaseMetaData.getTables(null, dbName, null, types); break; + case JdbcResource.TRINO: + rs = databaseMetaData.getTables(catalogName, dbName, null, types); + break; default: throw new JdbcClientException("Unknown database type"); } @@ -287,6 +290,7 @@ public class JdbcClient { String[] types = {"TABLE", "VIEW"}; try { DatabaseMetaData databaseMetaData = conn.getMetaData(); + String catalogName = conn.getCatalog(); switch (dbType) { case JdbcResource.MYSQL: rs = databaseMetaData.getTables(dbName, null, tableName, types); @@ -296,9 +300,11 @@ public class JdbcClient { case JdbcResource.CLICKHOUSE: case JdbcResource.SQLSERVER: case JdbcResource.SAP_HANA: - case JdbcResource.TRINO: rs = databaseMetaData.getTables(null, dbName, null, types); break; + case JdbcResource.TRINO: + rs = databaseMetaData.getTables(catalogName, dbName, null, types); + break; default: throw new JdbcClientException("Unknown database type: " + dbType); } @@ -350,6 +356,7 @@ public class JdbcClient { } try { DatabaseMetaData databaseMetaData = conn.getMetaData(); + String catalogName = conn.getCatalog(); // getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) // catalog - the catalog of this table, `null` means all catalogs // schema - The schema of the table; corresponding to tablespace in Oracle @@ -368,9 +375,11 @@ public class JdbcClient { case JdbcResource.CLICKHOUSE: case JdbcResource.SQLSERVER: case JdbcResource.SAP_HANA: - case JdbcResource.TRINO: rs = databaseMetaData.getColumns(null, dbName, tableName, null); break; + case JdbcResource.TRINO: + rs = databaseMetaData.getColumns(catalogName, dbName, tableName, null); + break; default: throw new JdbcClientException("Unknown database type"); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
