diff --git a/common/src/main/java/com/tencent/supersonic/common/jsqlparser/ParseVisitorHelper.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/ParseVisitorHelper.java index 6b9970a42..3a6d19c50 100644 --- a/common/src/main/java/com/tencent/supersonic/common/jsqlparser/ParseVisitorHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/ParseVisitorHelper.java @@ -1,5 +1,6 @@ package com.tencent.supersonic.common.jsqlparser; +import com.tencent.supersonic.common.util.StringUtil; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.schema.Column; import org.apache.commons.lang3.StringUtils; @@ -14,7 +15,7 @@ public class ParseVisitorHelper { public void replaceColumn( Column column, Map fieldNameMap, boolean exactReplace) { - String columnName = column.getColumnName(); + String columnName = StringUtil.replaceBackticks(column.getColumnName()); String replaceColumn = getReplaceValue(columnName, fieldNameMap, exactReplace); if (StringUtils.isNotBlank(replaceColumn)) { column.setColumnName(replaceColumn); diff --git a/common/src/main/java/com/tencent/supersonic/common/util/StringUtil.java b/common/src/main/java/com/tencent/supersonic/common/util/StringUtil.java index 36ce4cce6..8ad0c33ec 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/StringUtil.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/StringUtil.java @@ -46,6 +46,9 @@ public class StringUtil { } public static String replaceBackticks(String sql) { + if (StringUtils.isBlank(sql)) { + return sql; + } return sql.replaceAll("`", ""); } } diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/HavingCorrector.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/HavingCorrector.java index 4174dd014..381e8231b 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/HavingCorrector.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/HavingCorrector.java @@ -66,6 +66,5 @@ public class HavingCorrector extends BaseSemanticCorrector { SqlAddHelper.addFunctionToSelect(correctS2SQL, havingExpressionList); semanticParseInfo.getSqlInfo().setCorrectedS2SQL(replaceSql); } - return; } }