Merge pull request #48 from backpaper0/expand-with-space

/*%expand と */ の間のスペースはaliasとみなさないようにしました

Author: nakamura-to

src/main/java/org/seasar/doma/internal/jdbc/sql/SqlParser.java

@@ -15,7 +15,7 @@
  */
 package org.seasar.doma.internal.jdbc.sql;
 
-import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
+import static org.seasar.doma.internal.util.AssertionUtil.*;
 
 import java.util.Deque;
 import java.util.Iterator;
@@ -52,6 +52,7 @@
 import org.seasar.doma.internal.jdbc.sql.node.WhereClauseNode;
 import org.seasar.doma.internal.jdbc.sql.node.WhitespaceNode;
 import org.seasar.doma.internal.jdbc.sql.node.WordNode;
+import org.seasar.doma.internal.util.StringUtil;
 import org.seasar.doma.jdbc.JdbcException;
 import org.seasar.doma.jdbc.SqlNode;
 import org.seasar.doma.message.Message;
@@ -451,7 +452,7 @@ protected void parseForBlockComment() {
 
     protected void parseExpandBlockComment() {
         String alias = tokenType.extract(token);
-        if (alias.isEmpty()) {
+        if (alias.isEmpty() || StringUtil.isWhitespace(alias)) {
             alias = "\"\"";
         }
         ExpandNode node = new ExpandNode(getLocation(), alias, token);

src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java

@@ -280,6 +280,18 @@ public void testExpand() throws Exception {
         assertEquals("select bbb, ccc from aaa", sql.getFormattedSql());
     }
 
+    public void testExpand_withSpace() throws Exception {
+        ExpressionEvaluator evaluator = new ExpressionEvaluator();
+        String testSql = "select /*%expand */* from aaa";
+        SqlParser parser = new SqlParser(testSql);
+        SqlNode sqlNode = parser.parse();
+        PreparedSql sql = new NodePreparedSqlBuilder(config, SqlKind.SELECT,
+                "dummyPath", evaluator, SqlLogType.FORMATTED,
+                node -> Arrays.asList("bbb", "ccc")).build(sqlNode);
+        assertEquals("select bbb, ccc from aaa", sql.getRawSql());
+        assertEquals("select bbb, ccc from aaa", sql.getFormattedSql());
+    }
+
     public void testExpand_alias() throws Exception {
         ExpressionEvaluator evaluator = new ExpressionEvaluator();
         String testSql = "select /*%expand \"a\"*/* from aaa a";