character set implemented

Author: wumpz

src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java

@@ -29,6 +29,7 @@ public class ColDataType {
 
 	private String dataType;
 	private List<String> argumentsStringList;
+    private String characterSet;
 
 	public List<String> getArgumentsStringList() {
 		return argumentsStringList;
@@ -46,9 +47,18 @@ public void setDataType(String string) {
 		dataType = string;
 	}
 
+    public String getCharacterSet() {
+        return characterSet;
+    }
+
+    public void setCharacterSet(String characterSet) {
+        this.characterSet = characterSet;
+    }
+
 	@Override
 	public String toString() {
 		return dataType
-				+ (argumentsStringList != null ? " " + PlainSelect.getStringList(argumentsStringList, true, true) : "");
+				+ (argumentsStringList != null ? " " + PlainSelect.getStringList(argumentsStringList, true, true) : "")
+                + (characterSet != null ? " CHARACTER SET " + characterSet : "");
 	}
 }

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

@@ -2130,6 +2130,8 @@ ColDataType ColDataType():
 	| tk=<S_IDENTIFIER> { colDataType.setDataType(tk.image); } )
 
 	[LOOKAHEAD(2) "(" ( (tk=<S_LONG> | tk=<S_CHAR_LITERAL>) { argumentsStringList.add(tk.image); } ["," {/*argumentsStringList.add(",");*/}] )*    ")"]
+    [<K_CHARACTER> <K_SET> tk=<S_IDENTIFIER> { colDataType.setCharacterSet(tk.image); } ]
+
 	{
 		if (argumentsStringList.size() > 0)
 			colDataType.setArgumentsStringList(argumentsStringList);

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

@@ -1406,4 +1406,9 @@ public void testPostgreSQLRegExpCaseSensitiveMatch4() throws JSQLParserException
         String stmt = "SELECT a, b FROM foo WHERE a !~* '[help].*'";
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
+    
+    public void testCharacterSetClause() throws JSQLParserException {
+        String stmt="SELECT DISTINCT CAST(`view0`.`nick2` AS CHAR (8000) CHARACTER SET utf8) AS `v0` FROM people `view0` WHERE `view0`.`nick2` IS NOT NULL";
+        assertSqlCanBeParsedAndDeparsed(stmt);
+    }
 }