imporved pg parser

This commit is contained in:
高铁
2021-02-17 08:58:14 +08:00
parent be307700c2
commit 4ca3b35e77
7 changed files with 87 additions and 4 deletions
@@ -4066,7 +4066,9 @@ public class SQLExprParser extends SQLParser {
if (token != Token.SET //
&& token != Token.DROP
&& token != Token.PRIMARY
&& token != Token.RPAREN) {
&& token != Token.RPAREN
&& token != Token.COMMA
) {
column.setDataType(
parseDataType());
}
@@ -1895,6 +1895,13 @@ public class SQLStatementParser extends SQLParser {
if (lexer.token == Token.COLUMN) {
SQLAlterTableAlterColumn alterColumn = parseAlterColumn();
stmt.addItem(alterColumn);
if (dbType == DbType.postgresql) {
if (lexer.token == Token.COMMA) {
lexer.nextToken();
continue;
}
}
} else if (lexer.token == Token.LITERAL_ALIAS) {
SQLAlterTableAlterColumn alterColumn = parseAlterColumn();
stmt.addItem(alterColumn);
@@ -2381,7 +2388,13 @@ public class SQLStatementParser extends SQLParser {
} else if (lexer.token == Token.COLUMN) {
lexer.nextToken();
SQLAlterTableDropColumnItem item = new SQLAlterTableDropColumnItem();
this.exprParser.names(item.getColumns());
if (dbType == DbType.postgresql) {
item.getColumns().add(
this.exprParser.name());
} else {
this.exprParser.names(item.getColumns());
}
if (lexer.token == Token.CASCADE) {
item.setCascade(true);
@@ -2389,6 +2402,12 @@ public class SQLStatementParser extends SQLParser {
}
stmt.addItem(item);
if (dbType == DbType.postgresql) {
if (lexer.token == Token.COMMA) {
lexer.nextToken();
}
}
} else if (lexer.token == Token.LITERAL_ALIAS) {
SQLAlterTableDropColumnItem item = new SQLAlterTableDropColumnItem();
this.exprParser.names(item.getColumns());
@@ -5424,7 +5424,9 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
SQLAlterTableItem item = x.getItems().get(i);
if (i != 0) {
SQLAlterTableItem former = x.getItems().get(i - 1);
if (this.dbType == DbType.hive && former instanceof SQLAlterTableAddPartition && item instanceof SQLAlterTableAddPartition) {
if (this.dbType == DbType.hive
&& former instanceof SQLAlterTableAddPartition
&& item instanceof SQLAlterTableAddPartition) {
// ignore comma
} else {
print(',');