From 7cdcc348f00d8af0b1d9d68ae6a9fc0a0907fc3e Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 3 Dec 2024 16:20:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=A4=8D=E6=9D=82SQL=E7=89=87=E6=AE=B5=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E5=A4=9A=E4=B8=AACTE=E6=89=A7=E8=A1=8C=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/dto/DatasourceRequest.java | 30 +------------------ 1 file changed, 1 insertion(+), 29 deletions(-) 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"; - } }