added :: cast mode for columns

Author: wumpz

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

@@ -31,6 +31,7 @@ public class CastExpression implements Expression {
 
 	private Expression leftExpression;
 	private ColDataType type;
+	boolean useCastKeyword;
 
 	public ColDataType getType() {
 		return type;
@@ -53,8 +54,20 @@ public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
 
+	public boolean isUseCastKeyword() {
+		return useCastKeyword;
+	}
+
+	public void setUseCastKeyword(boolean useCastKeyword) {
+		this.useCastKeyword = useCastKeyword;
+	}
+
 	@Override
 	public String toString() {
-		return "CAST(" + leftExpression + " AS " + type.toString() + ")";
+		if (useCastKeyword) {
+			return "CAST(" + leftExpression + " AS " + type.toString() + ")";
+		} else {
+			return leftExpression + "::" + type.toString();
+		}
 	}
 }

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

@@ -468,11 +468,17 @@ public void visit(BitwiseXor bitwiseXor) {
 
 	@Override
 	public void visit(CastExpression cast) {
-		buffer.append("CAST(");
-		buffer.append(cast.getLeftExpression());
-		buffer.append(" AS ");
-		buffer.append(cast.getType());
-		buffer.append(")");
+		if (cast.isUseCastKeyword()) {
+			buffer.append("CAST(");
+			buffer.append(cast.getLeftExpression());
+			buffer.append(" AS ");
+			buffer.append(cast.getType());
+			buffer.append(")");
+		} else {
+			buffer.append(cast.getLeftExpression());
+			buffer.append("::");
+			buffer.append(cast.getType());
+		}
 	}
 
 	@Override

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

@@ -1503,12 +1503,12 @@ Expression PrimaryExpression():
 
 	| LOOKAHEAD([	"+" | "-"] <S_INTEGER>)  	[	"+" | "-" { tmp = "-"; }]  token=<S_INTEGER> { retval = new LongValue(tmp+token.image); }
 
-	| LOOKAHEAD(2) 	[ "+" | "-" { isInverse = true; }] retval=Column() 
+	| LOOKAHEAD(CastExpression()) [ "+" | "-" { isInverse = true; }] retval=CastExpression()
+	
+	| LOOKAHEAD(Column()) 	[ "+" | "-" { isInverse = true; }] retval=Column() 
 
 	| LOOKAHEAD(2) [ "+" | "-" { isInverse = true; }]  "(" retval=PrimaryExpression() ")" {retval = new Parenthesis(retval); }
 
-	| LOOKAHEAD(2) [ "+" | "-" { isInverse = true; }] retval=CastExpression()
-
 	| token=<S_CHAR_LITERAL> { retval = new StringValue(token.image); }
 
 	| [ "+" | "-" { isInverse = true; }] "(" retval=SubSelect() ")"
@@ -1577,14 +1577,14 @@ CastExpression CastExpression():
 	CastExpression retval = new CastExpression();
 	ColDataType type = null;
 	Expression expression = null;
+	boolean	useCastKeyword;
 }
 {
-	<K_CAST>
-	"("
-	expression=SimpleExpression()
-	<K_AS>
-	type=ColDataType()
-	")"
+	(
+	<K_CAST> "(" expression=SimpleExpression() <K_AS> type=ColDataType() ")" { retval.setUseCastKeyword(true); }
+	|
+	expression=Column() "::" type=ColDataType() { retval.setUseCastKeyword(false); }
+	)
 
     {
 	    retval.setLeftExpression(expression);

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

@@ -594,6 +594,16 @@ public void testCastTypeProblem() throws JSQLParserException {
 		String stmt = "SELECT CAST(col1 AS varchar (256)) FROM tabelle1";
 		assertSqlCanBeParsedAndDeparsed(stmt);
 	}
+	
+	public void testCastTypeProblem2() throws JSQLParserException {
+		String stmt = "SELECT col1::varchar FROM tabelle1";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+	}
+	
+	public void testCastTypeProblem3() throws JSQLParserException {
+		String stmt = "SELECT col1::varchar (256) FROM tabelle1";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+	}
 
 	public void testCaseElseAddition() throws JSQLParserException {
 		String stmt = "SELECT CASE WHEN 1 + 3 > 20 THEN 0 ELSE 1000 + 1 END AS d FROM dual";