diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowAuthorsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowAuthorsStatement.java new file mode 100644 index 0000000000..e39015f81b --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowAuthorsStatement.java @@ -0,0 +1,14 @@ +package com.alibaba.druid.sql.dialect.mysql.ast.statement; + +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; + + +public class MySqlShowAuthorsStatement extends MySqlStatementImpl { + + private static final long serialVersionUID = 1L; + + public void accept0(MySqlASTVisitor visitor) { + visitor.visit(this); + visitor.endVisit(this); + } +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinLogEventsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinLogEventsStatement.java new file mode 100644 index 0000000000..f0816ecaa1 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinLogEventsStatement.java @@ -0,0 +1,48 @@ +package com.alibaba.druid.sql.dialect.mysql.ast.statement; + +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.Limit; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; + +public class MySqlShowBinLogEventsStatement extends MySqlStatementImpl { + + private static final long serialVersionUID = 1L; + + private SQLExpr in; + private SQLExpr from; + private Limit limit; + + public void accept0(MySqlASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, in); + acceptChild(visitor, from); + acceptChild(visitor, limit); + } + visitor.endVisit(this); + } + + public SQLExpr getIn() { + return in; + } + + public void setIn(SQLExpr in) { + this.in = in; + } + + public SQLExpr getFrom() { + return from; + } + + public void setFrom(SQLExpr from) { + this.from = from; + } + + public Limit getLimit() { + return limit; + } + + public void setLimit(Limit limit) { + this.limit = limit; + } + +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinaryLogsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinaryLogsStatement.java new file mode 100644 index 0000000000..87bbf88a08 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinaryLogsStatement.java @@ -0,0 +1,14 @@ +package com.alibaba.druid.sql.dialect.mysql.ast.statement; + +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; + + +public class MySqlShowBinaryLogsStatement extends MySqlStatementImpl { + + private static final long serialVersionUID = 1L; + + public void accept0(MySqlASTVisitor visitor) { + visitor.visit(this); + visitor.endVisit(this); + } +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCollationStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCollationStatement.java new file mode 100644 index 0000000000..963c8bce17 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCollationStatement.java @@ -0,0 +1,37 @@ +package com.alibaba.druid.sql.dialect.mysql.ast.statement; + +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; + +public class MySqlShowCollationStatement extends MySqlStatementImpl { + + private static final long serialVersionUID = 1L; + + private SQLExpr where; + private SQLExpr pattern; + + public void accept0(MySqlASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, where); + acceptChild(visitor, pattern); + } + visitor.endVisit(this); + } + + public SQLExpr getWhere() { + return where; + } + + public void setWhere(SQLExpr where) { + this.where = where; + } + + public SQLExpr getPattern() { + return pattern; + } + + public void setPattern(SQLExpr pattern) { + this.pattern = pattern; + } + +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterLogsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterLogsStatement.java new file mode 100644 index 0000000000..a944f06aaf --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterLogsStatement.java @@ -0,0 +1,14 @@ +package com.alibaba.druid.sql.dialect.mysql.ast.statement; + +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; + + +public class MySqlShowMasterLogsStatement extends MySqlStatementImpl { + + private static final long serialVersionUID = 1L; + + public void accept0(MySqlASTVisitor visitor) { + visitor.visit(this); + visitor.endVisit(this); + } +} 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 f163244818..eba47880bb 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 @@ -55,8 +55,13 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetCharSetStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetNamesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetTransactionIsolationLevelStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowAuthorsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowBinLogEventsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowBinaryLogsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowCollationStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowColumnsStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowDatabasesStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowMasterLogsStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowStatusStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowWarningsStatement; @@ -494,8 +499,80 @@ public class MySqlStatementParser extends SQLStatementParser { lexer.nextToken(); return new CobarShowStatus(); } + + if (identifierEquals("AUTHORS")) { + lexer.nextToken(); + return new MySqlShowAuthorsStatement(); + } + + if (identifierEquals("BINARY")) { + lexer.nextToken(); + acceptIdentifier("LOGS"); + return new MySqlShowBinaryLogsStatement(); + } + + if (identifierEquals("MASTER")) { + lexer.nextToken(); + acceptIdentifier("LOGS"); + return new MySqlShowMasterLogsStatement(); + } + + if (identifierEquals("COLLATION")) { + lexer.nextToken(); + MySqlShowCollationStatement stmt = new MySqlShowCollationStatement(); + + if (lexer.token() == Token.LIKE) { + lexer.nextToken(); + stmt.setPattern(this.exprParser.expr()); + } + + if (lexer.token() == Token.WHERE) { + lexer.nextToken(); + stmt.setWhere(this.exprParser.expr()); + } + + return stmt; + } + + if (identifierEquals("BINLOG")) { + lexer.nextToken(); + acceptIdentifier("EVENTS"); + MySqlShowBinLogEventsStatement stmt = new MySqlShowBinLogEventsStatement(); + + if (lexer.token() == Token.IN) { + lexer.nextToken(); + stmt.setIn(this.exprParser.expr()); + } + + if (lexer.token() == Token.FROM) { + lexer.nextToken(); + stmt.setFrom(this.exprParser.expr()); + } + + if (lexer.token() == Token.LIMIT) { + lexer.nextToken(); + + MySqlSelectQueryBlock.Limit limit = new MySqlSelectQueryBlock.Limit(); - throw new ParserException("TODO"); + SQLExpr temp = this.exprParser.expr(); + if (lexer.token() == (Token.COMMA)) { + limit.setOffset(temp); + lexer.nextToken(); + limit.setRowCount(exprParser.expr()); + } else if (identifierEquals("OFFSET")) { + limit.setRowCount(temp); + lexer.nextToken(); + limit.setOffset(exprParser.expr()); + } else { + limit.setRowCount(temp); + } + stmt.setLimit(limit); + } + + return stmt; + } + + throw new ParserException("TODO " + lexer.stringVal()); } private MySqlShowStatusStatement parseShowStatus() throws ParserException { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java index 8300dbf8e8..9e2e0e3904 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java @@ -46,8 +46,13 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetCharSetStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetNamesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetTransactionIsolationLevelStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowAuthorsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowBinLogEventsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowBinaryLogsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowCollationStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowColumnsStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowDatabasesStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowMasterLogsStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowStatusStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowWarningsStatement; @@ -157,6 +162,10 @@ public interface MySqlASTVisitor extends SQLASTVisitor { void endVisit(MySqlShowStatusStatement x); boolean visit(MySqlShowStatusStatement x); + + void endVisit(MySqlShowAuthorsStatement x); + + boolean visit(MySqlShowAuthorsStatement x); void endVisit(CobarShowStatus x); @@ -221,4 +230,20 @@ public interface MySqlASTVisitor extends SQLASTVisitor { boolean visit(MySqlSetCharSetStatement x); void endVisit(MySqlSetCharSetStatement x); + + boolean visit(MySqlShowBinaryLogsStatement x); + + void endVisit(MySqlShowBinaryLogsStatement x); + + boolean visit(MySqlShowMasterLogsStatement x); + + void endVisit(MySqlShowMasterLogsStatement x); + + boolean visit(MySqlShowCollationStatement x); + + void endVisit(MySqlShowCollationStatement x); + + boolean visit(MySqlShowBinLogEventsStatement x); + + void endVisit(MySqlShowBinLogEventsStatement x); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java index 867fe64b54..f5825fe2fd 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java @@ -33,8 +33,13 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.L import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetCharSetStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetNamesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetTransactionIsolationLevelStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowAuthorsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowBinLogEventsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowBinaryLogsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowCollationStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowColumnsStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowDatabasesStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowMasterLogsStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowStatusStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowWarningsStatement; @@ -476,4 +481,54 @@ public class MySqlASTVisitorAdapter extends SQLASTVisitorAdapter implements public void endVisit(MySqlSetCharSetStatement x) { } + + @Override + public boolean visit(MySqlShowAuthorsStatement x) { + return true; + } + + @Override + public void endVisit(MySqlShowAuthorsStatement x) { + + } + + @Override + public boolean visit(MySqlShowBinaryLogsStatement x) { + return true; + } + + @Override + public void endVisit(MySqlShowBinaryLogsStatement x) { + + } + + @Override + public boolean visit(MySqlShowMasterLogsStatement x) { + return true; + } + + @Override + public void endVisit(MySqlShowMasterLogsStatement x) { + + } + + @Override + public boolean visit(MySqlShowCollationStatement x) { + return true; + } + + @Override + public void endVisit(MySqlShowCollationStatement x) { + + } + + @Override + public boolean visit(MySqlShowBinLogEventsStatement x) { + return true; + } + + @Override + public void endVisit(MySqlShowBinLogEventsStatement x) { + + } } 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 3e91d2b56f..3a338d94d4 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 @@ -65,8 +65,13 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.L import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetCharSetStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetNamesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetTransactionIsolationLevelStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowAuthorsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowBinLogEventsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowBinaryLogsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowCollationStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowColumnsStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowDatabasesStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowMasterLogsStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowStatusStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowWarningsStatement; @@ -1475,4 +1480,79 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV public void endVisit(MySqlSetCharSetStatement x) { } + + @Override + public void endVisit(MySqlShowAuthorsStatement x) { + + } + + @Override + public boolean visit(MySqlShowAuthorsStatement x) { + print("SHOW AUTHORS"); + return false; + } + + @Override + public void endVisit(MySqlShowBinaryLogsStatement x) { + + } + + @Override + public boolean visit(MySqlShowBinaryLogsStatement x) { + print("SHOW BINARY LOGS"); + return false; + } + + @Override + public boolean visit(MySqlShowMasterLogsStatement x) { + print("SHOW MASTER LOGS"); + return false; + } + + @Override + public void endVisit(MySqlShowMasterLogsStatement x) { + + } + + @Override + public boolean visit(MySqlShowCollationStatement x) { + print("SHOW COLLATION"); + if (x.getPattern() != null) { + print(" LIKE "); + x.getPattern().accept(this); + } + if (x.getWhere() != null) { + print(" WHERE "); + x.getWhere().accept(this); + } + return false; + } + + @Override + public void endVisit(MySqlShowCollationStatement x) { + + } + + @Override + public boolean visit(MySqlShowBinLogEventsStatement x) { + print("SHOW BINLOG EVENTS"); + if (x.getIn() != null) { + print(" IN "); + x.getIn().accept(this); + } + if (x.getFrom() != null) { + print(" FROM "); + x.getFrom().accept(this); + } + if (x.getLimit() != null) { + print(" "); + x.getLimit().accept(this); + } + return false; + } + + @Override + public void endVisit(MySqlShowBinLogEventsStatement x) { + + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java index 183267b8a7..4f1088e1b7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java @@ -42,8 +42,13 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.L import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetCharSetStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetNamesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetTransactionIsolationLevelStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowAuthorsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowBinLogEventsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowBinaryLogsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowCollationStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowColumnsStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowDatabasesStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowMasterLogsStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowStatusStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowWarningsStatement; @@ -72,7 +77,7 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS accept(x.getFrom()); accept(x.getUsing()); x.getTableSource().accept(this); - + if (x.getTableSource() instanceof SQLExprTableSource) { SQLName tableName = (SQLName) ((SQLExprTableSource) x.getTableSource()).getExpr(); String ident = tableName.toString(); @@ -80,10 +85,10 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS TableStat stat = this.getTableStat(ident); stat.incrementDeleteCount(); - } + } accept(x.getWhere()); - + accept(x.getOrderBy()); accept(x.getLimit()); @@ -496,18 +501,18 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS @Override public void endVisit(MySqlDescribeStatement x) { - + } - @Override - public boolean visit(MySqlUpdateStatement x) { - return visit((SQLUpdateStatement) x); - } + @Override + public boolean visit(MySqlUpdateStatement x) { + return visit((SQLUpdateStatement) x); + } - @Override - public void endVisit(MySqlUpdateStatement x) { - - } + @Override + public void endVisit(MySqlUpdateStatement x) { + + } @Override public boolean visit(MySqlSetTransactionIsolationLevelStatement x) { @@ -516,7 +521,7 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS @Override public void endVisit(MySqlSetTransactionIsolationLevelStatement x) { - + } @Override @@ -526,16 +531,66 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS @Override public void endVisit(MySqlSetNamesStatement x) { - + } - + @Override public boolean visit(MySqlSetCharSetStatement x) { return false; } - + @Override public void endVisit(MySqlSetCharSetStatement x) { + + } + + @Override + public boolean visit(MySqlShowAuthorsStatement x) { + return false; + } + + @Override + public void endVisit(MySqlShowAuthorsStatement x) { + + } + + @Override + public boolean visit(MySqlShowBinaryLogsStatement x) { + return false; + } + + @Override + public void endVisit(MySqlShowBinaryLogsStatement x) { + + } + + @Override + public boolean visit(MySqlShowMasterLogsStatement x) { + return false; + } + + @Override + public void endVisit(MySqlShowMasterLogsStatement x) { + + } + + @Override + public boolean visit(MySqlShowCollationStatement x) { + return false; + } + + @Override + public void endVisit(MySqlShowCollationStatement x) { + + } + + @Override + public boolean visit(MySqlShowBinLogEventsStatement x) { + return false; + } + + @Override + public void endVisit(MySqlShowBinLogEventsStatement x) { } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java index 1a921c63a3..84c8bfcd28 100755 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java @@ -12,6 +12,11 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlDescribeStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetCharSetStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetNamesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetTransactionIsolationLevelStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowAuthorsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowBinLogEventsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowBinaryLogsStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowCollationStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowMasterLogsStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; @@ -165,55 +170,89 @@ public class DALParserTest extends TestCase { Assert.assertEquals("SET CHARACTER SET DEFAULT", output); } + public void test_show_authors() throws Exception { + String sql = "shoW authors "; + MySqlStatementParser parser = new MySqlStatementParser(sql); + MySqlShowAuthorsStatement show = (MySqlShowAuthorsStatement) parser.parseStatementList().get(0); + parser.match(Token.EOF); + String output = SQLUtils.toMySqlString(show); + Assert.assertEquals("SHOW AUTHORS", output); + } + + public void test_show_binaryLogs() throws Exception { + String sql = "SHOW BINARY LOGS "; + MySqlStatementParser parser = new MySqlStatementParser(sql); + MySqlShowBinaryLogsStatement show = (MySqlShowBinaryLogsStatement) parser.parseStatementList().get(0); + parser.match(Token.EOF); + String output = SQLUtils.toMySqlString(show); + Assert.assertEquals("SHOW BINARY LOGS", output); + } + + public void test_show_masterLogs() throws Exception { + String sql = "SHOW MASTER LOGS "; + MySqlStatementParser parser = new MySqlStatementParser(sql); + MySqlShowMasterLogsStatement show = (MySqlShowMasterLogsStatement) parser.parseStatementList().get(0); + parser.match(Token.EOF); + String output = SQLUtils.toMySqlString(show); + Assert.assertEquals("SHOW MASTER LOGS", output); + } + + public void test_show_collation() throws Exception { + String sql = "SHOW collation"; + MySqlStatementParser parser = new MySqlStatementParser(sql); + MySqlShowCollationStatement show = (MySqlShowCollationStatement) parser.parseStatementList().get(0); + parser.match(Token.EOF); + String output = SQLUtils.toMySqlString(show); + Assert.assertEquals("SHOW COLLATION", output); + } + + public void test_show_collation_1() throws Exception { + String sql = "SHOW Collation like 'var1'"; + MySqlStatementParser parser = new MySqlStatementParser(sql); + MySqlShowCollationStatement show = (MySqlShowCollationStatement) parser.parseStatementList().get(0); + parser.match(Token.EOF); + String output = SQLUtils.toMySqlString(show); + Assert.assertEquals("SHOW COLLATION LIKE 'var1'", output); + } + + public void test_show_collation_2() throws Exception { + String sql = "SHOW COLLATION WHERE `Default` = 'Yes'"; + MySqlStatementParser parser = new MySqlStatementParser(sql); + MySqlShowCollationStatement show = (MySqlShowCollationStatement) parser.parseStatementList().get(0); + parser.match(Token.EOF); + String output = SQLUtils.toMySqlString(show); + Assert.assertEquals("SHOW COLLATION WHERE `Default` = 'Yes'", output); + } + + public void test_binaryLog() throws Exception { + String sql = "SHOW binlog events in 'a' from 1 limit 1,2 "; + MySqlStatementParser parser = new MySqlStatementParser(sql); + MySqlShowBinLogEventsStatement show = (MySqlShowBinLogEventsStatement) parser.parseStatementList().get(0); + parser.match(Token.EOF); + String output = SQLUtils.toMySqlString(show); + Assert.assertEquals("SHOW BINLOG EVENTS IN 'a' FROM 1 LIMIT 1, 2", output); + } + + public void test_binaryLog_1() throws Exception { + String sql = "SHOW binlog events from 1 limit 1,2"; + MySqlStatementParser parser = new MySqlStatementParser(sql); + MySqlShowBinLogEventsStatement show = (MySqlShowBinLogEventsStatement) parser.parseStatementList().get(0); + parser.match(Token.EOF); + String output = SQLUtils.toMySqlString(show); + Assert.assertEquals("SHOW BINLOG EVENTS FROM 1 LIMIT 1, 2", output); + } + + public void test_binaryLog_2() throws Exception { + String sql = "SHOW binlog events "; + MySqlStatementParser parser = new MySqlStatementParser(sql); + MySqlShowBinLogEventsStatement show = (MySqlShowBinLogEventsStatement) parser.parseStatementList().get(0); + parser.match(Token.EOF); + String output = SQLUtils.toMySqlString(show); + Assert.assertEquals("SHOW BINLOG EVENTS", output); + } + // // public void testShow() throws Exception { -// String sql = "shoW authors "; -// SQLLexer lexer = new SQLLexer(sql); -// DALParser parser = new DALParser(lexer, new SQLExprParser(lexer)); -// DALShowStatement show = (DALShowStatement) parser.show(); -// parser.match(Token.EOF); -// String output = output2MySQL(show, sql); -// Assert.assertEquals("SHOW AUTHORS", output); -// -// sql = "SHOW BINARY LOGS "; -// lexer = new SQLLexer(sql); -// parser = new DALParser(lexer, new SQLExprParser(lexer)); -// show = (DALShowStatement) parser.show(); -// parser.match(Token.EOF); -// output = output2MySQL(show, sql); -// Assert.assertEquals("SHOW BINARY LOGS", output); -// -// sql = "SHOW MASTER LOGS "; -// lexer = new SQLLexer(sql); -// parser = new DALParser(lexer, new SQLExprParser(lexer)); -// show = (DALShowStatement) parser.show(); -// parser.match(Token.EOF); -// output = output2MySQL(show, sql); -// Assert.assertEquals("SHOW BINARY LOGS", output); -// -// sql = "SHOW binlog events in 'a' from 1 limit 1,2 "; -// lexer = new SQLLexer(sql); -// parser = new DALParser(lexer, new SQLExprParser(lexer)); -// show = (DALShowStatement) parser.show(); -// parser.match(Token.EOF); -// output = output2MySQL(show, sql); -// Assert.assertEquals("SHOW BINLOG EVENTS IN 'a' FROM 1 LIMIT 1, 2", output); -// -// sql = "SHOW binlog events from 1 limit 1,2 "; -// lexer = new SQLLexer(sql); -// parser = new DALParser(lexer, new SQLExprParser(lexer)); -// show = (DALShowStatement) parser.show(); -// parser.match(Token.EOF); -// output = output2MySQL(show, sql); -// Assert.assertEquals("SHOW BINLOG EVENTS FROM 1 LIMIT 1, 2", output); -// -// sql = "SHOW binlog events "; -// lexer = new SQLLexer(sql); -// parser = new DALParser(lexer, new SQLExprParser(lexer)); -// show = (DALShowStatement) parser.show(); -// parser.match(Token.EOF); -// output = output2MySQL(show, sql); -// Assert.assertEquals("SHOW BINLOG EVENTS", output); // // sql = "SHOW CHARACTER SET like 'var' "; // lexer = new SQLLexer(sql); @@ -239,22 +278,6 @@ public class DALParserTest extends TestCase { // output = output2MySQL(show, sql); // Assert.assertEquals("SHOW CHARACTER SET", output); // -// sql = "SHOW collation "; -// lexer = new SQLLexer(sql); -// parser = new DALParser(lexer, new SQLExprParser(lexer)); -// show = (DALShowStatement) parser.show(); -// parser.match(Token.EOF); -// output = output2MySQL(show, sql); -// Assert.assertEquals("SHOW COLLATION", output); -// -// sql = "SHOW Collation like 'var1' "; -// lexer = new SQLLexer(sql); -// parser = new DALParser(lexer, new SQLExprParser(lexer)); -// show = (DALShowStatement) parser.show(); -// parser.match(Token.EOF); -// output = output2MySQL(show, sql); -// Assert.assertEquals("SHOW COLLATION LIKE 'var1'", output); -// // sql = "SHOW collation where avg((select * from (tb1,tb2)))!=100 "; // lexer = new SQLLexer(sql); // parser = new DALParser(lexer, new SQLExprParser(lexer));