Fix for issue #3. Existing mapper statements should never be parsed as

XML.

Author: emacarron

src/main/java/org/apache/ibatis/scripting/xmltags/XMLLanguageDriver.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2012 The MyBatis Team
+ *    Copyright 2009-2013 The MyBatis Team
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,6 +15,9 @@
  */
 package org.apache.ibatis.scripting.xmltags;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.ibatis.executor.parameter.ParameterHandler;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -36,8 +39,15 @@ public SqlSource createSqlSource(Configuration configuration, XNode script, Clas
   }
 
   public SqlSource createSqlSource(Configuration configuration, String script, Class<?> parameterType) {
-    XMLScriptBuilder builder = new XMLScriptBuilder(configuration, script);
-    return builder.parseScriptNode();
+    if (script.startsWith("<script>")) { // issue #3
+      XMLScriptBuilder builder = new XMLScriptBuilder(configuration, script);
+      return builder.parseScriptNode();
+    } else {
+      List<SqlNode> contents = new ArrayList<SqlNode>();
+      contents.add(new TextSqlNode(script.toString()));
+      MixedSqlNode rootSqlNode = new MixedSqlNode(contents);
+      return new DynamicSqlSource(configuration, rootSqlNode);
+    }
   }
-  
+
 }

src/main/java/org/apache/ibatis/scripting/xmltags/XMLScriptBuilder.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2012 The MyBatis Team
+ *    Copyright 2009-2013 The MyBatis Team
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -41,11 +41,7 @@ public XMLScriptBuilder(Configuration configuration, XNode context) {
 
   public XMLScriptBuilder(Configuration configuration, String context) {
     super(configuration);
-    XPathParser parser = new XPathParser(
-        "<script>" + context + "</script>",
-        false,
-        configuration.getVariables(),
-        new XMLMapperEntityResolver());
+    XPathParser parser = new XPathParser(context, false, configuration.getVariables(), new XMLMapperEntityResolver());
     this.context = parser.evalNode("/script");
   }
 

src/test/java/org/apache/ibatis/submitted/language/LanguageTest.java

@@ -132,21 +132,21 @@ public void testDynamicSelectWithIteration() {
     SqlSession sqlSession = sqlSessionFactory.openSession();
     try {
 
-      int[] ids = {2,4,5};
+      int[] ids = { 2, 4, 5 };
       Map<String, Object> param = new HashMap<String, Object>();
       param.put("ids", ids);
       List<Name> answer = sqlSession.selectList("selectNamesWithIteration", param);
       assertEquals(3, answer.size());
-      for (int i=0; i<ids.length; i++) {
+      for (int i = 0; i < ids.length; i++) {
         assertEquals(ids[i], answer.get(i).getId());
       }
 
     } finally {
       sqlSession.close();
     }
   }
-  
-  @Test 
+
+  @Test
   public void testLangRaw() {
     SqlSession sqlSession = sqlSessionFactory.openSession();
     try {
@@ -158,11 +158,10 @@ public void testLangRaw() {
       }
     } finally {
       sqlSession.close();
-    }    
+    }
   }
 
-  
-  @Test 
+  @Test
   public void testLangXmlTags() {
     SqlSession sqlSession = sqlSessionFactory.openSession();
     try {
@@ -174,10 +173,10 @@ public void testLangXmlTags() {
       }
     } finally {
       sqlSession.close();
-    }    
+    }
   }
 
-  @Test 
+  @Test
   public void testLangRawWithMapper() {
     SqlSession sqlSession = sqlSessionFactory.openSession();
     try {
@@ -190,10 +189,10 @@ public void testLangRawWithMapper() {
       }
     } finally {
       sqlSession.close();
-    }    
+    }
   }
 
-  @Test 
+  @Test
   public void testLangVelocityWithMapper() {
     SqlSession sqlSession = sqlSessionFactory.openSession();
     try {
@@ -206,10 +205,10 @@ public void testLangVelocityWithMapper() {
       }
     } finally {
       sqlSession.close();
-    }    
+    }
   }
 
-  @Test 
+  @Test
   public void testLangXmlWithMapper() {
     SqlSession sqlSession = sqlSessionFactory.openSession();
     try {
@@ -222,7 +221,23 @@ public void testLangXmlWithMapper() {
       }
     } finally {
       sqlSession.close();
-    }    
+    }
+  }
+
+  @Test
+  public void testLangXmlWithMapperAndSqlSymbols() {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      Parameter p = new Parameter(true, "Fli%");
+      Mapper m = sqlSession.getMapper(Mapper.class);
+      List<Name> answer = m.selectXmlWithMapperAndSqlSymbols(p);
+      assertEquals(3, answer.size());
+      for (Name n : answer) {
+        assertEquals("Flintstone", n.getLastName());
+      }
+    } finally {
+      sqlSession.close();
+    }
   }
 
 }

src/test/java/org/apache/ibatis/submitted/language/Mapper.java

@@ -14,10 +14,14 @@ public interface Mapper {
   List<Name> selectRawWithMapper(Parameter p);
 
   @Lang(XMLLanguageDriver.class)
-  @Select("SELECT firstName <if test=\"includeLastName != null\">, lastName</if> FROM names WHERE lastName LIKE #{name}")
+  @Select("<script>SELECT firstName <if test=\"includeLastName != null\">, lastName</if> FROM names WHERE lastName LIKE #{name}</script>")
   List<Name> selectXmlWithMapper(Parameter p);
 
   @Select("SELECT firstName #if($_parameter.includeLastName), lastName#end FROM names WHERE lastName LIKE @{name}")
   List<Name> selectVelocityWithMapper(Parameter p);
 
+  @Lang(XMLLanguageDriver.class)
+  @Select("SELECT firstName, lastName FROM names WHERE lastName LIKE #{name} and 0 < 1")
+  List<Name> selectXmlWithMapperAndSqlSymbols(Parameter p);
+
 }