diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceRequest.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceRequest.java index e8392f7655..f2633ae56f 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceRequest.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/DatasourceRequest.java @@ -1,12 +1,10 @@ package io.dataease.extensions.datasource.dto; import lombok.Data; -import org.springframework.util.StringUtils; import java.io.Serializable; import java.util.List; import java.util.Map; -import java.util.regex.Matcher; import java.util.regex.Pattern; @Data @@ -31,36 +29,10 @@ public class DatasourceRequest implements Serializable { } public String getQuery() { - return this.rebuildSqlWithFragment(this.query); + return this.query; } public void setQuery(String query) { this.query = query; } - - private String rebuildSqlWithFragment(String sql) { - if (!sql.toLowerCase().startsWith("with")) { - Matcher matcher = this.WITH_SQL_FRAGMENT.matcher(sql); - if (matcher.find()) { - String withFragment = matcher.group(); - if (!StringUtils.isEmpty(withFragment)) { - if (withFragment.length() > 6) { - int lastSelectIndex = withFragment.length() - 6; - sql = sql.replace(withFragment, withFragment.substring(lastSelectIndex)); - withFragment = withFragment.substring(0, lastSelectIndex); - } - - sql = withFragment + " " + sql; - sql = sql.replaceAll(" {2,}", " "); - } - } - } - - return sql; - } - - public String getREG_WITH_SQL_FRAGMENT() { - this.getClass(); - return "((?i)WITH[\\s\\S]+(?i)AS?\\s*\\([\\s\\S]+\\))\\s*(?i)SELECT"; - } }