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; } }