From 4b13d91741e7b0f7fc81a859c477723dd4ca9c8b Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 5 Aug 2024 17:21:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=8E=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=9A=84ck=E8=8E=B7=E5=8F=96=E8=A1=A8=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/provider/CalciteProvider.java | 21 +++++++++++++------ .../datasource/dto/DatasourceRequest.java | 1 + 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java index 94de6a954c..a6ff053f04 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java @@ -98,15 +98,18 @@ public class CalciteProvider extends Provider { @Override public List getTables(DatasourceRequest datasourceRequest) { List tables = new ArrayList<>(); - List tablesSqls = getTablesSql(datasourceRequest); - for (String tablesSql : tablesSqls) { - try (ConnectionObj con = getConnection(datasourceRequest.getDatasource()); Statement statement = getStatement(con.getConnection(), 30); ResultSet resultSet = statement.executeQuery(tablesSql)) { + + try (ConnectionObj con = getConnection(datasourceRequest.getDatasource()); Statement statement = getStatement(con.getConnection(), 30)) { + datasourceRequest.setDsVersion(con.getConnection().getMetaData().getDatabaseMajorVersion()); + List tablesSqls = getTablesSql(datasourceRequest); + for (String tablesSql : tablesSqls) { + ResultSet resultSet = statement.executeQuery(tablesSql); while (resultSet.next()) { tables.add(getTableDesc(datasourceRequest, resultSet)); } - } catch (Exception e) { - DEException.throwException(e.getMessage()); } + } catch (Exception e) { + DEException.throwException(e.getMessage()); } return tables; } @@ -237,6 +240,7 @@ public class CalciteProvider extends Provider { ResultSet resultSet = null; try (ConnectionObj con = getConnection(datasourceRequest.getDatasource()); Statement statement = getStatement(con.getConnection(), 30)) { + datasourceRequest.setDsVersion(con.getConnection().getMetaData().getDatabaseMajorVersion()); if (datasourceRequest.getDatasource().getType().equalsIgnoreCase("mongo") || datasourceRequest.getDatasource().getType().equalsIgnoreCase("doris")) { resultSet = statement.executeQuery("select * from " + table + " limit 0 offset 0 "); return fetchResultField(resultSet); @@ -1054,7 +1058,12 @@ public class CalciteProvider extends Provider { String[] databasePrams = matcher.group(3).split("\\?"); database = databasePrams[0]; } - tableSqls.add("SELECT name, comment FROM system.tables where database='DATABASE';".replace("DATABASE", database)); + if(datasourceRequest.getDsVersion() < 22){ + tableSqls.add("SELECT name, name FROM system.tables where database='DATABASE';".replace("DATABASE", database)); + }else { + tableSqls.add("SELECT name, comment FROM system.tables where database='DATABASE';".replace("DATABASE", database)); + } + break; default: diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceRequest.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceRequest.java index 35ccb28633..1eb97c02a9 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceRequest.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceRequest.java @@ -15,6 +15,7 @@ public class DatasourceRequest implements Serializable { protected String query; protected String table; protected DatasourceDTO datasource; + private Integer dsVersion; private Integer pageSize; private Integer page; private Integer realSize;