Merge pull request #100 from hatunet/dev

release 1.0.8

Author: Jarvis Song

README.md

@@ -35,7 +35,7 @@ Download the jar through Maven:
 <dependency>
   <groupId>com.ifrabbit</groupId>
   <artifactId>spring-data-mybatis</artifactId>
-  <version>1.0.7.RELEASE</version>
+  <version>1.0.8.RELEASE</version>
 </dependency>
 ```
 
@@ -44,7 +44,7 @@ If you want use snapshot version , you can download the jar through maven:
 <dependency>
   <groupId>com.ifrabbit</groupId>
   <artifactId>spring-data-mybatis</artifactId>
-  <version>1.0.8.BUILD-SNAPSHOT</version>
+  <version>1.0.9.BUILD-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -150,7 +150,7 @@ add the jar through Maven:
    <dependency>
        <groupId>com.ifrabbit</groupId>
        <artifactId>spring-boot-starter-data-mybatis</artifactId>
-       <version>1.0.7.RELEASE</version>
+       <version>1.0.8.RELEASE</version>
    </dependency>
    ```
 

README_zh.md

@@ -34,7 +34,7 @@ Spring Data 项目的主要目标是使构建使用数据访问技术的 Spring
 <dependency>
   <groupId>com.ifrabbit</groupId>
   <artifactId>spring-data-mybatis</artifactId>
-  <version>1.0.7.RELEASE</version>
+  <version>1.0.8.RELEASE</version>
 </dependency>
 ```
 
@@ -43,7 +43,7 @@ Spring Data 项目的主要目标是使构建使用数据访问技术的 Spring
 <dependency>
   <groupId>com.ifrabbit</groupId>
   <artifactId>spring-data-mybatis</artifactId>
-  <version>1.0.8.BUILD-SNAPSHOT</version>
+  <version>1.0.9.BUILD-SNAPSHOT</version>
 </dependency>
 ```
 使用快照版本前，需要在pom.xml中配置:
@@ -150,7 +150,7 @@ public class UserRepositoryIntegrationTest {
    <dependency>
        <groupId>com.ifrabbit</groupId>
        <artifactId>spring-boot-starter-data-mybatis</artifactId>
-       <version>1.0.7.RELEASE</version>
+       <version>1.0.8.RELEASE</version>
    </dependency>
    ```
 

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.ifrabbit</groupId>
     <artifactId>spring-data-mybatis</artifactId>
-    <version>1.0.8.BUILD-SNAPSHOT</version>
+    <version>1.0.8.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/query/PartTreeMybatisQuery.java

@@ -24,6 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.mapping.Association;
+import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mybatis.mapping.*;
 import org.springframework.data.mybatis.repository.dialect.Dialect;
@@ -126,11 +127,26 @@ private String buildQueryCondition(boolean basic) {
                         Association<MybatisPersistentProperty> ass = property.getAssociation();
                         if (ass instanceof MybatisManyToOneAssociation) {
                             MybatisManyToOneAssociation association = (MybatisManyToOneAssociation) ass;
-                            MybatisPersistentProperty leafProperty = association.getObversePersistentEntity().getPersistentProperty(part.getProperty().getLeafProperty().getSegment());
-                            if (null == leafProperty) {
-                                throw new MybatisQueryException("can not find property: " + part.getProperty().getLeafProperty().getSegment() + " from entity: " + association.getObversePersistentEntity().getName());
+
+                            MybatisPersistentEntity<?> obversePersistentEntity = association.getObversePersistentEntity();
+                            if (null == obversePersistentEntity) {
+                                throw new MybatisQueryException("can not find obverse persistent entity.");
+                            }
+
+                            PropertyPath leaf = part.getProperty().getLeafProperty();
+
+                            if (obversePersistentEntity.getType() == leaf.getType()) {
+
+                                //columnName = quota(persistentEntity.getEntityName() + "." + part.getProperty().getSegment()) + "." + dialect.wrapColumnName(obversePersistentEntity.getIdProperty().getColumnName());
+                                throw new UnsupportedOperationException("findBy{Association Model} Style is not support now.");
+
+                            } else {
+                                MybatisPersistentProperty leafProperty = obversePersistentEntity.getPersistentProperty(leaf.getSegment());
+                                if (null == leafProperty) {
+                                    throw new MybatisQueryException("can not find property: " + leaf.getSegment() + " from entity: " + obversePersistentEntity.getName());
+                                }
+                                columnName = quota(persistentEntity.getEntityName() + "." + part.getProperty().getSegment()) + "." + dialect.wrapColumnName(leafProperty.getColumnName());
                             }
-                            columnName = quota(persistentEntity.getEntityName() + "." + part.getProperty().getSegment()) + "." + dialect.wrapColumnName(leafProperty.getColumnName());
                         } else if (ass instanceof MybatisEmbeddedAssociation) {
                             columnName = quota(persistentEntity.getEntityName()) + "." + dialect.wrapColumnName(ass.getObverse().getColumnName());
                         }