Fixes #39. Ensure that column is present in every mapping but in nested

result maps.

Author: emacarron

src/main/java/org/apache/ibatis/mapping/ResultMapping.java

@@ -140,15 +140,15 @@ public ResultMapping build() {
     private void validate() {
       // Issue #697: cannot define both nestedQueryId and nestedResultMapId
       if (resultMapping.nestedQueryId != null && resultMapping.nestedResultMapId != null) {
-        throw new IllegalStateException("Cannot define both nestedQueryId and nestedResultMapId in property " + resultMapping.property);
+        throw new IllegalStateException("Cannot define both nestedQueryId and nestedResultMapId in mapping " + resultMapping.property);
       }
       // Issue #5: there should be no mappings without typehandler
       if (resultMapping.nestedQueryId == null && resultMapping.nestedResultMapId == null && resultMapping.typeHandler == null) {
-        throw new IllegalStateException("No typehandler found for property " + resultMapping.property);
-      }    
-      // Issue #4: column is mandatory on nested queries
-      if (resultMapping.nestedQueryId != null && resultMapping.column == null && resultMapping.composites.size() == 0) {
-        throw new IllegalStateException("Missing column attribute for nested select in property " + resultMapping.property);
+        throw new IllegalStateException("No typehandler found for mapping " + resultMapping.property);
+      }
+      // Issue #4 and GH #39: column is optional only in nested resultmaps but not in the rest
+      if (resultMapping.nestedResultMapId == null && resultMapping.column == null && resultMapping.composites.size() == 0) {
+        throw new IllegalStateException("Missing column attribute for nested select in mapping " + resultMapping.property);
       }
       if (resultMapping.getResultSet() != null) {
         int numColums = 0;

src/test/java/org/apache/ibatis/submitted/resultmapwithassociationstest/Mapper.xml

@@ -20,7 +20,7 @@
 
 <mapper namespace="org.apache.ibatis.submitted.resultmapwithassociationstest.Mapper">
   <resultMap id="personRM" type="org.apache.ibatis.submitted.resultmapwithassociationstest.Person" >
-    <id column="id"/>
+    <id property="id"/>
     <association property="address" column="id_address" javaType="org.apache.ibatis.submitted.resultmapwithassociationstest.Address">
       <id property="id" column="address_id" />
     </association>

src/test/java/org/apache/ibatis/submitted/resultmapwithassociationstest/ResultMapWithAssociationsTest.java

@@ -19,21 +19,21 @@
 import java.sql.Connection;
 import java.util.List;
 
+import org.apache.ibatis.exceptions.PersistenceException;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.jdbc.ScriptRunner;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class ResultMapWithAssociationsTest {
 
     private static SqlSessionFactory sqlSessionFactory;
 
-    @BeforeClass
-    public static void setUp() throws Exception {
+    @Test(expected=PersistenceException.class)
+    public void testMissingColumn() throws Exception {
         // create a SqlSessionFactory
         Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/resultmapwithassociationstest/mybatis-config.xml");
         sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
@@ -50,7 +50,6 @@ public static void setUp() throws Exception {
         session.close();
     }
 
-    @Test
     public void shouldFindAllPersonRecordsWithAssociatedAddressRecord() {
         SqlSession sqlSession = sqlSessionFactory.openSession();
         try {