some minor additions to named parameters

Author: wumpz

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

@@ -19,36 +19,18 @@
  * <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"
+
+	private String name;
+
+	/**
+	 * The name of the parameter
 	 *
 	 * @return the name of the parameter
 	 */
@@ -67,6 +49,6 @@ public void accept(ExpressionVisitor expressionVisitor) {
 
 	@Override
 	public String toString() {
-		return ":"+name;
+		return ":" + name;
 	}
 }

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

@@ -96,12 +96,12 @@ public void visit(Between between) {
 
 	}
 
-    @Override
-    public void visit(EqualsTo equalsTo) {
-        visitOldOracleJoinBinaryExpression(equalsTo, " = ");
-    }
+	@Override
+	public void visit(EqualsTo equalsTo) {
+		visitOldOracleJoinBinaryExpression(equalsTo, " = ");
+	}
 
-    @Override
+	@Override
 	public void visit(Division division) {
 		visitBinaryExpression(division, " / ");
 
@@ -117,25 +117,25 @@ public void visitOldOracleJoinBinaryExpression(OldOracleJoinBinaryExpression exp
 		if (expression.isNot()) {
 			buffer.append(" NOT ");
 		}
-        expression.getLeftExpression().accept(this);
+		expression.getLeftExpression().accept(this);
 		if (expression.getOldOracleJoinSyntax() == EqualsTo.ORACLE_JOIN_RIGHT) {
 			buffer.append("(+)");
 		}
 		buffer.append(operator);
-        expression.getRightExpression().accept(this);
+		expression.getRightExpression().accept(this);
 		if (expression.getOldOracleJoinSyntax() == EqualsTo.ORACLE_JOIN_LEFT) {
 			buffer.append("(+)");
 		}
 	}
 
 	@Override
 	public void visit(GreaterThan greaterThan) {
-        visitOldOracleJoinBinaryExpression(greaterThan, " > ");
+		visitOldOracleJoinBinaryExpression(greaterThan, " > ");
 	}
 
 	@Override
 	public void visit(GreaterThanEquals greaterThanEquals) {
-        visitOldOracleJoinBinaryExpression(greaterThanEquals, " >= ");
+		visitOldOracleJoinBinaryExpression(greaterThanEquals, " >= ");
 
 	}
 
@@ -145,9 +145,9 @@ public void visit(InExpression inExpression) {
 			inExpression.getLeftItemsList().accept(this);
 		} else {
 			inExpression.getLeftExpression().accept(this);
-            if (inExpression.getOldOracleJoinSyntax() == SupportsOldOracleJoinSyntax.ORACLE_JOIN_RIGHT) {
-                buffer.append("(+)");
-            }
+			if (inExpression.getOldOracleJoinSyntax() == SupportsOldOracleJoinSyntax.ORACLE_JOIN_RIGHT) {
+				buffer.append("(+)");
+			}
 		}
 		if (inExpression.isNot()) {
 			buffer.append(" NOT");
@@ -206,13 +206,13 @@ public void visit(LongValue longValue) {
 
 	@Override
 	public void visit(MinorThan minorThan) {
-        visitOldOracleJoinBinaryExpression(minorThan, " < ");
+		visitOldOracleJoinBinaryExpression(minorThan, " < ");
 
 	}
 
 	@Override
 	public void visit(MinorThanEquals minorThanEquals) {
-        visitOldOracleJoinBinaryExpression(minorThanEquals, " <= ");
+		visitOldOracleJoinBinaryExpression(minorThanEquals, " <= ");
 
 	}
 
@@ -224,7 +224,7 @@ public void visit(Multiplication multiplication) {
 
 	@Override
 	public void visit(NotEqualsTo notEqualsTo) {
-        visitOldOracleJoinBinaryExpression(notEqualsTo, " <> ");
+		visitOldOracleJoinBinaryExpression(notEqualsTo, " <> ");
 
 	}
 
@@ -373,9 +373,9 @@ public void visit(CaseExpression caseExpression) {
 			buffer.append(" ");
 		}
 
-        for (Expression exp : caseExpression.getWhenClauses()) {
-            exp.accept(this);
-        }
+		for (Expression exp : caseExpression.getWhenClauses()) {
+			exp.accept(this);
+		}
 
 		Expression elseExp = caseExpression.getElseExpression();
 		if (elseExp != null) {
@@ -415,7 +415,7 @@ public void visit(Concat concat) {
 
 	@Override
 	public void visit(Matches matches) {
-        visitOldOracleJoinBinaryExpression(matches, " @@ ");
+		visitOldOracleJoinBinaryExpression(matches, " @@ ");
 	}
 
 	@Override
@@ -478,8 +478,8 @@ public void visit(IntervalExpression iexpr) {
 		buffer.append(iexpr.toString());
 	}
 
-    @Override
-    public void visit(JdbcNamedParameter jdbcNamedParameter) {
-        buffer.append(jdbcNamedParameter.toString());
-    }
+	@Override
+	public void visit(JdbcNamedParameter jdbcNamedParameter) {
+		buffer.append(jdbcNamedParameter.toString());
+	}
 }

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

@@ -1675,11 +1675,11 @@ Expression PrimaryExpression():
 
 	<K_NULL> { retval = new NullValue(); }
 
-	|	retval=CaseWhenExpression()
+	| retval=CaseWhenExpression()
 
-	| "?" { retval = new JdbcParameter(); }
+	| "?" { retval = new JdbcParameter(); } 
 
-        | LOOKAHEAD(JdbcNamedParameter()) retval=JdbcNamedParameter()
+    | retval=JdbcNamedParameter()
 
 	| LOOKAHEAD(AnalyticExpression()) retval=AnalyticExpression()