support text [CHARACTER SET charset_name] [COLLATE collation_name]

This commit is contained in:
kiki
2014-01-09 10:39:32 +08:00
parent 8530e58405
commit f0bbca5e9e
3 changed files with 67 additions and 2 deletions
@@ -1057,7 +1057,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
buf.append(", ");
}
JdbcSqlStatValue sql = sqlList.get(i);
buf.append("runningCount ");
buf.append("runningSqlCount ");
buf.append(sql.getRunningCount());
buf.append(" : ");
buf.append(sql.getSql());
@@ -1339,6 +1339,10 @@ public class SQLExprParser extends SQLParser {
|| "varchar".equalsIgnoreCase(dataTypeName)
|| "nchar".equalsIgnoreCase(dataTypeName)
|| "nvarchar".equalsIgnoreCase(dataTypeName)
|| "tinytext".equalsIgnoreCase(dataTypeName)
|| "text".equalsIgnoreCase(dataTypeName)
|| "mediumtext".equalsIgnoreCase(dataTypeName)
|| "longtext".equalsIgnoreCase(dataTypeName)
//
;
}
@@ -1494,7 +1498,7 @@ public class SQLExprParser extends SQLParser {
column.getConstaints().add(check);
return parseColumnRest(column);
}
if (lexer.token() == Token.COMMENT) {
lexer.nextToken();
column.setComment(primary());