diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java b/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java index 7e641c124a..7695893ad0 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java @@ -43,19 +43,11 @@ public class TableUtils { } public static String getTableAndAlias(SQLObj sqlObj, DsTypeDTO datasourceType, boolean isCross) { - String schema = ""; - String prefix = ""; - String suffix = ""; - if (StringUtils.isNotEmpty(sqlObj.getTableSchema())) { - if (isCross) { - prefix = "`"; - suffix = "`"; - } else { - prefix = datasourceType.getPrefix(); - suffix = datasourceType.getSuffix(); - } - schema = quoteIdentifier(sqlObj.getTableSchema(), prefix, suffix) + "."; - } + String prefix = isCross ? Quoting.BACK_TICK.string : datasourceType.getPrefix(); + String suffix = isCross ? Quoting.BACK_TICK.string : datasourceType.getSuffix(); + String schema = StringUtils.isNotEmpty(sqlObj.getTableSchema()) + ? quoteIdentifier(sqlObj.getTableSchema(), prefix, suffix) + "." + : ""; return schema + quoteIdentifier(sqlObj.getTableName(), prefix, suffix) + " " + sqlObj.getTableAlias(); } @@ -81,44 +73,4 @@ public class TableUtils { .map(part -> quoteIdentifier(part, prefix, suffix)) .collect(Collectors.joining(".")); } - - public static String quoteIdentifier(String name, String prefix, String suffix) { - String resolvedPrefix = StringUtils.defaultString(prefix); - String resolvedSuffix = StringUtils.defaultString(suffix); - if (StringUtils.isEmpty(resolvedPrefix) && StringUtils.isEmpty(resolvedSuffix)) { - resolvedPrefix = Quoting.BACK_TICK.string; - resolvedSuffix = Quoting.BACK_TICK.string; - } - String escapedName = StringUtils.defaultString(name); - if (StringUtils.isNotEmpty(resolvedSuffix)) { - escapedName = escapedName.replace(resolvedSuffix, resolvedSuffix + resolvedSuffix); - } - return resolvedPrefix + escapedName + resolvedSuffix; - } - - public static String quoteCompoundIdentifier(String name, String prefix, String suffix) { - return Arrays.stream(StringUtils.defaultString(name).split("\\.", -1)) - .map(part -> quoteIdentifier(part, prefix, suffix)) - .collect(Collectors.joining(".")); - } - - public static String quoteIdentifier(String name, String prefix, String suffix) { - String resolvedPrefix = StringUtils.defaultString(prefix); - String resolvedSuffix = StringUtils.defaultString(suffix); - if (StringUtils.isEmpty(resolvedPrefix) && StringUtils.isEmpty(resolvedSuffix)) { - resolvedPrefix = Quoting.BACK_TICK.string; - resolvedSuffix = Quoting.BACK_TICK.string; - } - String escapedName = StringUtils.defaultString(name); - if (StringUtils.isNotEmpty(resolvedSuffix)) { - escapedName = escapedName.replace(resolvedSuffix, resolvedSuffix + resolvedSuffix); - } - return resolvedPrefix + escapedName + resolvedSuffix; - } - - public static String quoteCompoundIdentifier(String name, String prefix, String suffix) { - return Arrays.stream(StringUtils.defaultString(name).split("\\.", -1)) - .map(part -> quoteIdentifier(part, prefix, suffix)) - .collect(Collectors.joining(".")); - } } 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 d9fcd3d529..f2b3629ea9 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 @@ -100,11 +100,6 @@ public class CalciteProvider extends Provider { } } - protected String buildOracleCurrentSchemaSql(String schema) { - String escapedSchema = StringUtils.defaultString(schema).replace("\"", "\"\""); - return "ALTER SESSION SET CURRENT_SCHEMA = \"" + escapedSchema + "\""; - } - @Override public List getSchema(DatasourceRequest datasourceRequest) { List schemas = new ArrayList<>();