problems solved with postgresqls data type "character varying"

Author: wumpz

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

@@ -253,6 +253,8 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |	<K_FOREIGN:"FOREIGN">
 |	<K_CONSTRAINT:"CONSTRAINT">
 |	<K_REFERENCES:"REFERENCES">
+|	<K_CHARACTER:"CHARACTER">
+|	<K_VARYING:"VARYING">
 }
 
 
@@ -2128,7 +2130,8 @@ ColDataType ColDataType():
 	ArrayList argumentsStringList = new ArrayList();
 }
 {
-	( tk=<S_IDENTIFIER> { colDataType.setDataType(tk.image); } )
+	( <K_CHARACTER> <K_VARYING> { colDataType.setDataType("character varying"); }
+	| tk=<S_IDENTIFIER> { colDataType.setDataType(tk.image); } )
 
 
 	[LOOKAHEAD(2) "(" ( (tk=<S_INTEGER> | tk=<S_CHAR_LITERAL>) { argumentsStringList.add(tk.image); } ["," {/*argumentsStringList.add(",");*/}] )*    ")"]

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

@@ -688,6 +688,11 @@ public void testCastTypeProblem5() throws JSQLParserException {
 		String stmt = "SELECT 5.67::varchar (256) FROM tabelle1";
 		assertSqlCanBeParsedAndDeparsed(stmt);
 	}
+	
+	public void testCastTypeProblem6() throws JSQLParserException {
+		String stmt = "SELECT 'test'::character varying 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";
@@ -1088,6 +1093,7 @@ public void testNamedParameter() throws JSQLParserException {
         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);
@@ -1117,4 +1123,11 @@ public void testNamedParameter2() throws JSQLParserException {
         assertEquals("param2", namedParameter2.getName());
         assertEquals("param3", namedParameter3.getName());
     }
+	
+	public void testComplexUnion1() throws IOException, JSQLParserException {
+		String stmt = "(SELECT 'abc-' || coalesce(mytab.a::varchar, '') AS a, mytab.b, mytab.c AS st, mytab.d, mytab.e FROM mytab WHERE mytab.del = 0) UNION (SELECT 'cde-' || coalesce(mytab2.a::varchar, '') AS a, mytab2.b, mytab2.bezeichnung AS c, 0 AS d, 0 AS e FROM mytab2 WHERE mytab2.del = 0)";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+	}
+	
+	
 }