improved :: cast to accept more types of expressions

Author: wumpz

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

@@ -1487,9 +1487,11 @@ Expression BitwiseXor():
 Expression PrimaryExpression():
 { 
 	Expression retval = null;
+    CastExpression castExpr = null;
 	Token token = null;
 	boolean isInverse = false;
 	String tmp = "";
+	ColDataType type = null;
 }
 {
 
@@ -1530,6 +1532,14 @@ Expression PrimaryExpression():
 
 )
 
+[ "::" type=ColDataType() { 
+		castExpr = new CastExpression(); 
+		castExpr.setUseCastKeyword(false); 
+		castExpr.setLeftExpression(retval);
+		castExpr.setType(type);
+		retval=castExpr;
+} ]
+
     { 
 		if (isInverse) { 
 			retval = new InverseExpression(retval); 
@@ -1588,11 +1598,7 @@ CastExpression CastExpression():
 	boolean	useCastKeyword;
 }
 {
-	(
 	<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

@@ -604,6 +604,16 @@ public void testCastTypeProblem3() throws JSQLParserException {
 		String stmt = "SELECT col1::varchar (256) FROM tabelle1";
 		assertSqlCanBeParsedAndDeparsed(stmt);
 	}
+	
+	public void testCastTypeProblem4() throws JSQLParserException {
+		String stmt = "SELECT 5::varchar (256) FROM tabelle1";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+	}
+	
+	public void testCastTypeProblem5() throws JSQLParserException {
+		String stmt = "SELECT 5.67::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";