Merge pull request #1445 from xiaohuangdou666/develop

fix: permanent share and enable special SQL
running-elephant · Jun 14, 2022 · de390ce · de390ce
2 parents 651d396 + 5ea23b4
commit de390ce
Show file tree

Hide file tree

Showing 28 changed files with 609 additions and 44 deletions.
diff --git a/core/src/main/java/datart/core/common/Application.java b/core/src/main/java/datart/core/common/Application.java
@@ -131,22 +131,23 @@ public static Boolean isInitialized() {
         if (initialized != null) {
             return initialized;
         }
+        updateInitialized();
+        return initialized;
+    }
+
+    public static void updateInitialized() {
         UserMapperExt userMapper = getBean(UserMapperExt.class);
         if (getCurrMode().equals(PLATFORM)) {
             initialized = userMapper.selectUserCount()>0;
-            return initialized;
         }
         OrganizationMapperExt orgMapper = getBean(OrganizationMapperExt.class);
         List<Organization> organizations = orgMapper.list();
         int orgCount = CollectionUtils.size(organizations);
         if (orgCount==0) {
             initialized = false;
-            return initialized;
         } else if (orgCount==1) {
             List<User> users = orgMapper.listOrgMembers(organizations.get(0).getId());
             initialized = users.stream().anyMatch(item -> getAdminId().equals(item.getId()));
         }
-        return initialized;
     }
-
 }
diff --git a/...ta-provider/src/main/java/datart/data/provider/jdbc/adapters/JdbcDataProviderAdapter.java b/...ta-provider/src/main/java/datart/data/provider/jdbc/adapters/JdbcDataProviderAdapter.java
@@ -156,7 +156,7 @@ public Set<Column> readTableColumn(String database, String table) throws SQLExce
     }
 
     public String getQueryKey(QueryScript script, ExecuteParam executeParam) throws SqlParseException {
-        SqlScriptRender render = new SqlScriptRender(script, executeParam, getSqlDialect());
+        SqlScriptRender render = new SqlScriptRender(script, executeParam, getSqlDialect(), jdbcProperties.isEnableSpecialSql());
         return "Q" + DigestUtils.md5Hex(render.render(true, true, true));
     }
 

diff --git a/...a-provider/src/main/java/datart/data/provider/jdbc/adapters/MsSqlDataProviderAdapter.java b/...a-provider/src/main/java/datart/data/provider/jdbc/adapters/MsSqlDataProviderAdapter.java
@@ -2,7 +2,7 @@
 
 import datart.core.base.PageInfo;
 import datart.core.data.provider.Dataframe;
-import datart.data.provider.calcite.SqlNodeUtils;
+import datart.data.provider.script.SqlStringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.sql.*;
@@ -43,7 +43,7 @@ public int executeCountSql(String sql) throws SQLException {
 
     @Override
     protected Dataframe execute(String selectSql, PageInfo pageInfo) throws SQLException {
-        selectSql = SqlNodeUtils.rebuildSqlWithFragment(selectSql);
+        selectSql = SqlStringUtils.rebuildSqlWithFragment(selectSql);
         return super.execute(selectSql, pageInfo);
     }
 }
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/SqlNodeUtils.java b/data-providers/src/main/java/datart/data/provider/calcite/SqlNodeUtils.java
@@ -33,14 +33,10 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 public class SqlNodeUtils {
 
-    public static final String REG_WITH_SQL_FRAGMENT = "((?i)WITH[\\s\\S]+(?i)AS?\\s*\\([\\s\\S]+\\))\\s*(?i)SELECT";
-
     public static SqlBasicCall createSqlBasicCall(SqlOperator sqlOperator, List<SqlNode> sqlNodes) {
         if (sqlNodes == null) {
             return null;
@@ -161,24 +157,4 @@ public static String toSql(SqlNode sqlNode, SqlDialect dialect, boolean quoteIde
                         .withIndentation(0)).getSql();
     }
 
-    public static String rebuildSqlWithFragment(String sql) {
-        if (!sql.toLowerCase().startsWith("with")) {
-            Matcher matcher = Pattern.compile(REG_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);
-                    }
-                    String space = " ";
-                    sql = withFragment + space + sql;
-                    sql = sql.replaceAll(space + "{2,}", space);
-                }
-            }
-        }
-        return sql;
-    }
-
 }
