リテラル変数コメントの直後のテスト用リテラルに対するチェックを修正

Author: nakamura-to

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

@@ -732,10 +732,10 @@ protected SqlLocation getLocation() {
 
     protected void validate() {
         if (isAfterValueNode()) {
-            BindVariableNode bindVariableNode = pop();
+            ValueNode valueNode = pop();
             throw new JdbcException(Message.DOMA2110, sql,
                     tokenizer.getLineNumber(), tokenizer.getPosition(),
-                    bindVariableNode.getText());
+                    valueNode.getText());
         }
         if (isInIfBlockNode()) {
             removeNodesTo(IfBlockNode.class);

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

@@ -264,6 +264,33 @@ public void testLiteralVariable_in() throws Exception {
         assertEquals(0, sql.getParameters().size());
     }
 
+    public void testLiteralVariable_endsWithLiteralVariableComment()
+            throws Exception {
+        ExpressionEvaluator evaluator = new ExpressionEvaluator();
+        evaluator.add("name", new Value(String.class, "hoge"));
+        String testSql = "select * from aaa where ename = /*^name*/";
+        SqlParser parser = new SqlParser(testSql);
+        try {
+            parser.parse();
+            fail();
+        } catch (JdbcException expected) {
+            System.out.println(expected.getMessage());
+            assertEquals(Message.DOMA2110, expected.getMessageResource());
+        }
+    }
+
+    public void testLiteralVariable_illegalLiteral() throws Exception {
+        String testSql = "select * from aaa where ename = /*^name*/bbb";
+        SqlParser parser = new SqlParser(testSql);
+        try {
+            parser.parse();
+            fail();
+        } catch (JdbcException expected) {
+            System.out.println(expected.getMessage());
+            assertEquals(Message.DOMA2142, expected.getMessageResource());
+        }
+    }
+
     public void testEmbeddedVariable() throws Exception {
         ExpressionEvaluator evaluator = new ExpressionEvaluator();
         evaluator.add("name", new Value(String.class, "hoge"));