Merge pull request #777 from tianlu-root/master

fix: variable ignore case bug fix

Author: scottsut

data-providers/src/main/java/datart/data/provider/calcite/SqlVariableVisitor.java

@@ -24,6 +24,7 @@
 import org.apache.calcite.sql.*;
 import org.apache.calcite.sql.util.SqlBasicVisitor;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;
 
@@ -131,6 +132,9 @@ private void createVariablePlaceholders(SqlCall logicExpressionCall, Set<SqlIden
             if (variable != null) {
                 variables.add(variable);
             }
+            if (!StringUtils.containsIgnoreCase(originalSqlFragment, identifier.toString())) {
+                variablePlaceholders.add(new SimpleVariablePlaceholder(variable, sqlDialect, identifier.toString()));
+            }
         }
         variablePlaceholders.add(new VariablePlaceholder(variables, sqlDialect, logicExpressionCall, originalSqlFragment));
     }

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

@@ -169,9 +169,10 @@ public String replaceVariables(String selectSql) throws SqlParseException {
         if (CollectionUtils.isNotEmpty(placeholders)) {
             for (VariablePlaceholder placeholder : placeholders) {
                 ReplacementPair replacementPair = placeholder.replacementPair();
-                selectSql = selectSql.replace(replacementPair.getPattern(), replacementPair.getReplacement());
+                selectSql = StringUtils.replaceIgnoreCase(selectSql,replacementPair.getPattern(),replacementPair.getReplacement());
             }
         }
+
         return selectSql;
     }