added ability to parse named parameters

Author: audrium

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java

@@ -56,6 +56,8 @@ public interface ExpressionVisitor {
 	void visit(InverseExpression inverseExpression);
 
 	void visit(JdbcParameter jdbcParameter);
+        
+        void visit(JdbcNamedParameter jdbcNamedParameter);
 
 	void visit(DoubleValue doubleValue);
 

src/main/java/net/sf/jsqlparser/expression/JdbcNamedParameter.java

@@ -0,0 +1,72 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2013 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+/*
+ * Copyright (C) 2013 JSQLParser.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package net.sf.jsqlparser.expression;
+
+/**
+ *
+ * @author aud
+ */
+public class JdbcNamedParameter implements Expression {
+           
+        private String name;
+        
+        /**
+	 * The name of the function, i.e. "MAX"
+	 *
+	 * @return the name of the parameter
+	 */
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public void accept(ExpressionVisitor expressionVisitor) {
+		expressionVisitor.visit(this);
+	}
+
+	@Override
+	public String toString() {
+		return ":"+name;
+	}
+}

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -37,6 +37,7 @@
 import net.sf.jsqlparser.expression.Function;
 import net.sf.jsqlparser.expression.IntervalExpression;
 import net.sf.jsqlparser.expression.InverseExpression;
+import net.sf.jsqlparser.expression.JdbcNamedParameter;
 import net.sf.jsqlparser.expression.JdbcParameter;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.NullValue;
@@ -496,4 +497,8 @@ private void init() {
 	@Override
 	public void visit(IntervalExpression iexpr) {
 	}
+
+    @Override
+    public void visit(JdbcNamedParameter jdbcNamedParameter) {
+    }
 }

src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java

@@ -477,4 +477,9 @@ public void visit(MultiExpressionList multiExprList) {
 	public void visit(IntervalExpression iexpr) {
 		buffer.append(iexpr.toString());
 	}
+
+    @Override
+    public void visit(JdbcNamedParameter jdbcNamedParameter) {
+        buffer.append(jdbcNamedParameter.toString());
+    }
 }

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

@@ -66,6 +66,7 @@ import net.sf.jsqlparser.expression.Function;
 import net.sf.jsqlparser.expression.InverseExpression;
 import net.sf.jsqlparser.expression.IntervalExpression;
 import net.sf.jsqlparser.expression.JdbcParameter;
+import net.sf.jsqlparser.expression.JdbcNamedParameter;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.DateValue;
 import net.sf.jsqlparser.expression.TimeValue;
@@ -1143,6 +1144,7 @@ Limit Limit():
 					 	token=<S_INTEGER> { limit.setOffset(Long.parseLong(token.image)); } 
 					 	|
 					 	"?" { limit.setOffsetJdbcParameter(true);} 
+
 					 ) 
 					 ","  
 
@@ -1677,6 +1679,8 @@ Expression PrimaryExpression():
 
 	| "?" { retval = new JdbcParameter(); }
 
+        | LOOKAHEAD(JdbcNamedParameter()) retval=JdbcNamedParameter()
+
 	| LOOKAHEAD(AnalyticExpression()) retval=AnalyticExpression()
 
 	| LOOKAHEAD(ExtractExpression()) retval=ExtractExpression()
@@ -1722,6 +1726,17 @@ Expression PrimaryExpression():
     }
 }
 
+JdbcNamedParameter JdbcNamedParameter() : {
+	JdbcNamedParameter parameter = new JdbcNamedParameter();
+	Token token;
+}
+{
+        ":" token=<S_IDENTIFIER> { parameter.setName(token.image); }
+	{
+		return parameter;
+	}
+}
+
 IntervalExpression IntervalExpression() : {
 	IntervalExpression interval = new IntervalExpression();
 	Token token;

src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

@@ -1057,9 +1057,51 @@ public void testRegexpLike2() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
 
-	public void testBooleanFunction1() throws JSQLParserException {
+    public void testBooleanFunction1() throws JSQLParserException {
         String stmt = "SELECT * FROM mytable WHERE test_func(col1)";
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
+        
+    public void testNamedParameter() throws JSQLParserException {
+        String stmt = "SELECT * FROM mytable WHERE b = :param";
+        assertSqlCanBeParsedAndDeparsed(stmt);
 
+        Statement st = CCJSqlParserUtil.parse(stmt);
+        Select select = (Select) st;
+        PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+        Expression exp = ((BinaryExpression) plainSelect.getWhere()).getRightExpression();
+        assertTrue(exp instanceof JdbcNamedParameter);
+        JdbcNamedParameter namedParameter = (JdbcNamedParameter) exp;
+        assertEquals("param", namedParameter.getName());
+        
+    }
+    public void testNamedParameter2() throws JSQLParserException {
+        String stmt = "SELECT * FROM mytable WHERE a = :param OR a = :param2 AND b = :param3";
+        assertSqlCanBeParsedAndDeparsed(stmt);
+
+        Statement st = CCJSqlParserUtil.parse(stmt);
+        Select select = (Select) st;
+        PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+
+        Expression exp_l = ((BinaryExpression) plainSelect.getWhere()).getLeftExpression();
+        Expression exp_r = ((BinaryExpression) plainSelect.getWhere()).getRightExpression();
+        Expression exp_rl = ((BinaryExpression) exp_r).getLeftExpression();
+        Expression exp_rr = ((BinaryExpression) exp_r).getRightExpression();
+        
+        Expression exp_param1 = ((BinaryExpression) exp_l).getRightExpression();
+        Expression exp_param2 = ((BinaryExpression) exp_rl).getRightExpression();
+        Expression exp_param3 = ((BinaryExpression) exp_rr).getRightExpression();
+        
+        assertTrue(exp_param1 instanceof JdbcNamedParameter);
+        assertTrue(exp_param2 instanceof JdbcNamedParameter);
+        assertTrue(exp_param3 instanceof JdbcNamedParameter);
+        
+        JdbcNamedParameter namedParameter1 = (JdbcNamedParameter) exp_param1;
+        JdbcNamedParameter namedParameter2 = (JdbcNamedParameter) exp_param2;
+        JdbcNamedParameter namedParameter3 = (JdbcNamedParameter) exp_param3;
+        
+        assertEquals("param", namedParameter1.getName());
+        assertEquals("param2", namedParameter2.getName());
+        assertEquals("param3", namedParameter3.getName());
+    }
 }