Fixes #129. Make sure that RawSqlSource makes exactly the same SQL than

DynamicSqlSource.

Author: emacarron

src/main/java/org/apache/ibatis/scripting/defaults/RawSqlSource.java

@@ -21,16 +21,22 @@
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.SqlSource;
 import org.apache.ibatis.parsing.XNode;
+import org.apache.ibatis.scripting.xmltags.DynamicContext;
+import org.apache.ibatis.scripting.xmltags.SqlNode;
 import org.apache.ibatis.session.Configuration;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 public class RawSqlSource implements SqlSource {
 
   private final SqlSource sqlSource;
+  
+  public RawSqlSource(Configuration configuration, SqlNode rootSqlNode, Class<?> parameterType) {
+    this(configuration, getSql(configuration, rootSqlNode), parameterType);
+  }
 
   public RawSqlSource(Configuration configuration, XNode script, Class<?> parameterType) {
-    this(configuration, getString(script), parameterType);
+    this(configuration, getStringFromXNode(script), parameterType);
   }
 
   public RawSqlSource(Configuration configuration, String sql, Class<?> parameterType) {
@@ -39,7 +45,13 @@ public RawSqlSource(Configuration configuration, String sql, Class<?> parameterT
     sqlSource = sqlSourceParser.parse(sql, clazz, new HashMap<String, Object>());
   }
 
-  private static String getString(XNode script) {
+  private static String getSql(Configuration configuration, SqlNode rootSqlNode) {
+    DynamicContext context = new DynamicContext(configuration, null);
+    rootSqlNode.apply(context);
+    return context.getSql();
+  }
+  
+  private static String getStringFromXNode(XNode script) {
     StringBuilder contents = new StringBuilder();
     NodeList children = script.getNode().getChildNodes();
     for (int i = 0; i < children.getLength(); i++) {

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

@@ -65,7 +65,7 @@ public SqlSource parseScriptNode() {
     if (isDynamic) {
       sqlSource = new DynamicSqlSource(configuration, rootSqlNode);
     } else {
-      sqlSource = new RawSqlSource(configuration, context, parameterType);
+      sqlSource = new RawSqlSource(configuration, rootSqlNode, parameterType);
     }
     return sqlSource;
   }

src/test/java/org/apache/ibatis/submitted/raw_sql_source/RawSqlSourceTest.java

@@ -71,6 +71,8 @@ private void test(String statement, Class<? extends SqlSource> sqlSource) {
     SqlSession sqlSession = sqlSessionFactory.openSession();
     try {
       Assert.assertEquals(sqlSource, sqlSession.getConfiguration().getMappedStatement(statement).getSqlSource().getClass());
+      String sql = sqlSession.getConfiguration().getMappedStatement(statement).getSqlSource().getBoundSql('?').getSql();
+      Assert.assertEquals("select * from users where id = ?", sql);
       User user = sqlSession.selectOne(statement, 1);
       Assert.assertEquals("User1", user.getName());
     } finally {