From 81e05b6b2818141af7b3f01a9c403d8a1b3dc066 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 26 Feb 2024 12:27:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20PG=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E4=BD=BF=E7=94=A8=E5=AE=9A=E6=97=B6=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=EF=BC=8C=E6=95=B0=E6=8D=AE=E9=87=8F=E8=B6=85=E8=BF=87?= =?UTF-8?q?50000=E6=97=B6=EF=BC=8C=E6=9C=89=E5=8F=AF=E8=83=BD=E4=BC=9A?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E6=95=B0=E6=8D=AE=20#6177?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/provider/datasource/JdbcProvider.java | 11 ++++++----- .../dataease/provider/query/pg/PgQueryProvider.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index d65859da8e..80218717d1 100644 --- a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -436,6 +436,7 @@ public class JdbcProvider extends DefaultJdbcProvider { int queryTimeout = jdbcConfiguration.getQueryTimeout() > 0 ? jdbcConfiguration.getQueryTimeout() : 0; try (Connection con = getConnection(datasourceRequest); Statement statement = getStatement(con, queryTimeout); ResultSet resultSet = statement.executeQuery(queryStr)) { } catch (Exception e) { + e.printStackTrace(); LogUtil.error("Datasource is invalid: " + datasourceRequest.getDatasource().getName(), e); DataEaseException.throwException(e.getMessage()); } @@ -580,11 +581,11 @@ public class JdbcProvider extends DefaultJdbcProvider { if (isDefaultClassLoader(customDriver)) { driverClassName = defaultDriver; jdbcClassLoader = extendedJdbcClassLoader; - for (DataSourceType value : SpringContextUtil.getApplicationContext().getBeansOfType(DataSourceType.class).values()) { - if (value.getType().equalsIgnoreCase(datasourceRequest.getDatasource().getType())) { - surpportVersions = value.getSurpportVersions(); - } - } +// for (DataSourceType value : SpringContextUtil.getApplicationContext().getBeansOfType(DataSourceType.class).values()) { +// if (value.getType().equalsIgnoreCase(datasourceRequest.getDatasource().getType())) { +// surpportVersions = value.getSurpportVersions(); +// } +// } } else { if (deDriver == null) { deDriver = deDriverMapper.selectByPrimaryKey(customDriver); diff --git a/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java index 2ed3b324b6..641f59acdb 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java @@ -993,7 +993,7 @@ public class PgQueryProvider extends QueryProvider { String tableWithSchema = String.format(PgConstants.KEYWORD_TABLE, schema) + "." + String.format(PgConstants.KEYWORD_TABLE, sql); return "SELECT COUNT(*) from " + tableWithSchema; } else { - return "SELECT COUNT(*) from ( " + sqlFix(sql) + " ) DE_COUNT_TEMP"; + return null; } }