allow complete type in cast expression

Author: wumpz

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

@@ -21,21 +21,23 @@
  */
 package net.sf.jsqlparser.expression;
 
+import net.sf.jsqlparser.statement.create.table.ColDataType;
+
 /**
  *
  * @author tw
  */
 public class CastExpression implements Expression {
 
 	private Expression leftExpression;
-	private String typeName;
+	private ColDataType type;
 
-	public String getTypeName() {
-		return typeName;
+	public ColDataType getType() {
+		return type;
 	}
 
-	public void setTypeName(String typeName) {
-		this.typeName = typeName;
+	public void setType(ColDataType type) {
+		this.type = type;
 	}
 
 	public Expression getLeftExpression() {
@@ -53,6 +55,6 @@ public void accept(ExpressionVisitor expressionVisitor) {
 
 	@Override
 	public String toString() {
-		return "CAST(" + leftExpression + " AS " + typeName + ")";
+		return "CAST(" + leftExpression + " AS " + type.toString() + ")";
 	}
 }

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

@@ -471,7 +471,7 @@ public void visit(CastExpression cast) {
 		buffer.append("CAST(");
 		buffer.append(cast.getLeftExpression());
 		buffer.append(" AS ");
-		buffer.append(cast.getTypeName());
+		buffer.append(cast.getType());
 		buffer.append(")");
 	}
 

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

@@ -1565,20 +1565,20 @@ ExtractExpression ExtractExpression() :
 CastExpression CastExpression():
 {
 	CastExpression retval = new CastExpression();
-	String typeName = null;
+	ColDataType type = null;
 	Expression expression = null;
 }
 {
 	<K_CAST>
 	"("
 	expression=SimpleExpression()
 	<K_AS>
-	typeName=RelObjectName()
+	type=ColDataType()
 	")"
 
     {
 	    retval.setLeftExpression(expression);
-	    retval.setTypeName(typeName);
+	    retval.setType(type);
     	return retval;
     }
 }

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

@@ -589,6 +589,11 @@ public void testCastInCast2() throws JSQLParserException {
 		String stmt = "SELECT CAST('test' + CAST(assertEqual AS numeric) AS varchar) FROM tabelle1";
 		assertSqlCanBeParsedAndDeparsed(stmt);
 	}
+	
+	public void testCastTypeProblem() throws JSQLParserException {
+		String stmt = "SELECT CAST(col1 AS 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";