public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-18 05:18:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 代码重复错误

Browse Source
This commit is contained in:
tjlygdx
2026-06-16 15:55:35 +08:00
parent 6bb3dd998b
commit cab38e3f0b
2 changed files with 5 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java
View File

@@ -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("."));
}
}

5
core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
View File

@@ -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<String> getSchema(DatasourceRequest datasourceRequest) {
List<String> schemas = new ArrayList<>();