Merge pull request #776 from tianlu-root/master

fix: sql parse fallback bug fix

Author: scottsut

data-providers/src/main/java/datart/data/provider/jdbc/RegexVariableResolver.java

@@ -43,41 +43,57 @@ public static List<VariablePlaceholder> resolve(SqlDialect sqlDialect, String sr
             return Collections.emptyList();
         }
 
-        List<VariablePlaceholder> placeholders = new LinkedList<>();
         Matcher matcher = Const.VARIABLE_PATTERN.matcher(srcSql);
+        Map<String, ScriptVariable> variablePlaceholderMap = new HashMap<>();
         while (matcher.find()) {
             String group = matcher.group();
             ScriptVariable scriptVariable = variableMap.get(group);
-            placeholders.add(createPlaceholder(sqlDialect, srcSql, group, scriptVariable));
+            variablePlaceholderMap.put(group, scriptVariable);
+        }
+        if (variablePlaceholderMap.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+
+        List<VariablePlaceholder> placeholders = new LinkedList<>();
+        for (Map.Entry<String, ScriptVariable> entry : variablePlaceholderMap.entrySet()) {
+            placeholders.addAll(createPlaceholder(sqlDialect, srcSql, entry.getKey(), entry.getValue()));
         }
         return placeholders;
 
     }
 
-    private static VariablePlaceholder createPlaceholder(SqlDialect sqlDialect, String sql, String variableFragment, ScriptVariable variable) {
+    private static List<VariablePlaceholder> createPlaceholder(SqlDialect sqlDialect, String sql, String variableFragment, ScriptVariable variable) {
 
-        String variableExpression = tryMatchVariableExpression(sql, variableFragment);
+        List<VariablePlaceholder> placeholders = new LinkedList<>();
 
-        SqlCall sqlCall = parseAsSqlCall(variableExpression, variableFragment);
+        List<String> variableExpressions = tryMatchVariableExpression(sql, variableFragment);
 
-        if (sqlCall == null) {
-            return new SimpleVariablePlaceholder(variable, sqlDialect, variableFragment);
-        } else {
-            return new VariablePlaceholder(Collections.singletonList(variable), sqlDialect, sqlCall, variableExpression);
+        if (!CollectionUtils.isEmpty(variableExpressions)) {
+            for (String expression : variableExpressions) {
+                SqlCall sqlCall = parseAsSqlCall(expression, variableFragment);
+                if (sqlCall != null) {
+                    placeholders.add(new VariablePlaceholder(Collections.singletonList(variable), sqlDialect, sqlCall, expression));
+                } else {
+                    placeholders.add(new SimpleVariablePlaceholder(variable, sqlDialect, variableFragment));
+                }
+            }
         }
-
+        return placeholders;
     }
 
 
-    private static String tryMatchVariableExpression(String sql, String variableFragment) {
+    private static List<String> tryMatchVariableExpression(String sql, String variableFragment) {
         String reg = String.format(REG_VARIABLE_EXPRESSION_TEMPLATE, variableFragment.replace("$", "\\$"));
         Pattern pattern = Pattern.compile(reg, Pattern.CASE_INSENSITIVE);
         Matcher matcher = pattern.matcher(sql);
-        if (matcher.find()) {
-            return matcher.group();
-        } else {
-            return null;
+
+        List<String> expressions = new LinkedList<>();
+
+        while (matcher.find()) {
+            expressions.add(matcher.group());
         }
+        return expressions;
     }
 
     public static SqlCall parseAsSqlCall(String variableExpression, String variableFragment) {

data-providers/src/main/java/datart/data/provider/jdbc/SqlScriptRender.java

@@ -46,6 +46,7 @@
 import org.apache.commons.lang3.CharUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -160,6 +161,11 @@ public String replaceVariables(String selectSql) throws SqlParseException {
             RequestContext.putWarning(MessageResolver.getMessage("message.provider.sql.parse.failed"), sqlParseError);
             placeholders = RegexVariableResolver.resolve(sqlDialect, selectSql, variableMap);
         }
+
+        placeholders = placeholders.stream()
+                .sorted(Comparator.comparingDouble(holder -> (holder instanceof SimpleVariablePlaceholder) ? 1000 + holder.getOriginalSqlFragment().length() : -holder.getOriginalSqlFragment().length()))
+                .collect(Collectors.toList());
+
         if (CollectionUtils.isNotEmpty(placeholders)) {
             for (VariablePlaceholder placeholder : placeholders) {
                 ReplacementPair replacementPair = placeholder.replacementPair();
@@ -234,4 +240,5 @@ private String cleanupSql(String sql) {
         return sql.trim();
     }
 
+
 }

data-providers/src/main/java/datart/data/provider/script/VariablePlaceholder.java

@@ -9,6 +9,7 @@
 import datart.data.provider.calcite.SqlValidateUtils;
 import datart.data.provider.calcite.custom.SqlSimpleStringLiteral;
 import datart.data.provider.jdbc.SqlScriptRender;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.calcite.sql.*;
 import org.apache.calcite.sql.fun.SqlLikeOperator;
@@ -29,6 +30,7 @@ public class VariablePlaceholder {
 
     protected final SqlCall sqlCall;
 
+    @Getter
     protected final String originalSqlFragment;
 
     public ReplacementPair replacementPair() {