1.1.9 RELEASE

zhang-rf · Aug 20, 2018 · 6d470ed · 6d470ed
1 parent c8ebbb7
commit 6d470ed
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Mybatis SQL开发神器MybatisBoost，包含通用CrudMapper、Mybatis语法增
 <dependency>
     <groupId>cn.mybatisboost</groupId>
     <artifactId>mybatis-boost-spring-boot-starter</artifactId>
-    <version>1.1.8</version>
+    <version>1.1.9</version>
 </dependency>
 ```
 
@@ -128,6 +128,8 @@ SELECT * FROM POST WHERE ID IN #{ids} AND Name IN #{names}
 List<Post> select(@Param("ids") List<Integer> ids, @Param("names") List<Integer> names);
 ```
 
+需要注意的是，范围参数增强无法和MyBatis提供的"<foreach>"一起使用，使用"<foreach>"后，范围参数增强将失效。
+
 ### INSERT增强
 
 INSERT语法增强后，可使用如下3种语法编写INSERT语句，INSERT语法增强同样支持批量插入。

diff --git a/mybatis-boost-all/pom.xml b/mybatis-boost-all/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.mybatisboost</groupId>
         <artifactId>mybatis-boost</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
     </parent>
     <packaging>pom</packaging>
 

diff --git a/mybatis-boost-core/pom.xml b/mybatis-boost-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.mybatisboost</groupId>
         <artifactId>mybatis-boost</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
     </parent>
 
     <artifactId>mybatis-boost-core</artifactId>

diff --git a/mybatis-boost-lang/pom.xml b/mybatis-boost-lang/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.mybatisboost</groupId>
         <artifactId>mybatis-boost</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
     </parent>
 
     <artifactId>mybatis-boost-lang</artifactId>

diff --git a/mybatis-boost-lang/src/main/java/cn/mybatisboost/lang/provider/ListParameterEnhancement.java b/mybatis-boost-lang/src/main/java/cn/mybatisboost/lang/provider/ListParameterEnhancement.java
@@ -7,32 +7,61 @@
 import org.apache.ibatis.mapping.ParameterMapping;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.SystemMetaObject;
+import org.apache.ibatis.scripting.xmltags.DynamicSqlSource;
+import org.apache.ibatis.scripting.xmltags.ForEachSqlNode;
+import org.apache.ibatis.scripting.xmltags.MixedSqlNode;
+import org.apache.ibatis.scripting.xmltags.SqlNode;
 import org.apache.ibatis.session.Configuration;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.regex.Matcher;
 
 public class ListParameterEnhancement implements SqlProvider {
 
+    private static ConcurrentMap<String, Boolean> filterCache = new ConcurrentHashMap<>();
+
     @Override
     public void replace(MetaObject metaObject, MappedStatement mappedStatement, BoundSql boundSql) {
-        org.apache.ibatis.session.Configuration configuration =
-                (org.apache.ibatis.session.Configuration) metaObject.getValue("delegate.configuration");
+        if (filter(mappedStatement)) {
+            org.apache.ibatis.session.Configuration configuration =
+                    (org.apache.ibatis.session.Configuration) metaObject.getValue("delegate.configuration");
 
-        Map<Integer, List<?>> listMap =
-                getLists(boundSql.getParameterObject(), boundSql.getParameterMappings(), configuration);
-        if (!listMap.isEmpty()) {
-            StringBuilder sqlBuilder = new StringBuilder(boundSql.getSql());
-            replacePlaceholders(listMap, sqlBuilder);
-            metaObject.setValue("delegate.boundSql.sql",
-                    String.format(sqlBuilder.toString(), buildNewPlaceholders(listMap)));
-            refreshParameterMappings(boundSql.getParameterMappings(), configuration, listMap);
+            Map<Integer, List<?>> listMap =
+                    getLists(boundSql.getParameterObject(), boundSql.getParameterMappings(), configuration);
+            if (!listMap.isEmpty()) {
+                StringBuilder sqlBuilder = new StringBuilder(boundSql.getSql());
+                replacePlaceholders(listMap, sqlBuilder);
+                metaObject.setValue("delegate.boundSql.sql",
+                        String.format(sqlBuilder.toString(), buildNewPlaceholders(listMap)));
+                refreshParameterMappings(boundSql.getParameterMappings(), configuration, listMap);
+            }
         }
     }
 
+    @SuppressWarnings("unchecked")
+    private boolean filter(MappedStatement mappedStatement) {
+        return filterCache.computeIfAbsent(mappedStatement.getId(), k -> {
+            if (mappedStatement.getSqlSource() instanceof DynamicSqlSource) {
+                SqlNode rootSqlNode = (SqlNode)
+                        SystemMetaObject.forObject(mappedStatement.getSqlSource()).getValue("rootSqlNode");
+                if (rootSqlNode instanceof ForEachSqlNode) return false;
+                if (rootSqlNode instanceof MixedSqlNode) {
+                    List<SqlNode> contents = (List<SqlNode>)
+                            SystemMetaObject.forObject(rootSqlNode).getValue("contents");
+                    for (SqlNode sqlNode : contents) {
+                        if (sqlNode instanceof ForEachSqlNode) return false;
+                    }
+                }
+            }
+            return true;
+        });
+    }
+
     private Map<Integer, List<?>> getLists(Object parameterObject, List<ParameterMapping> parameterMappings,
                                            org.apache.ibatis.session.Configuration configuration) {
         Map<Integer, List<?>> listMap = new HashMap<>();

diff --git a/mybatis-boost-limiter/pom.xml b/mybatis-boost-limiter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.mybatisboost</groupId>
         <artifactId>mybatis-boost</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
     </parent>
 
     <artifactId>mybatis-boost-limiter</artifactId>

diff --git a/mybatis-boost-mapper/pom.xml b/mybatis-boost-mapper/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.mybatisboost</groupId>
         <artifactId>mybatis-boost</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
     </parent>
 
     <artifactId>mybatis-boost-mapper</artifactId>

diff --git a/mybatis-boost-metric/pom.xml b/mybatis-boost-metric/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.mybatisboost</groupId>
         <artifactId>mybatis-boost</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
     </parent>
 
     <artifactId>mybatis-boost-metric</artifactId>

diff --git a/mybatis-boost-spring-boot-autoconfigure/pom.xml b/mybatis-boost-spring-boot-autoconfigure/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.mybatisboost</groupId>
         <artifactId>mybatis-boost</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
     </parent>
 
     <artifactId>mybatis-boost-spring-boot-autoconfigure</artifactId>

diff --git a/mybatis-boost-spring-boot-starter/pom.xml b/mybatis-boost-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.mybatisboost</groupId>
         <artifactId>mybatis-boost</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
     </parent>
 
     <artifactId>mybatis-boost-spring-boot-starter</artifactId>

diff --git a/mybatis-boost-test/pom.xml b/mybatis-boost-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.mybatisboost</groupId>
         <artifactId>mybatis-boost</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
     </parent>
 
     <artifactId>mybatis-boost-test</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.mybatisboost</groupId>
     <artifactId>mybatis-boost</artifactId>
-    <version>1.1.8</version>
+    <version>1.1.9</version>
     <packaging>pom</packaging>
 
     <name>MybatisBoost</name>
@@ -48,7 +48,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
     </properties>
 
     <dependencyManagement>