fixes #129

JSQLParser · Apr 30, 2015 · 45132a7 · 45132a7
1 parent 70f5fee
commit 45132a7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/src/main/java/net/sf/jsqlparser/expression/JdbcParameter.java b/src/main/java/net/sf/jsqlparser/expression/JdbcParameter.java
@@ -22,17 +22,27 @@
 package net.sf.jsqlparser.expression;
 
 /**
- * A '?' in a statement
+ * A '?' in a statement or a ?<number> e.g. ?4
  */
 public class JdbcParameter implements Expression {
 
-	@Override
-	public void accept(ExpressionVisitor expressionVisitor) {
-		expressionVisitor.visit(this);
-	}
+    private Integer index;
 
-	@Override
-	public String toString() {
-		return "?";
-	}
+    public Integer getIndex() {
+        return index;
+    }
+
+    public void setIndex(Integer index) {
+        this.index = index;
+    }
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+        expressionVisitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        return "?" + (index == null ? "" : index);
+    }
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java
@@ -177,12 +177,15 @@ public void visit(IsNullExpression isNullExpression) {
     @Override
     public void visit(JdbcParameter jdbcParameter) {
         buffer.append("?");
+        if (jdbcParameter.getIndex() != null) {
+            buffer.append(jdbcParameter.getIndex());
+        }
 
     }
 
     @Override
     public void visit(LikeExpression likeExpression) {
-        visitBinaryExpression(likeExpression, likeExpression.isCaseInsensitive()?" ILIKE ":" LIKE ");
+        visitBinaryExpression(likeExpression, likeExpression.isCaseInsensitive() ? " ILIKE " : " LIKE ");
         String escape = likeExpression.getEscape();
         if (escape != null) {
             buffer.append(" ESCAPE '").append(escape).append('\'');

diff --git a/src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj b/src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj
@@ -1277,7 +1277,7 @@ Top Top():
               | "?"                         { top.setRowCountJdbcParameter(true);} )
             { top.setParenthesis(true);}
        ")"
-	) [ <K_PERCENT>                         { top.setPercentage(true); } ] 
+	) [ LOOKAHEAD(2) <K_PERCENT>            { top.setPercentage(true); } ] 
 	{
 		return top;
 	}
@@ -1767,7 +1767,7 @@ Expression PrimaryExpression():
 
 	| retval=CaseWhenExpression()
 
-	| "?" { retval = new JdbcParameter(); }
+	| "?" { retval = new JdbcParameter(); } [ token = <S_LONG> { ((JdbcParameter)retval).setIndex(Integer.valueOf(token.image)); } ]
 
     | LOOKAHEAD(2) retval=JdbcNamedParameter()
 

diff --git a/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java
@@ -1725,4 +1725,7 @@ public void testSelectKeywordPercent() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT percent FROM MY_TABLE");
     }
 
+    public void testSelectJPQLPositionalParameter() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT email FROM users WHERE (type LIKE 'B') AND (username LIKE ?1)");
+    }
 }