From 983264ad91ce3597fc589da034ed7299c11cd99c Mon Sep 17 00:00:00 2001 From: fanglei <793514387@qq.com> Date: Sun, 25 Oct 2020 22:21:15 +0800 Subject: [PATCH 1/7] =?UTF-8?q?bug=EF=BC=9Aoracle=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E5=AF=B9while...end=E5=90=8E=E4=B8=A2?= =?UTF-8?q?=E5=A4=B1";",=20=E5=AF=BC=E8=87=B4=E6=89=A7=E8=A1=8C=E6=97=B6?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../druid/sql/dialect/oracle/parser/OracleStatementParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java index c55565a992..947ab038c3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java @@ -898,7 +898,7 @@ public class OracleStatementParser extends SQLStatementParser { accept(Token.END); accept(Token.LOOP); accept(Token.SEMI); - + stmt.setAfterSemi(true); return stmt; } From 563f1589038d7ab1e5c2a75651bce08fb340d511 Mon Sep 17 00:00:00 2001 From: fanglei <793514387@qq.com> Date: Tue, 3 Nov 2020 12:32:30 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0oracle=E5=AF=B9execute=20?= =?UTF-8?q?immediate=20sql=20bulk=20Collect=E7=9A=84=E6=94=AF=E6=8C=81?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E4=BD=BF=E7=94=A8=20record(=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B)=E7=9A=84=E8=A7=A3=E6=9E=90=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stmt/OracleExecuteImmediateStatement.java | 10 + .../dialect/oracle/parser/OracleLexer.java | 3 +- .../oracle/parser/OracleStatementParser.java | 32 ++- .../oracle/visitor/OracleOutputVisitor.java | 6 +- .../druid/sql/parser/SQLExprParser.java | 7 +- .../com/alibaba/druid/sql/parser/Token.java | 199 +++++++++--------- 6 files changed, 153 insertions(+), 104 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExecuteImmediateStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExecuteImmediateStatement.java index dafb4e0459..3706ac730f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExecuteImmediateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExecuteImmediateStatement.java @@ -26,6 +26,8 @@ import java.util.List; public class OracleExecuteImmediateStatement extends OracleStatementImpl { private SQLExpr dynamicSql; + + private boolean bulkCollect; private final List arguments = new ArrayList(); @@ -86,6 +88,14 @@ public class OracleExecuteImmediateStatement extends OracleStatementImpl { } this.dynamicSql = dynamicSql; } + + public boolean isBulkCollect() { + return bulkCollect; + } + + public void setBulkCollect(boolean bulkCollect) { + this.bulkCollect = bulkCollect; + } public void setDynamicSql(String dynamicSql) { this.setDynamicSql(new SQLCharExpr(dynamicSql)); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java index 5650b2d68d..39a91143b3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java @@ -49,7 +49,8 @@ public class OracleLexer extends Lexer { map.put("GOTO", Token.GOTO); map.put("IF", Token.IF); map.put("ELSIF", Token.ELSIF); - + map.put("RECORD", Token.RECORD); + map.put("LIMIT", Token.LIMIT); map.put("LOOP", Token.LOOP); map.put("MATCHED", Token.MATCHED); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java index 947ab038c3..44e70205d8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java @@ -788,7 +788,11 @@ public class OracleStatementParser extends SQLStatementParser { SQLExpr dyanmiacSql = this.exprParser.primary(); stmt.setDynamicSql(dyanmiacSql); - + if (lexer.identifierEquals("BULK")) { + lexer.nextToken(); + acceptIdentifier("COLLECT"); + stmt.setBulkCollect(true); + } if (lexer.token() == Token.INTO) { lexer.nextToken(); @@ -1979,6 +1983,18 @@ public class OracleStatementParser extends SQLStatementParser { } else { throw new ParserException("TODO : " + lexer.info()); } + } else if (lexer.token() == Token.RECORD) { + lexer.nextToken(); + String typeName = "RECORD"; + SQLRecordDataType sqlRecordDataType = new SQLRecordDataType(); + sqlRecordDataType.setDbType(dbType); + sqlRecordDataType.setName(typeName); + if (lexer.token() == Token.LPAREN) { + lexer.nextToken(); + this.parseColumnsList(sqlRecordDataType.getColumns(), sqlRecordDataType); + accept(Token.RPAREN); + } + dataType = sqlRecordDataType; } else { throw new ParserException("TODO : " + lexer.info()); } @@ -2104,7 +2120,19 @@ public class OracleStatementParser extends SQLStatementParser { break; } } - + + private void parseColumnsList(List columns, SQLObject parent) { + for ( ; ; ) { + SQLColumnDefinition columnDefinition = this.exprParser.parseColumn(); + columns.add(columnDefinition); + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + continue; + } + break; + } + } + public OracleSelectParser createSQLSelectParser() { return new OracleSelectParser(this.exprParser, selectListCache); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java index 9b8669bce4..a87756caad 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java @@ -2612,7 +2612,11 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS public boolean visit(OracleExecuteImmediateStatement x) { print0(ucase ? "EXECUTE IMMEDIATE " : "execute immediate "); x.getDynamicSql().accept(this); - + + if (x.isBulkCollect()) { + print0(ucase ? " BULK COLLECT " : " bulk collect "); + } + List into = x.getInto(); if (into.size() > 0) { print0(ucase ? " INTO " : " into "); diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index 4b4b06db45..28b98057a4 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -531,6 +531,11 @@ public class SQLExprParser extends SQLParser { break; } } + } else if (DbType.oracle == dbType) { + lexer.nextTokenValue(); + if (lexer.token == Token.BARBAR) { + sqlExpr = additiveRest(sqlExpr); + } } else { lexer.nextToken(); } @@ -1307,7 +1312,7 @@ public class SQLExprParser extends SQLParser { expr = dotRest(expr); return primaryRest(expr); } else if (lexer.identifierEquals(FnvHash.Constants.SETS) // - && expr.getClass() == SQLIdentifierExpr.class // + && expr.getClass() == SQLIdentifierExpr.class // && "GROUPING".equalsIgnoreCase(((SQLIdentifierExpr) expr).getName())) { SQLGroupingSetExpr groupingSets = new SQLGroupingSetExpr(); lexer.nextToken(); diff --git a/src/main/java/com/alibaba/druid/sql/parser/Token.java b/src/main/java/com/alibaba/druid/sql/parser/Token.java index a03b208b0b..e728c7ba14 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Token.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Token.java @@ -16,56 +16,56 @@ package com.alibaba.druid.sql.parser; /** - * - * SQL Token + * + * SQL Token * @author wenshao [szujobs@hotmail.com] */ public enum Token { - SELECT("SELECT"), - DELETE("DELETE"), - INSERT("INSERT"), - UPDATE("UPDATE"), + SELECT("SELECT"), + DELETE("DELETE"), + INSERT("INSERT"), + UPDATE("UPDATE"), - FROM("FROM"), - HAVING("HAVING"), - WHERE("WHERE"), - ORDER("ORDER"), + FROM("FROM"), + HAVING("HAVING"), + WHERE("WHERE"), + ORDER("ORDER"), BY("BY"), - GROUP("GROUP"), - INTO("INTO"), - AS("AS"), + GROUP("GROUP"), + INTO("INTO"), + AS("AS"), CREATE("CREATE"), - ALTER("ALTER"), - DROP("DROP"), - SET("SET"), + ALTER("ALTER"), + DROP("DROP"), + SET("SET"), - NULL("NULL"), - NOT("NOT"), + NULL("NULL"), + NOT("NOT"), DISTINCT("DISTINCT"), - TABLE("TABLE"), - TABLESPACE("TABLESPACE"), - VIEW("VIEW"), - SEQUENCE("SEQUENCE"), - TRIGGER("TRIGGER"), - USER("USER"), - INDEX("INDEX"), + TABLE("TABLE"), + TABLESPACE("TABLESPACE"), + VIEW("VIEW"), + SEQUENCE("SEQUENCE"), + TRIGGER("TRIGGER"), + USER("USER"), + INDEX("INDEX"), SESSION("SESSION"), PROCEDURE("PROCEDURE"), FUNCTION("FUNCTION"), - PRIMARY("PRIMARY"), - KEY("KEY"), - DEFAULT("DEFAULT"), - CONSTRAINT("CONSTRAINT"), - CHECK("CHECK"), - UNIQUE("UNIQUE"), - FOREIGN("FOREIGN"), - REFERENCES("REFERENCES"), + PRIMARY("PRIMARY"), + KEY("KEY"), + DEFAULT("DEFAULT"), + CONSTRAINT("CONSTRAINT"), + CHECK("CHECK"), + UNIQUE("UNIQUE"), + FOREIGN("FOREIGN"), + REFERENCES("REFERENCES"), - EXPLAIN("EXPLAIN"), - FOR("FOR"), + EXPLAIN("EXPLAIN"), + FOR("FOR"), IF("IF"), @@ -73,55 +73,55 @@ public enum Token { GLOBAL("GLOBAL"), ALL("ALL"), UNION("UNION"), - EXCEPT("EXCEPT"), - INTERSECT("INTERSECT"), + EXCEPT("EXCEPT"), + INTERSECT("INTERSECT"), MINUS("MINUS"), - INNER("INNER"), - LEFT("LEFT"), - RIGHT("RIGHT"), - FULL("FULL"), - OUTER("OUTER"), + INNER("INNER"), + LEFT("LEFT"), + RIGHT("RIGHT"), + FULL("FULL"), + OUTER("OUTER"), JOIN("JOIN"), STRAIGHT_JOIN("STRAIGHT_JOIN"), ON("ON"), - SCHEMA("SCHEMA"), + SCHEMA("SCHEMA"), CAST("CAST"), COLUMN("COLUMN"), USE("USE"), DATABASE("DATABASE"), TO("TO"), - AND("AND"), - OR("OR"), - XOR("XOR"), - CASE("CASE"), - WHEN("WHEN"), - THEN("THEN"), + AND("AND"), + OR("OR"), + XOR("XOR"), + CASE("CASE"), + WHEN("WHEN"), + THEN("THEN"), ELSE("ELSE"), ELSIF("ELSIF"), - END("END"), - EXISTS("EXISTS"), + END("END"), + EXISTS("EXISTS"), IN("IN"), - NEW("NEW"), - ASC("ASC"), - DESC("DESC"), - IS("IS"), - LIKE("LIKE"), - ESCAPE("ESCAPE"), - BETWEEN("BETWEEN"), - VALUES("VALUES"), + NEW("NEW"), + ASC("ASC"), + DESC("DESC"), + IS("IS"), + LIKE("LIKE"), + ESCAPE("ESCAPE"), + BETWEEN("BETWEEN"), + VALUES("VALUES"), INTERVAL("INTERVAL"), - LOCK("LOCK"), - SOME("SOME"), + LOCK("LOCK"), + SOME("SOME"), ANY("ANY"), TRUNCATE("TRUNCATE"), RETURN("RETURN"), // mysql - TRUE("TRUE"), + TRUE("TRUE"), FALSE("FALSE"), LIMIT("LIMIT"), KILL("KILL"), @@ -211,6 +211,7 @@ public enum Token { COMMIT("COMMIT"), SAVEPOINT("SAVEPOINT"), CROSS("CROSS"), + RECORD("RECORD"), PCTFREE("PCTFREE"), INITRANS("INITRANS"), @@ -253,7 +254,7 @@ public enum Token { // hive - EOF, + EOF, ERROR, IDENTIFIER, HINT, @@ -298,19 +299,19 @@ public enum Token { UPSERT("UPSERT"), // Phoenix - LPAREN("("), - RPAREN(")"), - LBRACE("{"), - RBRACE("}"), - LBRACKET("["), - RBRACKET("]"), - SEMI(";"), - COMMA(","), - DOT("."), - DOTDOT(".."), - DOTDOTDOT("..,"), - EQ("="), - GT(">"), + LPAREN("("), + RPAREN(")"), + LBRACE("{"), + RBRACE("}"), + LBRACKET("["), + RBRACKET("]"), + SEMI(";"), + COMMA(","), + DOT("."), + DOTDOT(".."), + DOTDOTDOT("..,"), + EQ("="), + GT(">"), LT("<"), LT_SUB_GT("<->"), BANG("!"), @@ -324,34 +325,34 @@ public enum Token { QUESQUES("??"), QUESBAR("?|"), QUESAMP("?&"), - COLON(":"), - COLONCOLON("::"), - COLONEQ(":="), + COLON(":"), + COLONCOLON("::"), + COLONEQ(":="), EQEQ("=="), EQGT("=>"), - LTEQ("<="), - LTEQGT("<=>"), - LTGT("<>"), - GTEQ(">="), - BANGEQ("!="), - BANGGT("!>"), + LTEQ("<="), + LTEQGT("<=>"), + LTGT("<>"), + GTEQ(">="), + BANGEQ("!="), + BANGGT("!>"), BANGLT("!<"), - AMPAMP("&&"), - BARBAR("||"), - BARBARSLASH("||/"), - BARSLASH("|/"), - PLUS("+"), - SUB("-"), - SUBGT("->"), - SUBGTGT("->>"), - STAR("*"), - SLASH("/"), - AMP("&"), - BAR("|"), + AMPAMP("&&"), + BARBAR("||"), + BARBARSLASH("||/"), + BARSLASH("|/"), + PLUS("+"), + SUB("-"), + SUBGT("->"), + SUBGTGT("->>"), + STAR("*"), + SLASH("/"), + AMP("&"), + BAR("|"), CARET("^"), CARETEQ("^="), - PERCENT("%"), - LTLT("<<"), + PERCENT("%"), + LTLT("<<"), GTGT(">>"), MONKEYS_AT("@"), MONKEYS_AT_AT("@@"), From 0548fc8274eb588a0341e52acba15421e6a61eb0 Mon Sep 17 00:00:00 2001 From: fanglei <793514387@qq.com> Date: Tue, 3 Nov 2020 12:34:31 +0800 Subject: [PATCH 3/7] =?UTF-8?q?bug:=20=E4=BF=AE=E5=A4=8Doracle=E7=9A=84els?= =?UTF-8?q?if=20=E8=BE=93=E5=87=BA=E6=88=90else=20if=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java index a87756caad..bf4b6cc459 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java @@ -1523,7 +1523,7 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS @Override public boolean visit(SQLIfStatement.ElseIf x) { - print0(ucase ? "ELSE IF " : "else if "); + print0(ucase ? "ELSIF " : "elsif "); x.getCondition().accept(this); print0(ucase ? " THEN" : " then"); this.indentCount++; From 2a2867b96bc8242074795e7b3432a883c0da99fe Mon Sep 17 00:00:00 2001 From: fanglei <793514387@qq.com> Date: Tue, 3 Nov 2020 12:41:46 +0800 Subject: [PATCH 4/7] =?UTF-8?q?bug:=20oracle=E5=87=BD=E6=95=B0=20=E8=A7=A3?= =?UTF-8?q?=E6=9E=90TABLE=20OF=20varchar2(4000)=20=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sql/dialect/oracle/parser/OracleStatementParser.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java index 44e70205d8..5d7a583021 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java @@ -1927,6 +1927,11 @@ public class OracleStatementParser extends SQLStatementParser { if (lexer.identifierEquals(FnvHash.Constants.ROWTYPE)) { lexer.nextToken(); typeName = "TABLE OF " + name.toString() + "%ROWTYPE"; + } else if (lexer.token() == Token.LPAREN && lexer.stringVal().equalsIgnoreCase("Varchar2")) { + accept(Token.LPAREN); + int len = this.exprParser.acceptInteger(); + accept(Token.RPAREN); + typeName = "TABLE OF " + name.toString() + "(" + len + ")"; } else { acceptIdentifier("TYPE"); typeName = "TABLE OF " + name.toString() + "%TYPE"; From 4b3ed4c71485cf99290347652ad7473dd4aa4fa9 Mon Sep 17 00:00:00 2001 From: fanglei <793514387@qq.com> Date: Tue, 3 Nov 2020 13:26:17 +0800 Subject: [PATCH 5/7] =?UTF-8?q?bug:=20mysql=E6=94=AF=E6=8C=81=E8=A7=A3?= =?UTF-8?q?=E6=9E=90if...elseif...elseif...end?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sql/dialect/mysql/parser/MySqlLexer.java | 1 + .../mysql/parser/MySqlStatementParser.java | 38 +++++++++---------- .../mysql/visitor/MySqlOutputVisitor.java | 2 +- .../druid/sql/parser/SQLStatementParser.java | 7 +++- .../com/alibaba/druid/sql/parser/Token.java | 2 +- .../sql/parser/MySQL_IF_ELSEIF_Test.java | 32 ++++++++++++++++ 6 files changed, 58 insertions(+), 24 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/sql/parser/MySQL_IF_ELSEIF_Test.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java index f1b8b0fb83..f9fc40f61b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java @@ -39,6 +39,7 @@ public class MySqlLexer extends Lexer { map.put("DUAL", Token.DUAL); map.put("FALSE", Token.FALSE); map.put("IF", Token.IF); + map.put("ELSEIF", Token.ELSEIF); map.put("KILL", Token.KILL); map.put("LIMIT", Token.LIMIT); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index 7c8f9ee353..f2571c00aa 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -8818,28 +8818,24 @@ public class MySqlStatementParser extends SQLStatementParser { this.parseStatementList(stmt.getStatements(), -1, stmt); - while (lexer.token() == Token.ELSE) { + while (lexer.token() == Token.ELSEIF) { lexer.nextToken(); - - if (lexer.token() == Token.IF) { - lexer.nextToken(); - - SQLIfStatement.ElseIf elseIf = new SQLIfStatement.ElseIf(); - - elseIf.setCondition(this.exprParser.expr()); - elseIf.setParent(stmt); - - accept(Token.THEN); - this.parseStatementList(elseIf.getStatements(), -1, elseIf); - - - stmt.getElseIfList().add(elseIf); - } else { - SQLIfStatement.Else elseItem = new SQLIfStatement.Else(); - this.parseStatementList(elseItem.getStatements(), -1, elseItem); - stmt.setElseItem(elseItem); - break; - } + SQLIfStatement.ElseIf elseIf = new SQLIfStatement.ElseIf(); + + elseIf.setCondition(this.exprParser.expr()); + elseIf.setParent(stmt); + + accept(Token.THEN); + this.parseStatementList(elseIf.getStatements(), -1, stmt); + + stmt.getElseIfList().add(elseIf); + } + + if(lexer.token() == Token.ELSE) { + lexer.nextToken(); + SQLIfStatement.Else elseItem = new SQLIfStatement.Else(); + this.parseStatementList(elseItem.getStatements(), -1, elseItem); + stmt.setElseItem(elseItem); } accept(Token.END); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java index fba5a274f6..b95d4ba101 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java @@ -4261,7 +4261,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV @Override public boolean visit(SQLIfStatement.ElseIf x) { - print0(ucase ? "ELSE IF " : "else if "); + print0(ucase ? "ELSEIF " : "elseif "); x.getCondition().accept(this); print0(ucase ? " THEN" : " then"); this.indentCount++; diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java index 951642723c..4273d63077 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -582,7 +582,12 @@ public class SQLStatementParser extends SQLParser { stmt.setParent(parent); continue; } - + + if (lexer.token() == Token.ELSEIF + && parent instanceof SQLIfStatement) { + break; + } + int size = statementList.size(); if (parseStatementListDialect(statementList)) { if (parent != null) { diff --git a/src/main/java/com/alibaba/druid/sql/parser/Token.java b/src/main/java/com/alibaba/druid/sql/parser/Token.java index e728c7ba14..e44914e303 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Token.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Token.java @@ -132,7 +132,7 @@ public enum Token { SHOW("SHOW"), REPLACE("REPLACE"), PERIOD("PERIOD"), - + ELSEIF("ELSEIF"), BITS, // MySql procedure add by zz diff --git a/src/test/java/com/alibaba/druid/sql/parser/MySQL_IF_ELSEIF_Test.java b/src/test/java/com/alibaba/druid/sql/parser/MySQL_IF_ELSEIF_Test.java new file mode 100644 index 0000000000..66998f2874 --- /dev/null +++ b/src/test/java/com/alibaba/druid/sql/parser/MySQL_IF_ELSEIF_Test.java @@ -0,0 +1,32 @@ +package com.alibaba.druid.sql.parser; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; + +public class MySQL_IF_ELSEIF_Test extends TestCase { + + public void test_IF_ELSEIF(){ + String sql = "CREATE TRIGGER trg_test1 BEFORE INSERT ON test_table_name FOR EACH ROW\n" + + "begin\n" + + "\tIF new.BSRQ IS NOT NULL THEN\n" + + "\t\tset new.SJRQ1 = new.BSRQ;\n" + + "\tELSEIF new.SJRQ1 IS NOT NULL THEN\n" + + "\t\tset new.BSRQ = new.SJRQ1;\n" + + "\t\tset new.SJRQ2 =new.SJRQ1;\n" + + " ELSEIF new.SJRQ2 IS NOT NULL THEN\n" + + "\t\tset new.SJRQ1 =new.SJRQ2;\n" + + "\tEND IF;\n" + + "end;"; + List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); + StringBuilder out = new StringBuilder(); + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmtList.get(0).accept(visitor); + System.out.println(stmtList.get(0).toString()); + } +} From f1089660a180dad5081c52213d463a6bc7567800 Mon Sep 17 00:00:00 2001 From: fanglei <793514387@qq.com> Date: Wed, 4 Nov 2020 20:38:11 +0800 Subject: [PATCH 6/7] =?UTF-8?q?bug:=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=87=BA?= =?UTF-8?q?=E8=A7=A3=E6=9E=90bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysql/parser/MySqlStatementParser.java | 8 ++++++-- .../oracle/parser/OracleStatementParser.java | 5 +++++ .../druid/sql/parser/SQLStatementParser.java | 5 ++++- .../druid/sql/visitor/SQLASTOutputVisitor.java | 16 +++++++++------- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index f2571c00aa..bd1eaa38f5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -9099,6 +9099,8 @@ public class MySqlStatementParser extends SQLStatementParser { MySqlLeaveStatement leaveStmt = new MySqlLeaveStatement(); leaveStmt.setLabelName(exprParser.name().getSimpleName()); accept(Token.SEMI); + leaveStmt.setAfterSemi(true); + return leaveStmt; } @@ -9168,7 +9170,8 @@ public class MySqlStatementParser extends SQLStatementParser { stmt.setSelect(select); accept(Token.SEMI); - + stmt.setAfterSemi(true); + return stmt; } @@ -9304,7 +9307,8 @@ public class MySqlStatementParser extends SQLStatementParser { if (!(stmt.getSpStatement() instanceof SQLBlockStatement)) { accept(Token.SEMI); } - + + stmt.setAfterSemi(true); return stmt; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java index 5d7a583021..665ce89f4e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java @@ -168,6 +168,9 @@ public class OracleStatementParser extends SQLStatementParser { SQLStatement stmt = parseBlock(); stmt.setParent(parent); statementList.add(stmt); + if(parent instanceof SQLCreateTriggerStatement) { + return; + } continue; } @@ -1953,6 +1956,8 @@ public class OracleStatementParser extends SQLStatementParser { SQLExpr indexBy = this.exprParser.primary(); ((SQLDataTypeImpl) dataType).setIndexBy(indexBy); } + }else if (lexer.token() == Token.SEMI) { + dataType = new SQLDataTypeImpl("TABLE OF " + name.toString()); } dataType.setDbType(dbType); } else if (lexer.identifierEquals("VARRAY")) { diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java index 4273d63077..655f1463fa 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -595,6 +595,9 @@ public class SQLStatementParser extends SQLParser { SQLStatement dialectStmt = statementList.get(j); dialectStmt.setParent(parent); } + if (parent instanceof SQLCreateTriggerStatement) { + return; + } } continue; @@ -3848,7 +3851,7 @@ public class SQLStatementParser extends SQLParser { stmt.setWhen(condition); } - List body = this.parseStatementList(); + List body = this.parseStatementList(stmt); if (body == null || body.isEmpty()) { throw new ParserException("syntax error"); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index cf0ca2cec6..fe9ba92938 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -2890,6 +2890,8 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet } } else if (expr instanceof SQLMethodInvokeExpr) { visit((SQLMethodInvokeExpr) expr); + } else if (expr instanceof SQLListExpr) { + printAndAccept(((SQLListExpr) expr).getItems(), ","); } else { expr.accept(this); } @@ -4385,19 +4387,19 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet } if (x.isDropStorage()) { - print0(ucase ? " DROP STORAGE" : " drop storage"); + print0(ucase ? " DROP STORAGE" : " drop storage"); } if (x.isReuseStorage()) { - print0(ucase ? " REUSE STORAGE" : " reuse storage"); + print0(ucase ? " REUSE STORAGE" : " reuse storage"); } if (x.isIgnoreDeleteTriggers()) { - print0(ucase ? " IGNORE DELETE TRIGGERS" : " ignore delete triggers"); + print0(ucase ? " IGNORE DELETE TRIGGERS" : " ignore delete triggers"); } if (x.isRestrictWhenDeleteTriggers()) { - print0(ucase ? " RESTRICT WHEN DELETE TRIGGERS" : " restrict when delete triggers"); + print0(ucase ? " RESTRICT WHEN DELETE TRIGGERS" : " restrict when delete triggers"); } if (x.isContinueIdentity()) { @@ -4405,7 +4407,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet } if (x.isImmediate()) { - print0(ucase ? " IMMEDIATE" : " immediate"); + print0(ucase ? " IMMEDIATE" : " immediate"); } return false; @@ -5098,7 +5100,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet @Override public boolean visit(SQLKeep x) { if (x.getDenseRank() == SQLKeep.DenseRank.FIRST) { - print0(ucase ? "KEEP (DENSE_RANK FIRST " : "keep (dense_rank first "); + print0(ucase ? "KEEP (DENSE_RANK FIRST " : "keep (dense_rank first "); } else { print0(ucase ? "KEEP (DENSE_RANK LAST " : "keep (dense_rank last "); } @@ -7470,7 +7472,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet protected void printPartitions(List partitions) { if (partitions.size() == 1 && "ALL".equalsIgnoreCase(partitions.get(0).getSimpleName())) { - print0(ucase ? "ALL" : "all"); + print0(ucase ? "ALL" : "all"); } else { printAndAccept(partitions, ", "); } From c4baecd0f237520fd01f22abda56ba6f5a378b0e Mon Sep 17 00:00:00 2001 From: fanglei <793514387@qq.com> Date: Thu, 5 Nov 2020 17:28:05 +0800 Subject: [PATCH 7/7] =?UTF-8?q?bug:=20oracle=E8=A7=A3=E6=9E=90Record?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dialect/oracle/parser/OracleStatementParser.java | 11 ++++++----- .../druid/sql/visitor/SQLASTOutputVisitor.java | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java index 665ce89f4e..b43b3191d8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java @@ -1907,6 +1907,7 @@ public class OracleStatementParser extends SQLStatementParser { || lexer.token() == Token.TABLE) { break; } else if (lexer.identifierEquals(FnvHash.Constants.TYPE)) { + lexer.nextToken(); name = this.exprParser.name(); accept(Token.IS); @@ -1921,7 +1922,7 @@ public class OracleStatementParser extends SQLStatementParser { lexer.nextToken(); accept(Token.OF); - name = this.exprParser.name(); + SQLName tname = this.exprParser.name(); if (lexer.token() == Token.PERCENT) { lexer.nextToken(); @@ -1929,15 +1930,15 @@ public class OracleStatementParser extends SQLStatementParser { String typeName; if (lexer.identifierEquals(FnvHash.Constants.ROWTYPE)) { lexer.nextToken(); - typeName = "TABLE OF " + name.toString() + "%ROWTYPE"; + typeName = "TABLE OF " + tname.toString() + "%ROWTYPE"; } else if (lexer.token() == Token.LPAREN && lexer.stringVal().equalsIgnoreCase("Varchar2")) { accept(Token.LPAREN); int len = this.exprParser.acceptInteger(); accept(Token.RPAREN); - typeName = "TABLE OF " + name.toString() + "(" + len + ")"; + typeName = "TABLE OF " + tname.toString() + "(" + len + ")"; } else { acceptIdentifier("TYPE"); - typeName = "TABLE OF " + name.toString() + "%TYPE"; + typeName = "TABLE OF " + tname.toString() + "%TYPE"; } dataType = new SQLDataTypeImpl(typeName); @@ -1957,7 +1958,7 @@ public class OracleStatementParser extends SQLStatementParser { ((SQLDataTypeImpl) dataType).setIndexBy(indexBy); } }else if (lexer.token() == Token.SEMI) { - dataType = new SQLDataTypeImpl("TABLE OF " + name.toString()); + dataType = new SQLDataTypeImpl("TABLE OF " + tname.toString()); } dataType.setDbType(dbType); } else if (lexer.identifierEquals("VARRAY")) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index fe9ba92938..047e9ed469 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -6827,7 +6827,8 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet String dataTypeName = dataType.getName(); boolean printType = (dataTypeName.startsWith("TABLE OF") && x.getDefaultValue() == null) || dataTypeName.equalsIgnoreCase("REF CURSOR") - || dataTypeName.startsWith("VARRAY("); + || dataTypeName.startsWith("VARRAY(") + || dataTypeName.startsWith("RECORD"); if (printType) { print0(ucase ? "TYPE " : "type "); }