diff --git a/data-providers/src/main/java/datart/data/provider/script/SqlStringUtils.java b/data-providers/src/main/java/datart/data/provider/script/SqlStringUtils.java
@@ -29,13 +29,17 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class SqlStringUtils {
 
     public static final String REG_SQL_SINGLE_LINE_COMMENT = "-{2,}.*([\r\n])";
 
     public static final String REG_SQL_MULTI_LINE_COMMENT = "/\\*+[\\s\\S]*\\*+/";
 
+    public static final String REG_WITH_SQL_FRAGMENT = "((?i)WITH[\\s\\S]+(?i)AS?\\s*\\([\\s\\S]+\\))\\s*(?i)SELECT";
+
     /**
      * 替换脚本中的表达式类型变量
      *
@@ -87,4 +91,29 @@ public static String cleanupSql(String sql) {
         return sql.trim();
     }
 
+    /**
+     * 处理sql with语句
+     * @param sql
+     * @return
+     */
+    public static String rebuildSqlWithFragment(String sql) {
+        if (!sql.toLowerCase().startsWith("with")) {
+            Matcher matcher = Pattern.compile(REG_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);
+                    }
+                    String space = " ";
+                    sql = withFragment + space + sql;
+                    sql = sql.replaceAll(space + "{2,}", space);
+                }
+            }
+        }
+        return sql;
+    }
+
 }
diff --git a/data-providers/src/test/java/datart/data/provider/sql/SqlScriptRenderTest.java b/data-providers/src/test/java/datart/data/provider/sql/SqlScriptRenderTest.java
@@ -22,12 +22,19 @@
 import datart.core.data.provider.QueryScript;
 import datart.data.provider.DataProviderTestApplication;
 import datart.data.provider.base.DataProviderException;
+import datart.data.provider.calcite.SqlFragment;
 import datart.data.provider.jdbc.SqlScriptRender;
 import datart.data.provider.sql.entity.SqlTestEntity;
 import datart.data.provider.sql.common.ParamFactory;
 import datart.data.provider.sql.examples.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.calcite.sql.SqlBasicCall;
+import org.apache.calcite.sql.SqlDialect;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.fun.SqlStdOperatorTable;
 import org.apache.calcite.sql.parser.SqlParseException;
+import org.apache.calcite.sql.parser.SqlParserPos;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -37,6 +44,8 @@
 @Slf4j
 public class SqlScriptRenderTest {
 
+    private static final String T = "DATART_VTABLE";
+
     @Test
     public void testNormalSqlTest() throws SqlParseException {
         validateTestSql(NormalSqlExamples.sqlList, false);
@@ -79,7 +88,8 @@ private void validateTestSql(List<SqlTestEntity> list, boolean enableSpecialSql)
             SqlScriptRender render = new SqlScriptRender(queryScript, sqlTest.getExecuteParam(), sqlTest.getSqlDialect(), enableSpecialSql);
             boolean withExecParam = sqlTest.getExecuteParam()!=null;
             String parsedSql = render.render(withExecParam, false, false);
-            boolean result = parsedSql.equals(sqlTest.getDesireSql());
+            sqlTest.setDesireSql(covertDesiredSql(sqlTest.getDesireSql(), sqlTest.getSqlDialect()));
+            boolean result = parsedSql.equalsIgnoreCase(sqlTest.getDesireSql());
             if (!result){
                 Exceptions.msg("sql validate failed! \n" + sqlTest +
                         " the parsed sql: "+parsedSql);
@@ -103,4 +113,11 @@ private void validateForbiddenSql(List<SqlTestEntity> list, boolean enableSpecia
         }
     }
 
+    private String covertDesiredSql(String sql, SqlDialect sqlDialect) {
+        SqlBasicCall sqlBasicCall = new SqlBasicCall(SqlStdOperatorTable.AS
+                , new SqlNode[]{new SqlFragment("( " + sql + " )"), new SqlIdentifier(T, SqlParserPos.ZERO.withQuoting(true))}
+                , SqlParserPos.ZERO);
+        return sqlBasicCall.toSqlString(sqlDialect).getSql().trim();
+    }
+
 }
diff --git a/security/pom.xml b/security/pom.xml
@@ -26,6 +26,15 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-oauth2-jose</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.bitbucket.b_c</groupId>
+            <artifactId>jose4j</artifactId>
+            <version>0.7.12</version>
+        </dependency>
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>dingtalk</artifactId>