support SELECT_CONDITION_INNER

Author: Jarvis

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.ifrabbit</groupId>
     <artifactId>spring-data-mybatis</artifactId>
-    <version>1.0.12.RELEASE</version>
+    <version>1.0.13.RELEASE</version>
 
     <name>Spring Data MyBatis</name>
     <description>The primary goal of the Spring Data project is to make it easier to build Spring-powered applications

src/main/java/org/springframework/data/mybatis/repository/support/MybatisSimpleRepositoryMapperGenerator.java

@@ -279,6 +279,7 @@ private void buildDeleteByCondition(StringBuilder builder) {
         builder.append("<if test=\"_condition != null\">");
         builder.append("<trim prefix=\" where \" prefixOverrides=\"and |or \">");
         builder.append(buildCondition());
+        builder.append("<include refid=\"SELECT_CONDITION_INNER\" />");
         builder.append("</trim>");
         builder.append("</if>");
         builder.append("</delete>");
@@ -332,6 +333,7 @@ private void buildFindBasicByPager(StringBuilder builder) {
         condition.append("<if test=\"_condition != null\">");
         condition.append("<trim prefix=\" where \" prefixOverrides=\"and |or \">");
         condition.append(buildCondition());
+        condition.append("<include refid=\"SELECT_CONDITION_INNER\" />");
         condition.append("</trim>");
         condition.append("</if>");
 
@@ -347,6 +349,7 @@ private void buildFindByPager(StringBuilder builder) {
         condition.append("<if test=\"_condition != null\">");
         condition.append("<trim prefix=\" where \" prefixOverrides=\"and |or \">");
         condition.append(buildCondition());
+        condition.append("<include refid=\"SELECT_CONDITION_INNER\" />");
         condition.append("</trim>");
         condition.append("</if>");
 
@@ -411,6 +414,7 @@ private void buildCountByCondition(StringBuilder builder) {
         builder.append("<if test=\"_condition != null\">");
         builder.append("<trim prefix=\" where \" prefixOverrides=\"and |or \">");
         builder.append(buildCondition());
+        builder.append("<include refid=\"SELECT_CONDITION_INNER\" />");
         builder.append("</trim>");
         builder.append("</if>");
 
@@ -425,6 +429,7 @@ private void buildCountBasicByCondition(StringBuilder builder) {
         builder.append("<if test=\"_condition != null\">");
         builder.append("<trim prefix=\" where \" prefixOverrides=\"and |or \">");
         builder.append(buildCondition());
+        builder.append("<include refid=\"SELECT_CONDITION_INNER\" />");
         builder.append("</trim>");
         builder.append("</if>");
 
@@ -555,6 +560,7 @@ private void buildFindBasicAll(StringBuilder builder) {
         builder.append("<if test=\"_condition != null\">");
         builder.append("<trim prefix=\" where \" prefixOverrides=\"and |or \">");
         builder.append(buildCondition());
+        builder.append("<include refid=\"SELECT_CONDITION_INNER\" />");
         builder.append("</trim>");
         builder.append("</if>");
 
@@ -581,6 +587,8 @@ private void buildFindAll(StringBuilder builder) {
         builder.append("<if test=\"_condition != null\">");
         builder.append("<trim prefix=\" where \" prefixOverrides=\"and |or \">");
         builder.append(buildCondition());
+        builder.append("<include refid=\"SELECT_CONDITION_INNER\" />");
+
         builder.append("</trim>");
         builder.append("</if>");
 

src/main/java/org/springframework/data/mybatis/support/SqlSessionFactoryBean.java

@@ -20,10 +20,6 @@
 
 import org.apache.ibatis.mapping.DatabaseIdProvider;
 import org.apache.ibatis.mapping.VendorDatabaseIdProvider;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.core.io.Resource;
 
 import java.util.Properties;
 
@@ -38,10 +34,7 @@
  *
  * @author Jarvis Song
  */
-public class SqlSessionFactoryBean extends org.mybatis.spring.SqlSessionFactoryBean implements ApplicationContextAware {
-    private Class<?>[]         typeAliases;
-    private Resource[]         mapperLocations;
-    private ApplicationContext applicationContext;
+public class SqlSessionFactoryBean extends org.mybatis.spring.SqlSessionFactoryBean {
 
 
     @Override
@@ -62,18 +55,5 @@ public void afterPropertiesSet() throws Exception {
         super.afterPropertiesSet();
     }
 
-    @Override
-    public void setMapperLocations(Resource[] mapperLocations) {
-        this.mapperLocations = mapperLocations;
-    }
 
-    @Override
-    public void setTypeAliases(Class<?>[] typeAliases) {
-        this.typeAliases = typeAliases;
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.applicationContext = applicationContext;
-    }
 }