Allow mapper's XML to reference an XML fragment in another mapper when Configuration.addMapper() is used. See http://code.google.com/p/mybatis/issues/detail?id=133 .

Author: christianpoitras

src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java

@@ -51,7 +51,6 @@
 import org.apache.ibatis.mapping.SqlCommandType;
 import org.apache.ibatis.mapping.SqlSource;
 import org.apache.ibatis.mapping.StatementType;
-import org.apache.ibatis.parsing.XNode;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.type.JdbcType;
@@ -65,14 +64,12 @@ public class MapperAnnotationBuilder {
   private Configuration configuration;
   private MapperBuilderAssistant assistant;
   private Class<?> type;
-  private Map<String, XNode> sqlFragments;
 
   public MapperAnnotationBuilder(Configuration configuration, Class<?> type) {
     String resource = type.getName().replace('.', '/') + ".java (best guess)";
     this.assistant = new MapperBuilderAssistant(configuration, resource);
     this.configuration = configuration;
     this.type = type;
-    this.sqlFragments = new HashMap<String, XNode>();
 
     sqlAnnotationTypes.add(Select.class);
     sqlAnnotationTypes.add(Insert.class);
@@ -110,7 +107,7 @@ private void loadXmlResource() {
       // ignore, resource is not required
     }
     if (xmlReader != null) {
-      XMLMapperBuilder xmlParser = new XMLMapperBuilder(xmlReader, assistant.getConfiguration(), xmlResource, sqlFragments, type.getName());
+      XMLMapperBuilder xmlParser = new XMLMapperBuilder(xmlReader, assistant.getConfiguration(), xmlResource, configuration.getSqlFragments(), type.getName());
       xmlParser.parse();
     }
   }

src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java

@@ -19,16 +19,13 @@
 import org.apache.ibatis.type.TypeHandler;
 
 import java.io.Reader;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Properties;
 
 public class XMLConfigBuilder extends BaseBuilder {
 
   private boolean parsed;
   private XPathParser parser;
   private String environment;
-  private Map<String, XNode> sqlFragments = new HashMap<String, XNode>();
 
   public XMLConfigBuilder(Reader reader) {
     this(reader, null, null);
@@ -243,12 +240,12 @@ private void mapperElement(XNode parent) throws Exception {
         if (resource != null && url == null) {
           ErrorContext.instance().resource(resource);
           reader = Resources.getResourceAsReader(resource);
-          XMLMapperBuilder mapperParser = new XMLMapperBuilder(reader, configuration, resource, sqlFragments);
+          XMLMapperBuilder mapperParser = new XMLMapperBuilder(reader, configuration, resource, configuration.getSqlFragments());
           mapperParser.parse();
         } else if (url != null && resource == null) {
           ErrorContext.instance().resource(url);
           reader = Resources.getUrlAsReader(url);
-          XMLMapperBuilder mapperParser = new XMLMapperBuilder(reader, configuration, url, sqlFragments);
+          XMLMapperBuilder mapperParser = new XMLMapperBuilder(reader, configuration, url, configuration.getSqlFragments());
           mapperParser.parse();
         } else {
           throw new BuilderException("A mapper element may only specify a url or resource, but not both.");

src/main/java/org/apache/ibatis/session/Configuration.java

@@ -21,6 +21,7 @@
 import org.apache.ibatis.executor.statement.StatementHandler;
 import org.apache.ibatis.io.ResolverUtil;
 import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.parsing.XNode;
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.plugin.InterceptorChain;
 import org.apache.ibatis.reflection.factory.DefaultObjectFactory;
@@ -65,6 +66,7 @@ public class Configuration {
   protected final Map<String, KeyGenerator> keyGenerators = new StrictMap<String, KeyGenerator>("Key Generators collection");
 
   protected final Set<String> loadedResources = new HashSet<String>();
+  protected final Map<String, XNode> sqlFragments = new StrictMap<String, XNode>("XML fragments parsed from previous mappers");
 
   public Configuration(Environment environment) {
     this();
@@ -349,6 +351,10 @@ public MappedStatement getMappedStatement(String id) {
     return mappedStatements.get(id);
   }
 
+  public Map<String, XNode> getSqlFragments() {
+    return sqlFragments;
+  }
+
   public void addInterceptor(Interceptor interceptor) {
     interceptorChain.addInterceptor(interceptor);
   }

src/test/java/org/apache/ibatis/submitted/xml_references/EnumWithOgnlTest.java

@@ -0,0 +1,41 @@
+package org.apache.ibatis.submitted.xml_references;
+
+import java.io.Reader;
+import java.util.Properties;
+
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory;
+import org.apache.ibatis.mapping.Environment;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.apache.ibatis.session.defaults.DefaultSqlSessionFactory;
+import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
+import org.junit.Test;
+
+import com.ibatis.common.resources.Resources;
+
+public class EnumWithOgnlTest {
+    
+    @Test
+    public void testConfiguration() {
+        UnpooledDataSourceFactory dataSourceFactory = new UnpooledDataSourceFactory();
+        Properties dataSourceProperties = new Properties();
+        dataSourceProperties.put("driver", "org.hsqldb.jdbcDriver");
+        dataSourceProperties.put("url", "jdbc:hsqldb:mem:xml_references");
+        dataSourceProperties.put("username", "sa");
+        dataSourceFactory.setProperties(dataSourceProperties);
+        Environment environment = new Environment("test", new JdbcTransactionFactory(), dataSourceFactory.getDataSource());
+        Configuration configuration = new Configuration();
+        configuration.setEnvironment(environment);
+        configuration.getTypeAliasRegistry().registerAlias(Person.class);
+        configuration.addMapper(PersonMapper.class);
+        configuration.addMapper(PersonMapper2.class);
+        new DefaultSqlSessionFactory(configuration);
+    }
+    @Test
+    public void testMixedConfiguration() throws Exception {
+    	Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/xml_references/ibatisConfig.xml");
+    	SqlSessionFactory sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
+    	sqlSessionFactory.getConfiguration().addMapper(PersonMapper2.class);
+    }
+}

src/test/java/org/apache/ibatis/submitted/xml_references/Person.java

@@ -0,0 +1,30 @@
+package org.apache.ibatis.submitted.xml_references;
+
+public class Person {
+    public enum Type {
+        EMPLOYEE,
+        DIRECTOR
+    }
+    
+    private Long id;
+    private String firstName;
+    private String lastName;
+    public String getFirstName() {
+        return firstName;
+    }
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+    public String getLastName() {
+        return lastName;
+    }
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+    public Long getId() {
+        return id;
+    }
+    public void setId(Long id) {
+        this.id = id;
+    }
+}

src/test/java/org/apache/ibatis/submitted/xml_references/PersonMapper.java

@@ -0,0 +1,15 @@
+package org.apache.ibatis.submitted.xml_references;
+
+import java.util.List;
+
+public interface PersonMapper {
+    
+    public interface PersonType {
+        public Person.Type getType();
+    }
+    
+    public List<Person> selectAllByType(Person.Type type);
+    public List<Person> selectAllByTypeNameAttribute(Person.Type type);
+    public List<Person> selectAllByTypeWithInterface(PersonType personType);
+    public List<Person> selectAllByTypeNameAttributeWithInterface(PersonType personType);
+}

src/test/java/org/apache/ibatis/submitted/xml_references/PersonMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.apache.ibatis.submitted.xml_references.PersonMapper">
+    
+    <resultMap id="personMap" type="Person">
+        <id property="id" column="id"/>
+        <result property="firstName" column="firstName"/>
+        <result property="lastName" column="lastName"/>
+    </resultMap>
+    
+    
+    <sql id="selectByIdScript">
+        SELECT id, firstName, lastName, personType
+        FROM person
+        WHERE id = #{id}
+    </sql>
+    <select id="selectById" resultMap="personMap" parameterType="int">
+    	<include refid="selectByIdScript"/>
+    </select>
+</mapper>

src/test/java/org/apache/ibatis/submitted/xml_references/PersonMapper2.java

@@ -0,0 +1,15 @@
+package org.apache.ibatis.submitted.xml_references;
+
+import java.util.List;
+
+public interface PersonMapper2 {
+    
+    public interface PersonType {
+        public Person.Type getType();
+    }
+    
+    public List<Person> selectAllByType(Person.Type type);
+    public List<Person> selectAllByTypeNameAttribute(Person.Type type);
+    public List<Person> selectAllByTypeWithInterface(PersonType personType);
+    public List<Person> selectAllByTypeNameAttributeWithInterface(PersonType personType);
+}

src/test/java/org/apache/ibatis/submitted/xml_references/PersonMapper2.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.apache.ibatis.submitted.xml_references.PersonMapper2">
+    
+    <resultMap id="personMap" type="Person">
+        <id property="id" column="id"/>
+        <result property="firstName" column="firstName"/>
+        <result property="lastName" column="lastName"/>
+    </resultMap>
+    
+    
+    <select id="selectById" resultMap="personMap" parameterType="int">
+    	<include refid="org.apache.ibatis.submitted.xml_references.PersonMapper.selectByIdScript"/>
+    </select>
+</mapper>

src/test/java/org/apache/ibatis/submitted/xml_references/ibatisConfig.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE configuration
+    PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-config.dtd">
+
+<configuration>
+    <typeAliases>
+        <typeAlias alias="Person" type="org.apache.ibatis.submitted.xml_references.Person"/>
+    </typeAliases>
+    
+    <environments default="test">
+        <environment id="test">
+            <transactionManager type="JDBC"></transactionManager>
+            <dataSource type="UNPOOLED">
+                <property name="driver" value="org.hsqldb.jdbcDriver"/>
+                <property name="url" value="jdbc:hsqldb:mem:xml_references"/>
+                <property name="username" value="sa"/>
+            </dataSource>
+        </environment>
+    </environments>
+    
+    <mappers>
+        <mapper resource="org/apache/ibatis/submitted/xml_references/PersonMapper.xml"/>
+    </mappers>
+</configuration>