diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java index 6bfc090ce1..ec5fa1d5ad 100644 --- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java +++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java @@ -290,11 +290,11 @@ public class SQLUtils { SQLStatement stmt = statementList.get(i); if (i > 0) { - if (printStmtSeperator) { + SQLStatement preStmt = statementList.get(i - 1); + if (printStmtSeperator && !preStmt.isAfterSemi()) { visitor.print(";"); } - SQLStatement preStmt = statementList.get(i - 1); List comments = preStmt.getAfterCommentsDirect(); if (comments != null){ for (int j = 0; j < comments.size(); ++j) { @@ -325,11 +325,6 @@ public class SQLUtils { stmt.accept(visitor); if (i == size - 1) { - Boolean semi = (Boolean) stmt.getAttribute("format.semi"); - if (semi != null && semi.booleanValue() && printStmtSeperator) { - visitor.print(";"); - } - List comments = stmt.getAfterCommentsDirect(); if (comments != null){ for (int j = 0; j < comments.size(); ++j) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java index 09561cca58..3374558612 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java @@ -16,8 +16,10 @@ package com.alibaba.druid.sql.dialect.mysql.parser; import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLSetQuantifier; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; +import com.alibaba.druid.sql.ast.expr.SQLListExpr; import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr; import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlForceIndexHint; @@ -371,7 +373,20 @@ public class MySqlSelectParser extends SQLSelectParser { } } } else { - queryBlock.setInto(this.exprParser.name()); + SQLExpr intoExpr = this.exprParser.name(); + if (lexer.token() == Token.COMMA) { + SQLListExpr list = new SQLListExpr(); + list.addItem(intoExpr); + + while (lexer.token() == Token.COMMA) { + lexer.nextToken(); + SQLName name = this.exprParser.name(); + list.addItem(name); + } + + intoExpr = list; + } + queryBlock.setInto(intoExpr); } } } 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 e90409b478..0b7ea7be21 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 @@ -553,12 +553,6 @@ public class MySqlStatementParser extends SQLStatementParser { } public boolean parseStatementListDialect(List statementList) { - if (lexer.token() == Token.KILL) { - SQLStatement stmt = parseKill(); - statementList.add(stmt); - return true; - } - if (identifierEquals("PREPARE")) { MySqlPrepareStatement stmt = parsePrepare(); statementList.add(stmt); @@ -733,6 +727,33 @@ public class MySqlStatementParser extends SQLStatementParser { return true; } + if (lexer.token() == Token.IDENTIFIER) { + String label = lexer.stringVal(); + char ch = lexer.current(); + int bp = lexer.bp(); + lexer.nextToken(); + if (lexer.token() == Token.VARIANT && lexer.stringVal().equals(":")) { + lexer.nextToken(); + if (lexer.token() == Token.LOOP) { + // parse loop statement + statementList.add(this.parseLoop(label)); + } else if (lexer.token() == Token.WHILE) { + // parse while statement with label + statementList.add(this.parseWhile(label)); + } else if (lexer.token() == Token.BEGIN) { + // parse begin-end statement with label + statementList.add(this.parseBlock(label)); + } else if (lexer.token() == Token.REPEAT) { + // parse repeat statement with label + statementList.add(this.parseRepeat(label)); + } + return true; + } else { + lexer.reset(bp, ch, Token.IDENTIFIER); + } + + } + return false; } @@ -740,7 +761,7 @@ public class MySqlStatementParser extends SQLStatementParser { SQLBlockStatement block = new SQLBlockStatement(); accept(Token.BEGIN); - parseProcedureStatementList(block.getStatementList()); + this.parseStatementList(block.getStatementList(), -1, block); accept(Token.END); return block; @@ -3369,7 +3390,8 @@ public class MySqlStatementParser extends SQLStatementParser { // insert if (lexer.token() == Token.INSERT) { - statementList.add(parseInsert()); + SQLStatement stmt = parseInsert(); + statementList.add(stmt); continue; } @@ -3432,7 +3454,8 @@ public class MySqlStatementParser extends SQLStatementParser { // while statement if (lexer.token() == Token.WHILE) { - statementList.add(this.parseWhile()); + SQLStatement stmt = this.parseWhile(); + statementList.add(stmt); continue; } @@ -3731,7 +3754,8 @@ public class MySqlStatementParser extends SQLStatementParser { stmt.addVar(item); if (lexer.token() == Token.COMMA) { - accept(Token.COMMA); + lexer.nextToken(); + stmt.setAfterSemi(true); continue; } else if (lexer.token() != Token.EOF) { // var type @@ -3842,15 +3866,16 @@ public class MySqlStatementParser extends SQLStatementParser { * @return */ public MySqlRepeatStatement parseRepeat() { - MySqlRepeatStatement repeatStmt = new MySqlRepeatStatement(); + MySqlRepeatStatement stmt = new MySqlRepeatStatement(); accept(Token.REPEAT); - parseProcedureStatementList(repeatStmt.getStatements()); + parseStatementList(stmt.getStatements(), -1, stmt); accept(Token.UNTIL); - repeatStmt.setCondition(exprParser.expr()); + stmt.setCondition(exprParser.expr()); accept(Token.END); accept(Token.REPEAT); accept(Token.SEMI); - return repeatStmt; + stmt.setAfterSemi(true); + return stmt; } /** 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 3466648fa4..e47c798201 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 @@ -3129,9 +3129,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV println(); } SQLStatement stmt = x.getStatementList().get(i); - stmt.setParent(x); stmt.accept(this); - print(';'); } decrementIndent(); println(); @@ -3377,15 +3375,16 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV } print0(ucase ? "REPEAT " : "repeat "); + incrementIndent(); println(); for (int i = 0, size = x.getStatements().size(); i < size; ++i) { SQLStatement item = x.getStatements().get(i); - item.setParent(x); item.accept(this); if (i != size - 1) { println(); } } + decrementIndent(); println(); print0(ucase ? "UNTIL " : "until "); x.getCondition().accept(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsStatementParser.java index 91f80e24ab..3c6c082952 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsStatementParser.java @@ -65,8 +65,9 @@ public class OdpsStatementParser extends SQLStatementParser { } public SQLSelectStatement parseSelect() { - OdpsSelectParser selectParser = new OdpsSelectParser(this.exprParser); - return new SQLSelectStatement(selectParser.select(), JdbcConstants.ODPS); + return new SQLSelectStatement( + new OdpsSelectParser(this.exprParser) + .select(), JdbcConstants.ODPS); } public SQLCreateTableStatement parseCreateTable() { diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java index a8f7125798..467c350d0f 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java @@ -389,7 +389,8 @@ public class SQLSelectParser extends SQLParser { lexer.nextToken(); - queryBlock.setFrom(parseTableSource()); + queryBlock.setFrom( + parseTableSource()); } public SQLTableSource parseTableSource() { 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 1a2351825c..86eae3b3fc 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -31,6 +31,7 @@ import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.ast.statement.SQLCreateTriggerStatement.TriggerEvent; import com.alibaba.druid.sql.ast.statement.SQLCreateTriggerStatement.TriggerType; +import com.alibaba.druid.sql.dialect.mysql.ast.clause.MySqlRepeatStatement; import com.alibaba.druid.util.JdbcConstants; public class SQLStatementParser extends SQLParser { @@ -72,7 +73,13 @@ public class SQLStatementParser extends SQLParser { public List parseStatementList() { List statementList = new ArrayList(); - parseStatementList(statementList); + parseStatementList(statementList, -1, null); + return statementList; + } + + public List parseStatementList(SQLObject parent) { + List statementList = new ArrayList(); + parseStatementList(statementList, -1, parent); return statementList; } @@ -92,196 +99,198 @@ public class SQLStatementParser extends SQLParser { } } - if (lexer.token() == Token.EOF || lexer.token() == Token.END) { - if (lexer.isKeepComments() && lexer.hasComment() && statementList.size() > 0) { - SQLStatement stmt = statementList.get(statementList.size() - 1); - stmt.addAfterComment(lexer.readAndResetComments()); - } - return; - } - - if (lexer.token() == Token.SEMI) { - int line0 = lexer.getLine(); - lexer.nextToken(); - int line1 = lexer.getLine(); - - if (lexer.isKeepComments() && statementList.size() > 0) { - SQLStatement stmt = statementList.get(statementList.size() - 1); - if (line1 - line0 <= 1) { + switch (lexer.token()) { + case EOF: + case END: + case UNTIL: + if (lexer.isKeepComments() && lexer.hasComment() && statementList.size() > 0) { + SQLStatement stmt = statementList.get(statementList.size() - 1); stmt.addAfterComment(lexer.readAndResetComments()); } - stmt.getAttributes().put("format.semi", Boolean.TRUE); + return; + case SEMI: { + int line0 = lexer.getLine(); + lexer.nextToken(); + int line1 = lexer.getLine(); + + if(statementList.size() > 0) { + SQLStatement lastStmt = statementList.get(statementList.size() - 1); + lastStmt.setAfterSemi(true); + + if (lexer.isKeepComments()) { + SQLStatement stmt = statementList.get(statementList.size() - 1); + if (line1 - line0 <= 1) { + stmt.addAfterComment(lexer.readAndResetComments()); + } + } + } + + continue; } - continue; - } - - if (lexer.token() == Token.SELECT) { - statementList.add(parseSelect()); - continue; - } - - if (lexer.token() == (Token.UPDATE)) { - statementList.add(parseUpdateStatement()); - continue; - } - - if (lexer.token() == (Token.CREATE)) { - - statementList.add(parseCreate()); - continue; - } - - if (lexer.token() == (Token.INSERT)) { - SQLStatement insertStatement = parseInsert(); - statementList.add(insertStatement); - - continue; - } - - if (lexer.token() == (Token.DELETE)) { - statementList.add(parseDeleteStatement()); - continue; - } - - if (lexer.token() == (Token.EXPLAIN)) { - statementList.add(parseExplain()); - continue; - } - - if (lexer.token() == Token.SET) { - statementList.add(parseSet()); - continue; - } - - if (lexer.token() == Token.ALTER) { - statementList.add(parseAlter()); - continue; - } - - if (lexer.token() == Token.DROP) { - List beforeComments = null; - if (lexer.isKeepComments() && lexer.hasComment()) { - beforeComments = lexer.readAndResetComments(); + case SELECT: { + SQLStatement stmt = parseSelect(); + stmt.setParent(parent); + statementList.add(stmt); + continue; } - - lexer.nextToken(); - - if (lexer.token() == Token.TABLE || identifierEquals("TEMPORARY")) { - - SQLDropTableStatement stmt = parseDropTable(false); - - if (beforeComments != null) { - stmt.addBeforeComment(beforeComments); - } - + case UPDATE: { + SQLStatement stmt = parseUpdateStatement(); + stmt.setParent(parent); statementList.add(stmt); continue; - } else if (lexer.token() == Token.USER) { - SQLStatement stmt = parseDropUser(); - if (beforeComments != null) { - stmt.addBeforeComment(beforeComments); - } - - statementList.add(stmt); - continue; - } else if (lexer.token() == Token.INDEX) { - SQLStatement stmt = parseDropIndex(); - if (beforeComments != null) { - stmt.addBeforeComment(beforeComments); - } - - statementList.add(stmt); - continue; - } else if (lexer.token() == Token.VIEW) { - SQLStatement stmt = parseDropView(false); - - if (beforeComments != null) { - stmt.addBeforeComment(beforeComments); - } - - statementList.add(stmt); - continue; - } else if (lexer.token() == Token.TRIGGER) { - SQLStatement stmt = parseDropTrigger(false); - - if (beforeComments != null) { - stmt.addBeforeComment(beforeComments); - } - - statementList.add(stmt); - continue; - } else if (lexer.token() == Token.DATABASE) { - SQLStatement stmt = parseDropDatabase(false); - - if (beforeComments != null) { - stmt.addBeforeComment(beforeComments); - } - - statementList.add(stmt); - continue; - } else if (lexer.token() == Token.FUNCTION) { - SQLStatement stmt = parseDropFunction(false); - - if (beforeComments != null) { - stmt.addBeforeComment(beforeComments); - } - - statementList.add(stmt); - continue; - } else if (lexer.token() == Token.TABLESPACE) { - SQLStatement stmt = parseDropTablespace(false); - - if (beforeComments != null) { - stmt.addBeforeComment(beforeComments); - } - - statementList.add(stmt); - continue; - } else if (lexer.token() == Token.PROCEDURE) { - SQLStatement stmt = parseDropProcedure(false); - - if (beforeComments != null) { - stmt.addBeforeComment(beforeComments); - } - - statementList.add(stmt); - continue; - } else if (lexer.token() == Token.SEQUENCE) { - SQLStatement stmt = parseDropSequece(false); - - if (beforeComments != null) { - stmt.addBeforeComment(beforeComments); - } - - statementList.add(stmt); - continue; - } else { - throw new ParserException("TODO " + lexer.token()); } - } - - if (lexer.token() == Token.TRUNCATE) { - SQLStatement stmt = parseTruncate(); - statementList.add(stmt); - continue; - } - - if (lexer.token() == Token.USE) { - SQLStatement stmt = parseUse(); - statementList.add(stmt); - continue; - } - - if (lexer.token() == Token.GRANT) { - SQLStatement stmt = parseGrant(); - statementList.add(stmt); - continue; - } - - if (lexer.token() == Token.REVOKE) { - SQLStatement stmt = parseRevoke(); - statementList.add(stmt); - continue; + case CREATE: { + SQLStatement stmt = parseCreate(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case INSERT: { + SQLStatement stmt = parseInsert(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case DELETE: { + SQLStatement stmt = parseDeleteStatement(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case EXPLAIN: { + SQLStatement stmt = parseExplain(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case SET: { + SQLStatement stmt = parseSet(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case ALTER: { + SQLStatement stmt = parseAlter(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case TRUNCATE: { + SQLStatement stmt = parseTruncate(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case USE: { + SQLStatement stmt = parseUse(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case GRANT: { + SQLStatement stmt = parseGrant(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case REVOKE: { + SQLStatement stmt = parseRevoke(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case SHOW: { + SQLStatement stmt = parseShow(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case MERGE: { + SQLStatement stmt = parseMerge(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case REPEAT: { + SQLStatement stmt = parseRepeat(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case DECLARE: { + SQLStatement stmt = parseDeclare(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case WHILE: { + SQLStatement stmt = parseWhile(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case IF: { + SQLStatement stmt = parseIf(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case CASE: { + SQLStatement stmt = parseCase(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case OPEN: { + SQLStatement stmt = parseOpen(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case FETCH: { + SQLStatement stmt = parseFetch(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case DROP: { + SQLStatement stmt = parseDrop(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case COMMENT: { + SQLStatement stmt = parseComment(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case KILL: { + SQLStatement stmt = parseKill(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case CLOSE: { + SQLStatement stmt = parseClose(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case RETURN: { + SQLStatement stmt = parseReturn(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + case UPSERT: { + SQLStatement stmt = parseUpsert(); + stmt.setParent(parent); + statementList.add(stmt); + continue; + } + default: + break; } if (lexer.token() == Token.LBRACE || identifierEquals("CALL")) { @@ -290,6 +299,13 @@ public class SQLStatementParser extends SQLParser { continue; } + + if (identifierEquals("UPSERT")) { + SQLStatement stmt = parseUpsert(); + statementList.add(stmt); + continue; + } + if (identifierEquals("RENAME")) { SQLStatement stmt = parseRename(); statementList.add(stmt); @@ -322,9 +338,8 @@ public class SQLStatementParser extends SQLParser { continue; } - if (lexer.token() == Token.SHOW) { - SQLStatement stmt = parseShow(); - + if (identifierEquals("RETURN")) { + SQLStatement stmt = parseReturn(); statementList.add(stmt); continue; } @@ -340,40 +355,86 @@ public class SQLStatementParser extends SQLParser { continue; } } - - if (lexer.token() == Token.MERGE) { - statementList.add(this.parseMerge()); - continue; - } if (parseStatementListDialect(statementList)) { continue; } - if (lexer.token() == Token.COMMENT) { - statementList.add(this.parseComment()); - continue; - } - - if (lexer.token() == Token.UPSERT || identifierEquals("UPSERT")) { - SQLStatement stmt = parseUpsert(); - statementList.add(stmt); - continue; - } - - if (identifierEquals("RETURN")) { - SQLStatement stmt = parseReturn(); - statementList.add(stmt); - continue; - } - // throw new ParserException("syntax error, " + lexer.token() + " " // + lexer.stringVal() + ", pos " // + lexer.pos()); + //throw new ParserException("not supported." + lexer.info()); printError(lexer.token()); } } + + public SQLStatement parseDrop() { + List beforeComments = null; + if (lexer.isKeepComments() && lexer.hasComment()) { + beforeComments = lexer.readAndResetComments(); + } + + lexer.nextToken(); + + final SQLStatement stmt; + if (lexer.token() == Token.TABLE || identifierEquals("TEMPORARY")) { + stmt = parseDropTable(false); + } else if (lexer.token() == Token.USER) { + stmt = parseDropUser(); + } else if (lexer.token() == Token.INDEX) { + stmt = parseDropIndex(); + } else if (lexer.token() == Token.VIEW) { + stmt = parseDropView(false); + } else if (lexer.token() == Token.TRIGGER) { + stmt = parseDropTrigger(false); + } else if (lexer.token() == Token.DATABASE) { + stmt = parseDropDatabase(false); + } else if (lexer.token() == Token.FUNCTION) { + stmt = parseDropFunction(false); + } else if (lexer.token() == Token.TABLESPACE) { + stmt = parseDropTablespace(false); + + } else if (lexer.token() == Token.PROCEDURE) { + stmt = parseDropProcedure(false); + + } else if (lexer.token() == Token.SEQUENCE) { + stmt = parseDropSequece(false); + + } else { + throw new ParserException("TODO " + lexer.token()); + } + + if (beforeComments != null) { + stmt.addBeforeComment(beforeComments); + } + return stmt; + } + + public SQLStatement parseKill() { + throw new ParserException("not supported. " + lexer.info()); + } + + public SQLStatement parseCase() { + throw new ParserException("not supported. " + lexer.info()); + } + + public SQLStatement parseIf() { + throw new ParserException("not supported. " + lexer.info()); + } + + public SQLStatement parseWhile() { + throw new ParserException("not supported. " + lexer.info()); + } + + public SQLStatement parseDeclare() { + throw new ParserException("not supported. " + lexer.info()); + } + + public SQLStatement parseRepeat() { + throw new ParserException("not supported. " + lexer.info()); + } + public SQLStatement parseReturn() { if (lexer.token() == Token.RETURN || identifierEquals("RETURN")) { @@ -1514,14 +1575,14 @@ public class SQLStatementParser extends SQLParser { } public SQLStatement parseInsert() { - SQLInsertStatement insertStatement = new SQLInsertStatement(); + SQLInsertStatement stmt = new SQLInsertStatement(); if (lexer.token() == Token.INSERT) { accept(Token.INSERT); } - parseInsert0(insertStatement); - return insertStatement; + parseInsert0(stmt); + return stmt; } protected void parseInsert0(SQLInsertInto insertStatement) { diff --git a/src/main/java/com/alibaba/druid/sql/repository/SchemaRepository.java b/src/main/java/com/alibaba/druid/sql/repository/SchemaRepository.java index 497305a48d..669a0e61bf 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/SchemaRepository.java +++ b/src/main/java/com/alibaba/druid/sql/repository/SchemaRepository.java @@ -285,6 +285,10 @@ public class SchemaRepository { return count; } + public Map getObjects() { + return this.objects; + } + public int getViewCount() { int count = 0; for (SchemaObject object : this.objects.values()) { diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_weizhi.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_weizhi.java index 26c063154c..227f6e782b 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_weizhi.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_weizhi.java @@ -17,6 +17,7 @@ package com.alibaba.druid.bvt.bug; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; import junit.framework.TestCase; import org.junit.Assert; @@ -32,17 +33,6 @@ public class Bug_for_weizhi extends TestCase { String expected = "INSERT INTO aaa\nVALUES (1, 2, '这是个反斜杠\\\\');"; - StringBuilder out = new StringBuilder(); - MySqlOutputVisitor visitor = new MySqlOutputVisitor(out); - MySqlStatementParser parser = new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - for (SQLStatement statement : statementList) { - statement.accept(visitor); - visitor.print(";"); - } - - System.out.println(out.toString()); - - Assert.assertEquals(expected, out.toString()); + Assert.assertEquals(expected, SQLUtils.formatMySql(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue_697.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue_697.java index 96d7199bb1..f7a6a385de 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Issue_697.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue_697.java @@ -2,6 +2,7 @@ package com.alibaba.druid.bvt.bug; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; import org.junit.Assert; import junit.framework.TestCase; @@ -15,27 +16,17 @@ public class Issue_697 extends TestCase { String sql = "insert into tag_rule_detail(id, gmt_create, gmt_modified, group_id, priority, rule_condition, rule_action) values(1010102, now(), now(), 10101, 0, 'flow=''trustLogin''', 'be:login,dev:pc, env:web, type:trust_login, from:$loginfrom, result:true') ;\n" + "insert into tag_rule_detail(id, gmt_create, gmt_modified, group_id, priority, rule_condition, rule_action) values(1010103, now(), now(), 10101, 0, 'flow=''Ctr''', 'be:login,dev:pc, env:web, type:ctr, from:$loginfrom, result:true') ;"; - String expected = "INSERT INTO tag_rule_detail (id, gmt_create, gmt_modified, group_id, priority" - + "\n\t, rule_condition, rule_action)" - + "\nVALUES (1010102, now(), now(), 10101, 0" - + "\n\t, 'flow=''trustLogin''', 'be:login,dev:pc, env:web, type:trust_login, from:$loginfrom, result:true');" - + "\nINSERT INTO tag_rule_detail (id, gmt_create, gmt_modified, group_id, priority" - + "\n\t, rule_condition, rule_action)" - + "\nVALUES (1010103, now(), now(), 10101, 0" - + "\n\t, 'flow=''Ctr''', 'be:login,dev:pc, env:web, type:ctr, from:$loginfrom, result:true');\n"; + String expected = "INSERT INTO tag_rule_detail (id, gmt_create, gmt_modified, group_id, priority\n" + + "\t, rule_condition, rule_action)\n" + + "VALUES (1010102, now(), now(), 10101, 0\n" + + "\t, 'flow=''trustLogin''', 'be:login,dev:pc, env:web, type:trust_login, from:$loginfrom, result:true');\n" + + "\n" + + "INSERT INTO tag_rule_detail (id, gmt_create, gmt_modified, group_id, priority\n" + + "\t, rule_condition, rule_action)\n" + + "VALUES (1010103, now(), now(), 10101, 0\n" + + "\t, 'flow=''Ctr''', 'be:login,dev:pc, env:web, type:ctr, from:$loginfrom, result:true');"; - StringBuilder out = new StringBuilder(); - MySqlOutputVisitor visitor = new MySqlOutputVisitor(out); - MySqlStatementParser parser = new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - for (SQLStatement statement : statementList) { - statement.accept(visitor); - visitor.print(";"); - visitor.println(); - } - System.out.println(out.toString()); - - Assert.assertEquals(expected, out.toString()); + Assert.assertEquals(expected, SQLUtils.formatMySql(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantInsertTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantInsertTest.java index 839f6393a0..4ffa98605f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantInsertTest.java @@ -125,16 +125,16 @@ public class TenantInsertTest extends TestCase { public void testMySql6() throws Exception { String insert_sql = "INSERT INTO orders (ID, NAME) SELECT ID, NAME FROM temp1 WHERE age = 18 UNION SELECT ID, NAME FROM temp2 UNION ALL SELECT ID, NAME FROM temp3"; - String expect_sql = "INSERT INTO orders (ID, NAME, tenant)" + // - "\n(SELECT ID, NAME, 123" + // - "\nFROM temp1" + // - "\nWHERE age = 18)" + // - "\nUNION" + // - "\n(SELECT ID, NAME, 123" + // - "\nFROM temp2)" + // - "\nUNION ALL" + // - "\n(SELECT ID, NAME, 123" + // - "\nFROM temp3)"; + String expect_sql = "INSERT INTO orders (ID, NAME, tenant)\n" + + "SELECT ID, NAME, 123\n" + + "FROM temp1\n" + + "WHERE age = 18\n" + + "UNION\n" + + "SELECT ID, NAME, 123\n" + + "FROM temp2\n" + + "UNION ALL\n" + + "SELECT ID, NAME, 123\n" + + "FROM temp3"; { MySqlWallProvider provider = new MySqlWallProvider(config_callback); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/MappingTest_alterTable.java b/src/test/java/com/alibaba/druid/bvt/sql/MappingTest_alterTable.java index bab51c4ac6..776c1ed67f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/MappingTest_alterTable.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/MappingTest_alterTable.java @@ -18,13 +18,13 @@ public class MappingTest_alterTable extends TestCase { public void test_mapping_createTable() throws Exception { String result = SQLUtils.refactor(sql, null, mapping); assertEquals("ALTER TABLE user_01\n" + - "\tDROP INDEX pk_user", result); + "\tDROP INDEX pk_user;", result); } public void test_mapping_createTable_mysql() throws Exception { String result = SQLUtils.refactor(sql, JdbcConstants.MYSQL, mapping); assertEquals("ALTER TABLE user_01\n" + - "\tDROP INDEX pk_user", result); + "\tDROP INDEX pk_user;", result); } public void test_mapping_createTable_oracle() throws Exception { @@ -36,18 +36,18 @@ public class MappingTest_alterTable extends TestCase { public void test_mapping_createTable_pg() throws Exception { String result = SQLUtils.refactor(sql, JdbcConstants.POSTGRESQL, mapping); assertEquals("ALTER TABLE user_01\n" + - "\tDROP INDEX pk_user", result); + "\tDROP INDEX pk_user;", result); } public void test_mapping_createTable_sqlserver() throws Exception { String result = SQLUtils.refactor(sql, JdbcConstants.SQL_SERVER, mapping); assertEquals("ALTER TABLE user_01\n" + - "\tDROP INDEX pk_user", result); + "\tDROP INDEX pk_user;", result); } public void test_mapping_createTable_db2() throws Exception { String result = SQLUtils.refactor(sql, JdbcConstants.DB2, mapping); assertEquals("ALTER TABLE user_01\n" + - "\tDROP INDEX pk_user", result); + "\tDROP INDEX pk_user;", result); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/MappingTest_createTable.java b/src/test/java/com/alibaba/druid/bvt/sql/MappingTest_createTable.java index 31ce025b6d..6c34b52955 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/MappingTest_createTable.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/MappingTest_createTable.java @@ -25,7 +25,7 @@ public class MappingTest_createTable extends TestCase { "\tsource_key int,\n" + "\tsource_value varchar(32),\n" + "\tPRIMARY KEY (source_key)\n" + - ")", result); + ");", result); } public void test_mapping_createTable_mysql() throws Exception { @@ -34,7 +34,7 @@ public class MappingTest_createTable extends TestCase { "\tsource_key int,\n" + "\tsource_value varchar(32),\n" + "\tPRIMARY KEY (source_key)\n" + - ")", result); + ");", result); } public void test_mapping_createTable_oracle() throws Exception { @@ -52,7 +52,7 @@ public class MappingTest_createTable extends TestCase { "\tsource_key int,\n" + "\tsource_value varchar(32),\n" + "\tPRIMARY KEY (source_key)\n" + - ")", result); + ");", result); } public void test_mapping_createTable_sqlserver() throws Exception { @@ -61,7 +61,7 @@ public class MappingTest_createTable extends TestCase { "\tsource_key int,\n" + "\tsource_value varchar(32),\n" + "\tPRIMARY KEY (source_key)\n" + - ")", result); + ");", result); } public void test_mapping_createTable_db2() throws Exception { @@ -70,6 +70,6 @@ public class MappingTest_createTable extends TestCase { "\tsource_key int,\n" + "\tsource_value varchar(32),\n" + "\tPRIMARY KEY (source_key)\n" + - ")", result); + ");", result); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/MappingTest_createTable_2.java b/src/test/java/com/alibaba/druid/bvt/sql/MappingTest_createTable_2.java index 9678ce4082..d0bc664f51 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/MappingTest_createTable_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/MappingTest_createTable_2.java @@ -25,7 +25,7 @@ public class MappingTest_createTable_2 extends TestCase { "\tsource_key int,\n" + "\tsource_value varchar(32),\n" + "\tPRIMARY KEY (source_key)\n" + - ")", result); + ");", result); } public void test_mapping_createTable_mysql() throws Exception { @@ -34,7 +34,7 @@ public class MappingTest_createTable_2 extends TestCase { "\tsource_key int,\n" + "\tsource_value varchar(32),\n" + "\tPRIMARY KEY (source_key)\n" + - ")", result); + ");", result); } public void test_mapping_createTable_oracle() throws Exception { @@ -52,7 +52,7 @@ public class MappingTest_createTable_2 extends TestCase { "\tsource_key int,\n" + "\tsource_value varchar(32),\n" + "\tPRIMARY KEY (source_key)\n" + - ")", result); + ");", result); } public void test_mapping_createTable_sqlserver() throws Exception { @@ -61,7 +61,7 @@ public class MappingTest_createTable_2 extends TestCase { "\tsource_key int,\n" + "\tsource_value varchar(32),\n" + "\tPRIMARY KEY (source_key)\n" + - ")", result); + ");", result); } public void test_mapping_createTable_db2() throws Exception { @@ -70,6 +70,6 @@ public class MappingTest_createTable_2 extends TestCase { "\tsource_key int,\n" + "\tsource_value varchar(32),\n" + "\tPRIMARY KEY (source_key)\n" + - ")", result); + ");", result); } } 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 01310a6aa3..1f989ac8ff 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 @@ -645,7 +645,7 @@ public class DALParserTest extends TestCase { MySqlShowGrantsStatement show = (MySqlShowGrantsStatement) parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(show); - Assert.assertEquals("SHOW GRANTS FOR 'root'@'localhost'", output); + assertEquals("SHOW GRANTS FOR 'root'@'localhost';", output); } public void test_show_grants_1() throws Exception { @@ -953,7 +953,7 @@ public class DALParserTest extends TestCase { MySqlShowVariantsStatement show = (MySqlShowVariantsStatement) parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(show); - Assert.assertEquals("SHOW VARIABLES LIKE '%size%'", output); + assertEquals("SHOW VARIABLES LIKE '%size%';", output); } public void test_show_variants_1() throws Exception { @@ -962,7 +962,7 @@ public class DALParserTest extends TestCase { MySqlShowVariantsStatement show = (MySqlShowVariantsStatement) parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(show); - Assert.assertEquals("SHOW GLOBAL VARIABLES LIKE '%size%'", output); + assertEquals("SHOW GLOBAL VARIABLES LIKE '%size%';", output); } public void test_show_variants_2() throws Exception { @@ -971,7 +971,7 @@ public class DALParserTest extends TestCase { MySqlShowVariantsStatement show = (MySqlShowVariantsStatement) parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(show); - Assert.assertEquals("SHOW SESSION VARIABLES LIKE '%size%'", output); + assertEquals("SHOW SESSION VARIABLES LIKE '%size%';", output); } // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DDLParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DDLParserTest.java index 20d0ce2e5d..4b7b3f2a6e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DDLParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DDLParserTest.java @@ -75,7 +75,7 @@ public class DDLParserTest extends TestCase { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tADD COLUMN `name` VARCHAR(45) NULL AFTER `fid`", output); + "\n\tADD COLUMN `name` VARCHAR(45) NULL AFTER `fid`;", output); } public void testAlterTable_3() throws Exception { @@ -85,7 +85,7 @@ public class DDLParserTest extends TestCase { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tDROP COLUMN `name`", output); + "\n\tDROP COLUMN `name`;", output); } public void test_createTable_0() throws Exception { @@ -114,7 +114,7 @@ public class DDLParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("CREATE INDEX `idx1` ON tb1 (`fname` ASC)", output); + Assert.assertEquals("CREATE INDEX `idx1` ON tb1 (`fname` ASC);", output); } public void test_createIndex_1() throws Exception { @@ -123,7 +123,7 @@ public class DDLParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("CREATE UNIQUE INDEX `idx1` ON tb1 (`fname` DESC)", output); + Assert.assertEquals("CREATE UNIQUE INDEX `idx1` ON tb1 (`fname` DESC);", output); } public void test_createIndex_2() throws Exception { @@ -132,7 +132,7 @@ public class DDLParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("CREATE INDEX id_index ON lookup (id) USING BTREE", output); + Assert.assertEquals("CREATE INDEX id_index ON lookup (id) USING BTREE;", output); } public void test_createIndex_3() throws Exception { @@ -168,7 +168,7 @@ public class DDLParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("DROP INDEX `PRIMARY` ON t", output); + Assert.assertEquals("DROP INDEX `PRIMARY` ON t;", output); } public void test_drop_table_0() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/HintsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/HintsTest.java index 032ca8e48d..340cd84895 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/HintsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/HintsTest.java @@ -32,7 +32,7 @@ public class HintsTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("CREATE /*!32302 TEMPORARY */ TABLE t (\n\ta INT\n)", output); + Assert.assertEquals("CREATE /*!32302 TEMPORARY */ TABLE t (\n\ta INT\n);", output); } public void test_hints_1() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java index db68ab5fe8..612d35bb54 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java @@ -94,7 +94,7 @@ public class MTSParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("LOCK TABLES t1 READ", output); + Assert.assertEquals("LOCK TABLES t1 READ;", output); } public void test_lockTable_1() throws Exception { @@ -103,7 +103,7 @@ public class MTSParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("LOCK TABLES t2 READ LOCAL", output); + Assert.assertEquals("LOCK TABLES t2 READ LOCAL;", output); } public void test_unlockTable() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java index 17078fc5d0..be01288206 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java @@ -63,12 +63,12 @@ public class DB2MergeTest extends DB2Test { Assert.assertEquals("MERGE INTO product T" + "\nUSING sales S ON (S.id = T.id) " - + "\nWHEN MATCHED THEN UPDATE SET inventory = T.inventory - S.sold", // + + "\nWHEN MATCHED THEN UPDATE SET inventory = T.inventory - S.sold;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); Assert.assertEquals("merge into product T" + "\nusing sales S on (S.id = T.id) " - + "\nwhen matched then update set inventory = T.inventory - S.sold", // + + "\nwhen matched then update set inventory = T.inventory - S.sold;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_0.java index b718c451e9..9b09b41ccc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_0.java @@ -59,7 +59,7 @@ public class DB2SelectTest_0 extends DB2Test { String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); Assert.assertEquals("SELECT *" // - + "\nFROM DSN81010.EMP", // + + "\nFROM DSN81010.EMP;", // output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_1.java index 8d21d747c0..4e9a064b9d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_1.java @@ -60,7 +60,7 @@ public class DB2SelectTest_1 extends DB2Test { String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); Assert.assertEquals("SELECT *" // + "\nFROM DSN81010.EMP" - + "\nFETCH FIRST 5 ROWS ONLY", // + + "\nFETCH FIRST 5 ROWS ONLY;", // output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_13.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_13.java index 0912341751..1c914adaab 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_13.java @@ -61,16 +61,16 @@ public class DB2SelectTest_13 extends DB2Test { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); - Assert.assertEquals("SELECT WORKDEPT, EMPNO, SALARY, BONUS, COMM" + assertEquals("SELECT WORKDEPT, EMPNO, SALARY, BONUS, COMM" + "\nFROM DSN8B10.EMP" + "\nWHERE WORKDEPT IN ('D11', 'D21')" - + "\nFOR UPDATE", // + + "\nFOR UPDATE;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - Assert.assertEquals("select WORKDEPT, EMPNO, SALARY, BONUS, COMM" + assertEquals("select WORKDEPT, EMPNO, SALARY, BONUS, COMM" + "\nfrom DSN8B10.EMP" + "\nwhere WORKDEPT in ('D11', 'D21')" - + "\nfor update", // + + "\nfor update;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_6.java index 0c5f00254d..907003fa77 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_6.java @@ -58,10 +58,10 @@ public class DB2SelectTest_6 extends DB2Test { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT ALL id" // - + "\nFROM DSN81010.EMP", // + + "\nFROM DSN81010.EMP;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); Assert.assertEquals("select all id" // - + "\nfrom DSN81010.EMP", // + + "\nfrom DSN81010.EMP;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_7.java index f3150d73df..7f468b01af 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_7.java @@ -58,10 +58,10 @@ public class DB2SelectTest_7 extends DB2Test { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT DISTINCT id" // - + "\nFROM DSN81010.EMP", // + + "\nFROM DSN81010.EMP;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); Assert.assertEquals("select distinct id" // - + "\nfrom DSN81010.EMP", // + + "\nfrom DSN81010.EMP;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_8.java index d6d4d817fd..388f497ab6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_8.java @@ -59,11 +59,11 @@ public class DB2SelectTest_8 extends DB2Test { Assert.assertEquals("SELECT UNIQUE id" // + "\nFROM DSN81010.EMP" - + "\nWHERE id = 1", // + + "\nWHERE id = 1;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); Assert.assertEquals("select unique id" // + "\nfrom DSN81010.EMP" - + "\nwhere id = 1", // + + "\nwhere id = 1;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_hierarchical_1.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_hierarchical_1.java index dfcd24b22a..27525a737c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_hierarchical_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_hierarchical_1.java @@ -42,7 +42,7 @@ public class DB2SelectTest_hierarchical_1 extends MysqlTest { "FROM employees\n" + "START WITH employee_id = 100\n" + "CONNECT BY PRIOR employee_id = manager_id\n" + - "ORDER SIBLINGS BY last_name", result); + "ORDER SIBLINGS BY last_name;", result); } { String result = SQLUtils.toSQLString(stmt, dbType, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -50,7 +50,7 @@ public class DB2SelectTest_hierarchical_1 extends MysqlTest { "from employees\n" + "start with employee_id = 100\n" + "connect by prior employee_id = manager_id\n" + - "order siblings by last_name", result); + "order siblings by last_name;", result); } assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java index 16d4ed94e0..95e8e76249 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -143,9 +145,9 @@ public class ArithmeticOperatorsTest extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.ORACLE); - Assert.assertEquals("SELECT a + (b + c);", text); + assertEquals("SELECT a + (b + c);", text); } public void test_11() throws Exception { @@ -182,13 +184,6 @@ public class ArithmeticOperatorsTest extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, null); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java index 7415e608af..5e8deea3c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -83,13 +85,6 @@ public class AssignmentOperatorsTest extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java index b0fdc3ac16..4108900c69 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java @@ -17,6 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; import org.junit.Assert; import junit.framework.TestCase; @@ -35,7 +36,7 @@ public class BitFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 29 | 15;", text); + Assert.assertEquals("SELECT 29 | 15", text); } public void test_1() throws Exception { @@ -46,7 +47,7 @@ public class BitFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 29 & 15;", text); + Assert.assertEquals("SELECT 29 & 15", text); } public void test_2() throws Exception { @@ -57,7 +58,7 @@ public class BitFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 1 ^ 1;", text); + Assert.assertEquals("SELECT 1 ^ 1", text); } public void test_3() throws Exception { @@ -68,7 +69,7 @@ public class BitFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 1 ^ 0;", text); + Assert.assertEquals("SELECT 1 ^ 0", text); } public void test_4() throws Exception { @@ -79,7 +80,7 @@ public class BitFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 1 << 2;", text); + Assert.assertEquals("SELECT 1 << 2", text); } public void test_5() throws Exception { @@ -90,7 +91,7 @@ public class BitFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 4 >> 2;", text); + assertEquals("SELECT 4 >> 2", text); } public void test_6() throws Exception { @@ -101,7 +102,7 @@ public class BitFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 5 & ~1;", text); + assertEquals("SELECT 5 & ~1", text); } public void test_7() throws Exception { @@ -140,13 +141,6 @@ public class BitFunctionsTest extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, null); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java index 21f4fec23a..81b35f1ae6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java @@ -17,6 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; import org.junit.Assert; import junit.framework.TestCase; @@ -33,19 +34,8 @@ public class BooleanValuesTest extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, null); - Assert.assertEquals("SELECT true, true, false, false;", text); - } - - private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + assertEquals("SELECT true, true, false, false;", text); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java index dda44e46a2..0b998876a5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java @@ -17,6 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import com.alibaba.druid.sql.SQLUtils; @@ -59,8 +60,8 @@ public class CALL_Test extends TestCase { SQLStatement stmt = stmtList.get(0); - Assert.assertEquals("EXECUTE s USING @version, @increment", SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("execute s using @version, @increment", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + assertEquals("EXECUTE s USING @version, @increment;", SQLUtils.toMySqlString(stmt)); + assertEquals("execute s using @version, @increment;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } public void test_3() throws Exception { @@ -71,18 +72,11 @@ public class CALL_Test extends TestCase { SQLStatement stmt = stmtList.get(0); - Assert.assertEquals("EXECUTE s", SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("execute s", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + assertEquals("EXECUTE s", SQLUtils.toMySqlString(stmt)); + assertEquals("execute s", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java index ef65bb7bd3..9e7e694be4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -35,7 +37,7 @@ public class CastFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 'a' = 'A';", text); + Assert.assertEquals("SELECT 'a' = 'A'", text); } public void test_1() throws Exception { @@ -46,7 +48,7 @@ public class CastFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT BINARY 'a' = 'A';", text); + Assert.assertEquals("SELECT BINARY 'a' = 'A'", text); } public void test_2() throws Exception { @@ -57,7 +59,7 @@ public class CastFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT CONVERT('abc' USING utf8);", text); + assertEquals("SELECT CONVERT('abc' USING utf8)", text); } public void test_3() throws Exception { @@ -68,7 +70,7 @@ public class CastFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 'A' LIKE CONVERT(blob_col USING latin1)\nFROM tbl_name;", text); + assertEquals("SELECT 'A' LIKE CONVERT(blob_col USING latin1)\nFROM tbl_name;", text); } public void test_4() throws Exception { @@ -79,7 +81,7 @@ public class CastFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 'A' LIKE CONVERT(blob_col USING latin1) COLLATE latin1_german1_ci\nFROM tbl_name;", + assertEquals("SELECT 'A' LIKE CONVERT(blob_col USING latin1) COLLATE latin1_german1_ci\nFROM tbl_name;", text); } @@ -91,7 +93,7 @@ public class CastFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SET @str = BINARY 'New York';", text); + assertEquals("SET @str = BINARY 'New York';", text); } public void test_6() throws Exception { @@ -102,7 +104,7 @@ public class CastFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT LOWER(@str), LOWER(CONVERT(@str USING latin1));", text); + assertEquals("SELECT LOWER(@str), LOWER(CONVERT(@str USING latin1))", text); } public void test_7() throws Exception { @@ -161,13 +163,6 @@ public class CastFunctionsAndOperatorsTest extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java index dfc7989b97..10a743f8e2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -90,7 +92,7 @@ public class ComparisonFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 0.1 <= 2;", text); + Assert.assertEquals("SELECT 0.1 <= 2", text); } public void test_6() throws Exception { @@ -101,7 +103,7 @@ public class ComparisonFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 2 < 2;", text); + Assert.assertEquals("SELECT 2 < 2", text); } public void test_7() throws Exception { @@ -112,7 +114,7 @@ public class ComparisonFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 2 >= 2;", text); + Assert.assertEquals("SELECT 2 >= 2", text); } public void test_8() throws Exception { @@ -123,7 +125,7 @@ public class ComparisonFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 2 > 2;", text); + Assert.assertEquals("SELECT 2 > 2", text); } public void test_9() throws Exception { @@ -134,7 +136,7 @@ public class ComparisonFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 1 IS true, 0 IS false, NULL IS UNKNOWN;", text); + assertEquals("SELECT 1 IS true, 0 IS false, NULL IS UNKNOWN", text); } public void test_10() throws Exception { @@ -145,7 +147,7 @@ public class ComparisonFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 1 IS NOT UNKNOWN, 0 IS NOT UNKNOWN, NULL IS NOT UNKNOWN;", text); + Assert.assertEquals("SELECT 1 IS NOT UNKNOWN, 0 IS NOT UNKNOWN, NULL IS NOT UNKNOWN", text); } public void test_11() throws Exception { @@ -156,7 +158,7 @@ public class ComparisonFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 1 IS NULL, 0 IS NULL, NULL IS NULL;", text); + Assert.assertEquals("SELECT 1 IS NULL, 0 IS NULL, NULL IS NULL", text); } public void test_12() throws Exception { @@ -167,7 +169,7 @@ public class ComparisonFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT *\nFROM tbl_name\nWHERE auto_col IS NULL;", text); + Assert.assertEquals("SELECT *\nFROM tbl_name\nWHERE auto_col IS NULL", text); } public void test_13() throws Exception { @@ -178,7 +180,7 @@ public class ComparisonFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT *\nFROM tbl_name\nWHERE date_column IS NULL;", text); + Assert.assertEquals("SELECT *\nFROM tbl_name\nWHERE date_column IS NULL", text); } public void test_14() throws Exception { @@ -189,7 +191,7 @@ public class ComparisonFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 2 BETWEEN 1 AND 3, 2 BETWEEN 3 AND 1;", text); + Assert.assertEquals("SELECT 2 BETWEEN 1 AND 3, 2 BETWEEN 3 AND 1", text); } public void test_15() throws Exception { @@ -200,7 +202,7 @@ public class ComparisonFunctionsAndOperatorsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 1 BETWEEN 2 AND 3;", text); + assertEquals("SELECT 1 BETWEEN 2 AND 3;", text); } public void test_16() throws Exception { @@ -325,13 +327,6 @@ public class ComparisonFunctionsAndOperatorsTest extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.ORACLE); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java index 811c4d784b..a60e32e07b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -98,13 +100,6 @@ public class ControlFlowFunctionsTest extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java index 876419c4a7..8ca5317f9a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -35,7 +37,7 @@ public class DateAndTimeFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT something\nFROM tbl_name\nWHERE DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date_col;", + Assert.assertEquals("SELECT something\nFROM tbl_name\nWHERE DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date_col", text); } @@ -47,7 +49,7 @@ public class DateAndTimeFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT DAYOFMONTH('2001-11-00'), MONTH('2005-00-00');", text); + Assert.assertEquals("SELECT DAYOFMONTH('2001-11-00'), MONTH('2005-00-00')", text); } public void test_2() throws Exception { @@ -58,7 +60,7 @@ public class DateAndTimeFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT DAYNAME('2006-05-00');", text); + Assert.assertEquals("SELECT DAYNAME('2006-05-00')", text); } public void test_3() throws Exception { @@ -69,7 +71,7 @@ public class DateAndTimeFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT DAYNAME('2006-05-00');", text); + Assert.assertEquals("SELECT DAYNAME('2006-05-00')", text); } public void test_4() throws Exception { @@ -80,7 +82,7 @@ public class DateAndTimeFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT DATE_ADD('2008-01-02', INTERVAL 31 DAY);", text); + Assert.assertEquals("SELECT DATE_ADD('2008-01-02', INTERVAL 31 DAY)", text); } public void test_5() throws Exception { @@ -91,7 +93,7 @@ public class DateAndTimeFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT ADDDATE('2008-01-02', INTERVAL 31 DAY);", text); + Assert.assertEquals("SELECT ADDDATE('2008-01-02', INTERVAL 31 DAY)", text); } public void test_6() throws Exception { @@ -102,7 +104,7 @@ public class DateAndTimeFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT ADDDATE('2008-01-02', 31);", text); + Assert.assertEquals("SELECT ADDDATE('2008-01-02', 31)", text); } public void test_7() throws Exception { @@ -113,7 +115,7 @@ public class DateAndTimeFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT ADDTIME('2007-12-31 23:59:59.999999', '1 1:1:1.000002');", text); + Assert.assertEquals("SELECT ADDTIME('2007-12-31 23:59:59.999999', '1 1:1:1.000002')", text); } public void test_8() throws Exception { @@ -124,7 +126,7 @@ public class DateAndTimeFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT ADDTIME('01:00:00.999999', '02:00:00.999998');", text); + Assert.assertEquals("SELECT ADDTIME('01:00:00.999999', '02:00:00.999998')", text); } public void test_9() throws Exception { @@ -631,7 +633,7 @@ public class DateAndTimeFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT t.c1, DATE_ADD('2008-01-02', INTERVAL +t.c1 DAY)\nFROM t;", text); + Assert.assertEquals("SELECT t.c1, DATE_ADD('2008-01-02', INTERVAL +t.c1 DAY)\nFROM t", text); } public void test_55() throws Exception { @@ -642,17 +644,10 @@ public class DateAndTimeFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT t.c1, DATE_ADD('2008-01-02', INTERVAL -t.c1 DAY)\nFROM t;", text); + Assert.assertEquals("SELECT t.c1, DATE_ADD('2008-01-02', INTERVAL -t.c1 DAY)\nFROM t", text); } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java index 1eca7b6ce5..a9b673a5e4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -46,7 +48,7 @@ public class DateAndTimeValuesTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT '2008-02-31' + INTERVAL 0 DAY;", text); + Assert.assertEquals("SELECT '2008-02-31' + INTERVAL 0 DAY", text); } public void test_2() throws Exception { @@ -57,17 +59,10 @@ public class DateAndTimeValuesTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT '2008-02-31' + INTERVAL 0 MONTH;", text); + Assert.assertEquals("SELECT '2008-02-31' + INTERVAL 0 MONTH", text); } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java index 479727cf6f..88567ee47f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java @@ -34,7 +34,7 @@ public class DeleteSyntaxTest extends TestCase { SQLStatement stmt = stmtList.get(0); - Assert.assertEquals("DELETE FROM somelog\nWHERE user = 'jcole'\nORDER BY timestamp_column\nLIMIT 1", SQLUtils.toMySqlString(stmt)); + assertEquals("DELETE FROM somelog\nWHERE user = 'jcole'\nORDER BY timestamp_column\nLIMIT 1;", SQLUtils.toMySqlString(stmt)); } public void test_1() throws Exception { @@ -45,10 +45,10 @@ public class DeleteSyntaxTest extends TestCase { SQLStatement stmt = stmtList.get(0); - Assert.assertEquals("DELETE t1" + // + assertEquals("DELETE t1" + // "\nFROM t1" + // "\n\tLEFT JOIN t2 ON t1.id = t2.id" + // - "\nWHERE t2.id IS NULL", SQLUtils.toMySqlString(stmt)); + "\nWHERE t2.id IS NULL;", SQLUtils.toMySqlString(stmt)); } public void test_2() throws Exception { @@ -59,7 +59,7 @@ public class DeleteSyntaxTest extends TestCase { SQLStatement stmt = stmtList.get(0); - Assert.assertEquals("DELETE a1, a2\nFROM t1 a1" + // + assertEquals("DELETE a1, a2\nFROM t1 a1" + // "\n\tINNER JOIN t2 a2" + // "\nWHERE a1.id = a2.id", SQLUtils.toMySqlString(stmt)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java index 9fe8509ec4..ccbf6119ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -79,7 +81,7 @@ public class HexadecimalValuesTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 0x41, CAST(0x41 AS UNSIGNED);", text); + Assert.assertEquals("SELECT 0x41, CAST(0x41 AS UNSIGNED)", text); } public void test_5() throws Exception { @@ -90,17 +92,10 @@ public class HexadecimalValuesTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT HEX('cat');", text); + Assert.assertEquals("SELECT HEX('cat')", text); } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java index d827007cf1..f4aba1e8aa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -35,7 +37,7 @@ public class InformationFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT BENCHMARK(1000000, ENCODE('hello', 'goodbye'));", text); + Assert.assertEquals("SELECT BENCHMARK(1000000, ENCODE('hello', 'goodbye'))", text); } public void test_1() throws Exception { @@ -193,13 +195,6 @@ public class InformationFunctionsTest extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java index 08be1352f8..ae38a6db3b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java @@ -17,6 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import com.alibaba.druid.sql.SQLUtils; @@ -96,10 +97,10 @@ public class InsertSyntaxTest extends TestCase { SQLStatement stmt = stmtList.get(0); - Assert.assertEquals("INSERT LOW_PRIORITY DELAYED HIGH_PRIORITY IGNORE INTO tbl_name (a, b, c)\nVALUES (1, 2, 3)", + Assert.assertEquals("INSERT LOW_PRIORITY DELAYED HIGH_PRIORITY IGNORE INTO tbl_name (a, b, c)\nVALUES (1, 2, 3);", SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("insert low_priority delayed high_priority ignore into tbl_name (a, b, c)\nvalues (1, 2, 3)", + Assert.assertEquals("insert low_priority delayed high_priority ignore into tbl_name (a, b, c)\nvalues (1, 2, 3);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } @@ -113,20 +114,13 @@ public class InsertSyntaxTest extends TestCase { Assert.assertEquals("INSERT INTO tbl_name (a, b, c)" + // "\nVALUES (1, 2, 3)" + // - "\nON DUPLICATE KEY UPDATE c = c + 1", SQLUtils.toMySqlString(stmt)); + "\nON DUPLICATE KEY UPDATE c = c + 1;", SQLUtils.toMySqlString(stmt)); Assert.assertEquals("insert into tbl_name (a, b, c)" + // "\nvalues (1, 2, 3)" + // - "\non duplicate key update c = c + 1", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + "\non duplicate key update c = c + 1;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java index 21302c6356..2d7c51e9ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -33,20 +35,10 @@ public class LOAD_XML_Syntax_Test extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("LOAD XML LOCAL INFILE 'person.xml' INTO TABLE person ROWS IDENTIFIED BY '';", text); } - private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); - } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java index 4172e34a32..611ba40e03 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -75,13 +77,6 @@ public class LoadDataInFileSyntaxTest extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java index 568b7d6276..8cacac4904 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -182,13 +184,6 @@ public class LogicalOperatorsTest extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java index bb520f05c5..7a2ffb0e85 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -200,7 +202,7 @@ public class MathematicalFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT COS(PI());", text); + Assert.assertEquals("SELECT COS(PI())", text); } public void test_16() throws Exception { @@ -211,7 +213,7 @@ public class MathematicalFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT CRC32('MySQL');", text); + Assert.assertEquals("SELECT CRC32('MySQL')", text); } public void test_17() throws Exception { @@ -222,7 +224,7 @@ public class MathematicalFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT DEGREES(PI());", text); + Assert.assertEquals("SELECT DEGREES(PI())", text); } public void test_18() throws Exception { @@ -233,7 +235,7 @@ public class MathematicalFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT DEGREES(PI() / 2);", text); + Assert.assertEquals("SELECT DEGREES(PI() / 2)", text); } public void test_19() throws Exception { @@ -244,7 +246,7 @@ public class MathematicalFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT MOD(29, 9);", text); + Assert.assertEquals("SELECT MOD(29, 9)", text); } public void test_20() throws Exception { @@ -255,7 +257,7 @@ public class MathematicalFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 29 % 9;", text); + Assert.assertEquals("SELECT 29 % 9", text); } public void test_21() throws Exception { @@ -266,7 +268,7 @@ public class MathematicalFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT PI() + 0E-18;", text); + Assert.assertEquals("SELECT PI() + 0E-18", text); } public void test_22() throws Exception { @@ -277,7 +279,7 @@ public class MathematicalFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT POW(2, -2);", text); + Assert.assertEquals("SELECT POW(2, -2)", text); } public void test_23() throws Exception { @@ -288,7 +290,7 @@ public class MathematicalFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT RADIANS(90);", text); + Assert.assertEquals("SELECT RADIANS(90)", text); } public void test_24() throws Exception { @@ -299,7 +301,7 @@ public class MathematicalFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT i, RAND()\nFROM t;", text); + Assert.assertEquals("SELECT i, RAND()\nFROM t", text); } public void test_25() throws Exception { @@ -310,7 +312,7 @@ public class MathematicalFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT *\nFROM tbl_name\nORDER BY RAND();", text); + Assert.assertEquals("SELECT *\nFROM tbl_name\nORDER BY RAND()", text); } public void test_26() throws Exception { @@ -321,17 +323,10 @@ public class MathematicalFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT ROUND(2.5), ROUND(2.5);", text); + Assert.assertEquals("SELECT ROUND(2.5), ROUND(2.5)", text); } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java index 8df98d3c55..865eb1c729 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -72,14 +74,6 @@ public class MiscellaneousFunctionsTest extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - MySqlOutputVisitor visitor = new MySqlOutputVisitor(out); - - for (SQLStatement stmt : stmtList) { - stmt.accept(visitor); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySql57Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySql57Test.java index 9ed9943d32..bcebf0d62e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySql57Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySql57Test.java @@ -17,12 +17,12 @@ public class MySql57Test extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - Assert.assertEquals("ALTER TABLE t1" // + assertEquals("ALTER TABLE t1" // + "\n\tALGORITHM = INPLACE," // - + "\n\tCHANGE COLUMN c1 c1 VARCHAR(255)", SQLUtils.toMySqlString(stmt)); + + "\n\tCHANGE COLUMN c1 c1 VARCHAR(255);", SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("alter table t1" // + assertEquals("alter table t1" // + "\n\tALGORITHM = INPLACE," // - + "\n\tchange column c1 c1 VARCHAR(255)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\n\tchange column c1 c1 VARCHAR(255);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlBeginTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlBeginTest.java index fdcd07bc46..2152eb6312 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlBeginTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlBeginTest.java @@ -59,7 +59,7 @@ public class MySqlBeginTest extends MysqlTest { { String output = SQLUtils.toSQLString(statementList, JdbcConstants.MYSQL); - Assert.assertEquals("START TRANSACTION;" + assertEquals("START TRANSACTION;" + "\n" + "\nSELECT @A := SUM(salary)" + "\nFROM table1" @@ -69,12 +69,12 @@ public class MySqlBeginTest extends MysqlTest { + "\nSET summary = @A" + "\nWHERE type = 1;" + "\n" - + "\nCOMMIT", // + + "\nCOMMIT;", // output); } { String output = SQLUtils.toSQLString(statementList, JdbcConstants.MYSQL, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - Assert.assertEquals("start transaction;" + assertEquals("start transaction;" + "\n" + "\nselect @A := sum(salary)" + "\nfrom table1" @@ -84,7 +84,7 @@ public class MySqlBeginTest extends MysqlTest { + "\nset summary = @A" + "\nwhere type = 1;" + "\n" - + "\ncommit", // + + "\ncommit;", // output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java index 7e4b5ba7c2..66f0ebadae 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java @@ -38,10 +38,10 @@ public class MySqlDeleteTest_1 extends MysqlTest { Assert.assertEquals("DELETE FROM a1, a2 USING (t1) AS a1" + "\n\tINNER JOIN t2 a2" - + "\nWHERE a1.id = a2.id", SQLUtils.toMySqlString(stmt)); + + "\nWHERE a1.id = a2.id;", SQLUtils.toMySqlString(stmt)); Assert.assertEquals("delete from a1, a2 using (t1) as a1" + "\n\tinner join t2 a2" - + "\nwhere a1.id = a2.id", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nwhere a1.id = a2.id;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java index e1d4ff1f19..28f1073c71 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java @@ -38,11 +38,11 @@ public class MySqlDeleteTest_2 extends MysqlTest { Assert.assertEquals("DELETE t1" + "\nFROM t1" + "\n\tLEFT JOIN t2 ON t1.id = t2.id" - + "\nWHERE t2.id IS NULL", SQLUtils.toMySqlString(stmt)); + + "\nWHERE t2.id IS NULL;", SQLUtils.toMySqlString(stmt)); Assert.assertEquals("delete t1" + "\nfrom t1" + "\n\tleft join t2 on t1.id = t2.id" - + "\nwhere t2.id is null", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nwhere t2.id is null;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_3.java index f49222cce7..5ab7e1a7a9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_3.java @@ -60,7 +60,7 @@ public class MySqlDeleteTest_3 extends MysqlTest { "\t\t\t\t) t5\n" + "\t\t\t)\n" + "\t\t)\n" + - "\t)", SQLUtils.toMySqlString(stmt)); + "\t);", SQLUtils.toMySqlString(stmt)); assertEquals("delete from t1\n" + "where s11 > any (\n" + "\t\tselect count(*)\n" + @@ -79,7 +79,7 @@ public class MySqlDeleteTest_3 extends MysqlTest { "\t\t\t\t) t5\n" + "\t\t\t)\n" + "\t\t)\n" + - "\t)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + "\t);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHintStatementTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHintStatementTest.java index f849ae1bc6..47c432e230 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHintStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHintStatementTest.java @@ -34,7 +34,7 @@ public class MySqlHintStatementTest extends TestCase { + " ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"// + " \n/*!40101 SET character_set_client = @saved_cs_client */;"; String rs = SQLUtils.formatMySql(sql); - Assert.assertEquals("DROP TABLE IF EXISTS `item_similarity`;" + assertEquals("DROP TABLE IF EXISTS `item_similarity`;" + "\n" + "\n/*!40101 SET @saved_cs_client = @@character_set_client */;" + "\n" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetPasswordTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetPasswordTest.java index 55731eb69f..ba4ee21c11 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetPasswordTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetPasswordTest.java @@ -41,7 +41,7 @@ public class MySqlSetPasswordTest extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("SET PASSWORD FOR 'bob'@'%.example.org' = PASSWORD('cleartext password')", // + Assert.assertEquals("SET PASSWORD FOR 'bob'@'%.example.org' = PASSWORD('cleartext password');", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_1.java index 556c1d0dd1..7bfaac6c2a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_1.java @@ -52,6 +52,6 @@ public class MySqlSetTest_1 extends TestCase { String text = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("SET @@session.autocommit = ON", text); + Assert.assertEquals("SET @@session.autocommit = ON;", text); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java index 67eb62782a..e524c15eca 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; import org.junit.Assert; @@ -34,7 +36,7 @@ public class NumberTest extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("SELECT -3.20326809E+14;", text); } @@ -45,19 +47,9 @@ public class NumberTest extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("SELECT 294.42;", text); } - private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); - } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java index 1f2a030f9d..72fdac0ebc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -33,7 +35,7 @@ public class REPLACE_Syntax_Test extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("REPLACE INTO T\n\tSELECT *\n\tFROM T;", text); } @@ -44,7 +46,7 @@ public class REPLACE_Syntax_Test extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("REPLACE DELAYED INTO `online_users` (`session_id`, `user_id`, `page`, `lastview`)\nVALUES ('3580cc4e61117c0785372c426eddd11c', 'XXX', '/', NOW());", text); @@ -56,19 +58,9 @@ public class REPLACE_Syntax_Test extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); - Assert.assertEquals("REPLACE INTO t (col1, col2)\nVALUES (?, ?);", text); + Assert.assertEquals("REPLACE INTO t (col1, col2)\nVALUES (?, ?)", text); } - private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); - } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java index f8376f3a66..f819d226a5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java @@ -17,6 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import com.alibaba.druid.sql.SQLUtils; @@ -37,8 +38,8 @@ public class SELECT_Syntax_Test extends TestCase { SQLStatement stmt = stmtList.get(0); - Assert.assertEquals("SELECT year, SUM(profit)\nFROM sales\nGROUP BY year WITH ROLLUP", SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("select year, sum(profit)\nfrom sales\ngroup by year with rollup", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + Assert.assertEquals("SELECT year, SUM(profit)\nFROM sales\nGROUP BY year WITH ROLLUP;", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("select year, sum(profit)\nfrom sales\ngroup by year with rollup;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } public void test_1() throws Exception { @@ -60,8 +61,8 @@ public class SELECT_Syntax_Test extends TestCase { SQLStatement stmt = stmtList.get(0); - Assert.assertEquals("SELECT year, SUM(profit)\nFROM sales\nGROUP BY year WITH CUBE", SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("select year, sum(profit)\nfrom sales\ngroup by year with cube", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + Assert.assertEquals("SELECT year, SUM(profit)\nFROM sales\nGROUP BY year WITH CUBE;", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("select year, sum(profit)\nfrom sales\ngroup by year with cube;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } public void test_2() throws Exception { @@ -219,13 +220,13 @@ public class SELECT_Syntax_Test extends TestCase { "WHERE s1 NOT IN (\n" + "\tSELECT s1\n" + "\tFROM t2\n" + - ")", SQLUtils.toMySqlString(stmt)); + ");", SQLUtils.toMySqlString(stmt)); assertEquals("select s1\n" + "from t1\n" + "where s1 not in (\n" + "\tselect s1\n" + "\tfrom t2\n" + - ")", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + ");", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } public void test_13() throws Exception { @@ -240,13 +241,13 @@ public class SELECT_Syntax_Test extends TestCase { "WHERE s1 IN (\n" + "\tSELECT s1\n" + "\tFROM t2\n" + - ")", SQLUtils.toMySqlString(stmt)); + ");", SQLUtils.toMySqlString(stmt)); assertEquals("select s1\n" + "from t1\n" + "where s1 in (\n" + "\tselect s1\n" + "\tfrom t2\n" + - ")", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + ");", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } public void test_14() throws Exception { @@ -256,8 +257,8 @@ public class SELECT_Syntax_Test extends TestCase { List stmtList = parser.parseStatementList(); SQLStatement stmt = stmtList.get(0); - Assert.assertEquals("SELECT s1\nFROM t1\nWHERE s1 IN (?, ?, ?)", SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("select s1\nfrom t1\nwhere s1 in (?, ?, ?)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + Assert.assertEquals("SELECT s1\nFROM t1\nWHERE s1 IN (?, ?, ?);", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("select s1\nfrom t1\nwhere s1 in (?, ?, ?);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } public void test_15() throws Exception { @@ -267,18 +268,11 @@ public class SELECT_Syntax_Test extends TestCase { List stmtList = parser.parseStatementList(); SQLStatement stmt = stmtList.get(0); - Assert.assertEquals("SELECT s1\nFROM t1\nWHERE s1 NOT IN (?, ?, ?)", SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("select s1\nfrom t1\nwhere s1 not in (?, ?, ?)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + Assert.assertEquals("SELECT s1\nFROM t1\nWHERE s1 NOT IN (?, ?, ?);", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("select s1\nfrom t1\nwhere s1 not in (?, ?, ?);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java index 25b9cb6316..799f44931c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -72,13 +74,6 @@ public class SHOW_COLUMNS_Syntax_Test extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java index e593770084..0b92905588 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -33,19 +35,8 @@ public class SHOW_DATABASES_Syntax_Test extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("SHOW DATABASES;", text); } - - private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); - } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java index 420e3ffa8e..675ad2542a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -33,19 +35,8 @@ public class SHOW_TABLES_Syntax_Test extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("SHOW TABLES;", text); } - - private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); - } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java index c34178caa8..0ca434e619 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -33,9 +35,9 @@ public class SHOW_WARNINGS_Syntax_Test extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); - Assert.assertEquals("SHOW WARNINGS;", text); + assertEquals("SHOW WARNINGS;", text); } public void test_1() throws Exception { @@ -44,7 +46,7 @@ public class SHOW_WARNINGS_Syntax_Test extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("SHOW COUNT(*) WARNINGS;", text); } @@ -55,7 +57,7 @@ public class SHOW_WARNINGS_Syntax_Test extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("SHOW WARNINGS LIMIT 1;", text); } @@ -66,19 +68,9 @@ public class SHOW_WARNINGS_Syntax_Test extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("SHOW WARNINGS LIMIT 10, 10;", text); } - private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); - } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java index f7c52c8219..35036ced2a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -116,13 +118,6 @@ public class START_TRANSACTION_Test extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java index b54c0d36a1..3490f44d04 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -101,7 +103,7 @@ public class StringComparisonFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 'David_' LIKE 'David|_' ESCAPE '|';", text); + Assert.assertEquals("SELECT 'David_' LIKE 'David|_' ESCAPE '|'", text); } public void test_7() throws Exception { @@ -112,7 +114,7 @@ public class StringComparisonFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 'abc' LIKE BINARY 'ABC';", text); + Assert.assertEquals("SELECT 'abc' LIKE BINARY 'ABC'", text); } public void test_8() throws Exception { @@ -123,7 +125,7 @@ public class StringComparisonFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT 10 LIKE '1%';", text); + Assert.assertEquals("SELECT 10 LIKE '1%'", text); } public void test_9() throws Exception { @@ -134,7 +136,7 @@ public class StringComparisonFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT filename, filename LIKE '%\\\\'\nFROM t1;", text); + Assert.assertEquals("SELECT filename, filename LIKE '%\\\\'\nFROM t1", text); } public void test_10() throws Exception { @@ -145,7 +147,7 @@ public class StringComparisonFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT STRCMP('text', 'text2');", text); + Assert.assertEquals("SELECT STRCMP('text', 'text2')", text); } public void test_11() throws Exception { @@ -193,13 +195,6 @@ public class StringComparisonFunctionsTest extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java index 7db881fd0e..88df5f634a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -112,7 +114,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT CHARSET(CHAR(0x65)), CHARSET(CHAR(0x65 USING utf8));", text); + Assert.assertEquals("SELECT CHARSET(CHAR(0x65)), CHARSET(CHAR(0x65 USING utf8))", text); } public void test_8() throws Exception { @@ -123,7 +125,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT CONCAT(CAST(int_col AS CHAR), char_col);", text); + Assert.assertEquals("SELECT CONCAT(CAST(int_col AS CHAR), char_col)", text); } public void test_9() throws Exception { @@ -134,7 +136,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT CONCAT('My', 'S', 'QL');", text); + Assert.assertEquals("SELECT CONCAT('My', 'S', 'QL')", text); } public void test_10() throws Exception { @@ -365,7 +367,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT LTRIM(' barbar');", text); + Assert.assertEquals("SELECT LTRIM(' barbar')", text); } public void test_31() throws Exception { @@ -376,7 +378,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT MAKE_SET(1, 'a', 'b', 'c');", text); + Assert.assertEquals("SELECT MAKE_SET(1, 'a', 'b', 'c')", text); } public void test_32() throws Exception { @@ -387,7 +389,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT MAKE_SET(1 | 4, 'hello', 'nice', 'world');", text); + Assert.assertEquals("SELECT MAKE_SET(1 | 4, 'hello', 'nice', 'world')", text); } public void test_33() throws Exception { @@ -398,7 +400,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT MAKE_SET(1 | 4, 'hello', 'nice', NULL, 'world');", text); + Assert.assertEquals("SELECT MAKE_SET(1 | 4, 'hello', 'nice', NULL, 'world')", text); } public void test_34() throws Exception { @@ -409,7 +411,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT ORD('2');", text); + Assert.assertEquals("SELECT ORD('2')", text); } public void test_35() throws Exception { @@ -420,7 +422,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT QUOTE('Don''t!');", text); + Assert.assertEquals("SELECT QUOTE('Don''t!')", text); } public void test_36() throws Exception { @@ -431,7 +433,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT REPEAT('MySQL', 3);", text); + Assert.assertEquals("SELECT REPEAT('MySQL', 3)", text); } public void test_37() throws Exception { @@ -442,7 +444,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT REVERSE('abc');", text); + Assert.assertEquals("SELECT REVERSE('abc')", text); } public void test_38() throws Exception { @@ -453,7 +455,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT RIGHT('foobarbar', 4);", text); + Assert.assertEquals("SELECT RIGHT('foobarbar', 4)", text); } public void test_39() throws Exception { @@ -464,7 +466,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT RPAD('hi', 5, '?');", text); + Assert.assertEquals("SELECT RPAD('hi', 5, '?')", text); } public void test_40() throws Exception { @@ -475,7 +477,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT RTRIM('barbar ');", text); + Assert.assertEquals("SELECT RTRIM('barbar ')", text); } public void test_41() throws Exception { @@ -486,7 +488,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT SOUNDEX('Hello');", text); + Assert.assertEquals("SELECT SOUNDEX('Hello')", text); } public void test_42() throws Exception { @@ -497,7 +499,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT SPACE(6);", text); + Assert.assertEquals("SELECT SPACE(6)", text); } public void test_43() throws Exception { @@ -508,7 +510,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT SUBSTRING('Quadratically', 5);", text); + Assert.assertEquals("SELECT SUBSTRING('Quadratically', 5)", text); } public void test_44() throws Exception { @@ -519,7 +521,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT SUBSTRING('Sakila', -4, 2);", text); + Assert.assertEquals("SELECT SUBSTRING('Sakila', -4, 2)", text); } public void test_45() throws Exception { @@ -530,7 +532,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT SUBSTRING('foobarbar', 4);", text); + Assert.assertEquals("SELECT SUBSTRING('foobarbar', 4)", text); } public void test_46() throws Exception { @@ -541,7 +543,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT SUBSTRING('Quadratically', 5, 6);", text); + Assert.assertEquals("SELECT SUBSTRING('Quadratically', 5, 6)", text); } public void test_47() throws Exception { @@ -552,7 +554,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT SUBSTRING_INDEX('www.mysql.com', '.', -2);", text); + Assert.assertEquals("SELECT SUBSTRING_INDEX('www.mysql.com', '.', -2)", text); } public void test_48() throws Exception { @@ -563,7 +565,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT TRIM(' bar ');", text); + Assert.assertEquals("SELECT TRIM(' bar ')", text); } public void test_49() throws Exception { @@ -574,7 +576,7 @@ public class StringFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT TRIM(LEADING 'x' FROM 'xxxbarxxx');", text); + Assert.assertEquals("SELECT TRIM(LEADING 'x' FROM 'xxxbarxxx')", text); } public void test_50() throws Exception { @@ -633,13 +635,6 @@ public class StringFunctionsTest extends TestCase { } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java index 43640193b7..ec08e2ab83 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -33,7 +35,7 @@ public class StringTest extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("SELECT _latin1 'string' COLLATE latin1_danish_ci;", text); } @@ -44,19 +46,8 @@ public class StringTest extends TestCase { SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - String text = output(stmtList); + String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("SELECT _utf8 'some text';", text); } - - private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); - } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java index ea21253dc9..fe2924cc4c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java @@ -17,6 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import junit.framework.TestCase; @@ -90,17 +92,10 @@ public class XMLFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("SELECT UpdateXML('ccc', '/a', 'fff') AS val1;", text); + Assert.assertEquals("SELECT UpdateXML('ccc', '/a', 'fff') AS val1", text); } private String output(List stmtList) { - StringBuilder out = new StringBuilder(); - - for (SQLStatement stmt : stmtList) { - stmt.accept(new MySqlOutputVisitor(out)); - out.append(";"); - } - - return out.toString(); + return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest0.java index 0c86e6b252..42c29d1b1e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest0.java @@ -32,8 +32,8 @@ public class MySqlAlterDbTest0 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - Assert.assertEquals("ALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME", SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("alter database `#mysql50#a-b-c` upgrade data directory name", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + assertEquals("ALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME;", SQLUtils.toMySqlString(stmt)); + assertEquals("alter database `#mysql50#a-b-c` upgrade data directory name;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAddIndex_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAddIndex_0.java index 7fa30b0fb6..bea8efe246 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAddIndex_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAddIndex_0.java @@ -35,11 +35,11 @@ public class MySqlAlterTableAddIndex_0 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tADD INDEX `ix` (`f2` ASC)", SQLUtils.toMySqlString(stmt)); + assertEquals("ALTER TABLE `test`.`tb1`" + // + "\n\tADD INDEX `ix` (`f2` ASC);", SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("alter table `test`.`tb1`" + // - "\n\tadd index `ix` (`f2` asc)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + assertEquals("alter table `test`.`tb1`" + // + "\n\tadd index `ix` (`f2` asc);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAddIndex_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAddIndex_1.java index d1cba8e536..8939b8f729 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAddIndex_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAddIndex_1.java @@ -36,10 +36,10 @@ public class MySqlAlterTableAddIndex_1 extends TestCase { parser.match(Token.EOF); Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tADD UNIQUE INDEX `ix2` (`fid` ASC)", SQLUtils.toMySqlString(stmt)); + "\n\tADD UNIQUE INDEX `ix2` (`fid` ASC);", SQLUtils.toMySqlString(stmt)); Assert.assertEquals("alter table `test`.`tb1`" + // - "\n\tadd unique index `ix2` (`fid` asc)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + "\n\tadd unique index `ix2` (`fid` asc);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); SchemaStatVisitor visitor = new SQLUtils().createSchemaStatVisitor(JdbcConstants.MYSQL); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAddPrimaryKey.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAddPrimaryKey.java index 9805d20b32..a010d26fb4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAddPrimaryKey.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAddPrimaryKey.java @@ -36,11 +36,11 @@ public class MySqlAlterTableAddPrimaryKey extends TestCase { Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // "\n\tCHANGE COLUMN `fid` `fid` INT(11) NOT NULL DEFAULT NULL,\n\t" + // - "ADD PRIMARY KEY (`fid`)", SQLUtils.toMySqlString(stmt)); + "ADD PRIMARY KEY (`fid`);", SQLUtils.toMySqlString(stmt)); Assert.assertEquals("alter table `test`.`tb1`" + // "\n\tchange column `fid` `fid` INT(11) not null default null,\n\t" + // - "add primary key (`fid`)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + "add primary key (`fid`);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); SchemaStatVisitor visitor = new SQLUtils().createSchemaStatVisitor(JdbcConstants.MYSQL); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAlterColumnTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAlterColumnTest.java index d7d6c76851..5756e503ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAlterColumnTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableAlterColumnTest.java @@ -30,11 +30,11 @@ public class MySqlAlterTableAlterColumnTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - Assert.assertEquals("ALTER TABLE `cube_template`\n" + - "\tADD COLUMN `stat_report_json` VARCHAR(256) CHARSET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '模板的统计报表json数组'", SQLUtils.toMySqlString(stmt)); + assertEquals("ALTER TABLE `cube_template`\n" + + "\tADD COLUMN `stat_report_json` VARCHAR(256) CHARSET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '模板的统计报表json数组';", SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("alter table `cube_template`\n" + - "\tadd column `stat_report_json` VARCHAR(256) charset utf8 COLLATE utf8_general_ci not null default '' comment '模板的统计报表json数组'", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + assertEquals("alter table `cube_template`\n" + + "\tadd column `stat_report_json` VARCHAR(256) charset utf8 COLLATE utf8_general_ci not null default '' comment '模板的统计报表json数组';", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableDropIndex_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableDropIndex_0.java index 6400525b18..2d633b9874 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableDropIndex_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableDropIndex_0.java @@ -34,11 +34,11 @@ public class MySqlAlterTableDropIndex_0 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tDROP INDEX `ix`", SQLUtils.toMySqlString(stmt)); + assertEquals("ALTER TABLE `test`.`tb1`" + // + "\n\tDROP INDEX `ix`;", SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("alter table `test`.`tb1`" + // - "\n\tdrop index `ix`", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + assertEquals("alter table `test`.`tb1`" + // + "\n\tdrop index `ix`;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); SchemaStatVisitor visitor = new SQLUtils().createSchemaStatVisitor(JdbcConstants.MYSQL); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableDropIndex_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableDropIndex_1.java index a55af9a7f1..a862b09ee5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableDropIndex_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableDropIndex_1.java @@ -34,11 +34,11 @@ public class MySqlAlterTableDropIndex_1 extends TestCase { Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // "\n\tDROP INDEX `ix`," + // - "\n\tDROP INDEX `ix2`", SQLUtils.toMySqlString(stmt)); + "\n\tDROP INDEX `ix2`;", SQLUtils.toMySqlString(stmt)); Assert.assertEquals("alter table `test`.`tb1`" + // "\n\tdrop index `ix`," + // - "\n\tdrop index `ix2`", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + "\n\tdrop index `ix2`;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest.java index 20f0b72806..da423a742a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest.java @@ -32,7 +32,7 @@ public class MySqlAlterTableTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tCHANGE COLUMN `fname` `fname1` VARCHAR(45) NULL DEFAULT NULL", output); + Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tCHANGE COLUMN `fname` `fname1` VARCHAR(45) NULL DEFAULT NULL;", output); } public void test_alter_1() throws Exception { @@ -41,8 +41,8 @@ public class MySqlAlterTableTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tCHARACTER SET = utf8, COLLATE = utf8_general_ci", SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("alter table `test`.`tb1`\n\tcharacter set = utf8, collate = utf8_general_ci", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tCHARACTER SET = utf8, COLLATE = utf8_general_ci;", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("alter table `test`.`tb1`\n\tcharacter set = utf8, collate = utf8_general_ci;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } public void test_alter_2() throws Exception { @@ -51,7 +51,7 @@ public class MySqlAlterTableTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tADD INDEX `f` (`fname` ASC)", output); + Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tADD INDEX `f` (`fname` ASC);", output); } public void test_alter_3() throws Exception { @@ -60,7 +60,7 @@ public class MySqlAlterTableTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tENGINE = InnoDB", output); + Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tENGINE = InnoDB;", output); } public void test_alter_4() throws Exception { @@ -69,7 +69,7 @@ public class MySqlAlterTableTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tCOLLATE = utf8_general_ci,\n\tPACK_KEYS = PACK ALL,\n\tENGINE = InnoDB", output); + Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tCOLLATE = utf8_general_ci,\n\tPACK_KEYS = PACK ALL,\n\tENGINE = InnoDB;", output); } public void test_alter_5() throws Exception { @@ -78,7 +78,7 @@ public class MySqlAlterTableTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("ALTER TABLE t1\n\tCOMMENT = '表的注释'", output); + Assert.assertEquals("ALTER TABLE t1\n\tCOMMENT = '表的注释';", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest1.java index 6e3d6259ee..c1c4df7cc4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest1.java @@ -32,7 +32,7 @@ public class MySqlAlterTableTest1 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("RENAME TABLE t1 TO t2", output); + Assert.assertEquals("RENAME TABLE t1 TO t2;", output); } public void test_alter_1() throws Exception { @@ -41,7 +41,7 @@ public class MySqlAlterTableTest1 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("ALTER TABLE t2\n\tADD COLUMN d TIMESTAMP", output); + Assert.assertEquals("ALTER TABLE t2\n\tADD COLUMN d TIMESTAMP;", output); } public void test_alter_2() throws Exception { @@ -50,7 +50,7 @@ public class MySqlAlterTableTest1 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("ALTER TABLE t2\n\tADD INDEX (d),\n\tADD UNIQUE INDEX (a)", output); + Assert.assertEquals("ALTER TABLE t2\n\tADD INDEX (d),\n\tADD UNIQUE INDEX (a);", output); } public void test_alter_3() throws Exception { @@ -59,7 +59,7 @@ public class MySqlAlterTableTest1 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("RENAME TABLE t1 TO t2", output); + Assert.assertEquals("RENAME TABLE t1 TO t2;", output); } public void test_alter_4() throws Exception { @@ -68,7 +68,7 @@ public class MySqlAlterTableTest1 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("RENAME TABLE t1 TO t2", output); + Assert.assertEquals("RENAME TABLE t1 TO t2;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest10.java index d0876db157..0efaf3e33a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest10.java @@ -41,7 +41,7 @@ public class MySqlAlterTableTest10 extends TestCase { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE t1" + // - "\n\tCHANGE COLUMN a b INTEGER", output); + "\n\tCHANGE COLUMN a b INTEGER;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest11.java index 7821f8210c..5a6954a50e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest11.java @@ -41,7 +41,7 @@ public class MySqlAlterTableTest11 extends TestCase { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE t1" + - "\n\tMODIFY COLUMN b BIGINT NOT NULL", output); + "\n\tMODIFY COLUMN b BIGINT NOT NULL;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest12.java index 75da788e99..84731d67d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest12.java @@ -41,7 +41,7 @@ public class MySqlAlterTableTest12 extends TestCase { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tbl_name" + // - "\n\tDROP FOREIGN KEY fk_symbol", output); + "\n\tDROP FOREIGN KEY fk_symbol;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest13.java index 8345a0ce3f..235e2eb533 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest13.java @@ -41,7 +41,7 @@ public class MySqlAlterTableTest13 extends TestCase { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tbl_name" + // - "\n\tDISCARD TABLESPACE", output); + "\n\tDISCARD TABLESPACE;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest14.java index 432092da41..0185d907cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest14.java @@ -41,7 +41,7 @@ public class MySqlAlterTableTest14 extends TestCase { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tbl_name" + // - "\n\tIMPORT TABLESPACE", output); + "\n\tIMPORT TABLESPACE;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest18.java index e9cd7b20d3..10a27bdbf7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest18.java @@ -32,7 +32,7 @@ public class MySqlAlterTableTest18 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tADD COLUMN `f2` VARCHAR(45) CHARACTER SET gbk NULL FIRST", output); + Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tADD COLUMN `f2` VARCHAR(45) CHARACTER SET gbk NULL FIRST;", output); } public void test_alter_collate() throws Exception { @@ -41,7 +41,7 @@ public class MySqlAlterTableTest18 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tADD COLUMN `f2` VARCHAR(45) COLLATE utf8_bin NULL FIRST", output); + Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tADD COLUMN `f2` VARCHAR(45) COLLATE utf8_bin NULL FIRST;", output); } public void test_alter_charset_collate() throws Exception { @@ -50,6 +50,6 @@ public class MySqlAlterTableTest18 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tADD COLUMN `f2` VARCHAR(45) CHARACTER SET utf8 COLLATE utf8_bin NULL FIRST", output); + Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tADD COLUMN `f2` VARCHAR(45) CHARACTER SET utf8 COLLATE utf8_bin NULL FIRST;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest2.java index ea586759bc..1ba661f7c4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest2.java @@ -31,7 +31,7 @@ public class MySqlAlterTableTest2 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tADD COLUMN `f2` VARCHAR(45) NULL FIRST", output); + Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tADD COLUMN `f2` VARCHAR(45) NULL FIRST;", output); } public void test_alter_add_column() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest22.java index dab6fc6738..a02d1e6db3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest22.java @@ -33,6 +33,6 @@ public class MySqlAlterTableTest22 extends TestCase { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE pj_usr_auth" // - + "\n\tADD CONSTRAINT FK_Reference_8 FOREIGN KEY (usr) REFERENCES usr (usr) ON DELETE RESTRICT ON UPDATE RESTRICT", output); + + "\n\tADD CONSTRAINT FK_Reference_8 FOREIGN KEY (usr) REFERENCES usr (usr) ON DELETE RESTRICT ON UPDATE RESTRICT;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest23.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest23.java index c2c561b237..8f28bb95f8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest23.java @@ -33,6 +33,6 @@ public class MySqlAlterTableTest23 extends TestCase { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE xxxxx" - + "\n\tMODIFY COLUMN xxx DEFAULT '0'", output); + + "\n\tMODIFY COLUMN xxx DEFAULT '0';", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest24.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest24.java index 40638c690b..9fe7ac9a66 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest24.java @@ -34,6 +34,6 @@ public class MySqlAlterTableTest24 extends TestCase { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE xxxxx" + "\n\tMODIFY COLUMN f0 DEFAULT '0'," - + "\n\tMODIFY COLUMN f1 DEFAULT '0'", output); + + "\n\tMODIFY COLUMN f1 DEFAULT '0';", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest25.java index 9341b22f93..a70e7642c6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest25.java @@ -33,6 +33,6 @@ public class MySqlAlterTableTest25 extends TestCase { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE xxxx" - + "\n\tADD COLUMN over bigint UNSIGNED COMMENT 'xxxx'", output); + + "\n\tADD COLUMN over bigint UNSIGNED COMMENT 'xxxx';", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest26.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest26.java index be8f677403..4740ed3957 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest26.java @@ -33,6 +33,6 @@ public class MySqlAlterTableTest26 extends TestCase { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE xxxx" - + "\n\tUNION = (t1, t2)", output); + + "\n\tUNION = (t1, t2);", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest7.java index 01d3d99cbb..8d240fca4d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest7.java @@ -41,7 +41,7 @@ public class MySqlAlterTableTest7 extends TestCase { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE t1" + // - "\n\tENGINE = InnoDB", output); + "\n\tENGINE = InnoDB;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest9.java index d1d3c14843..347a1a87ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest9.java @@ -42,7 +42,7 @@ public class MySqlAlterTableTest9 extends TestCase { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE t2" + // "\n\tDROP COLUMN c," + // - "\n\tDROP COLUMN d", output); + "\n\tDROP COLUMN d;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterUserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterUserTest.java index 9c3a9e86c4..2ed8a14dc7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterUserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterUserTest.java @@ -41,7 +41,7 @@ public class MySqlAlterUserTest extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("ALTER USER 'jeffrey'@'localhost' PASSWORD EXPIRE", // + Assert.assertEquals("ALTER USER 'jeffrey'@'localhost' PASSWORD EXPIRE;", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest12.java new file mode 100644 index 0000000000..ba85a8b4b7 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest12.java @@ -0,0 +1,78 @@ +/* + * Copyright 1999-2017 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.mysql.create; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; + +import java.util.List; + +public class MySqlCreateProcedureTest12 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "CREATE PROCEDURE find_parts (\n" + + "\tseed INT\n" + + ")\n" + + "BEGIN\n" + + "\tDROP TABLE IF EXISTS _result;\n" + + "\tCREATE TEMPORARY TABLE _result (\n" + + "\t\tnode INT PRIMARY KEY\n" + + "\t);\n" + + "\tINSERT INTO _result\n" + + "\tVALUES (seed);\n" + + "\tDROP TABLE IF EXISTS _tmp;\n" + + "\tCREATE TEMPORARY TABLE _tmp LIKE _result;\n" + + "\tREPEAT \n" + + "\t\tTRUNCATE TABLE _tmp;\n" + + "\t\tINSERT INTO _tmp\n" + + "\t\tSELECT child AS node\n" + + "\t\tFROM _result\n" + + "\t\t\tJOIN nodes ON node = parent;\n" + + "\t\tINSERT IGNORE INTO _result\n" + + "\t\tSELECT node\n" + + "\t\tFROM _tmp;\n" + + "\tUNTIL ROW_COUNT() = 0\n" + + "\tEND REPEAT;\n" + + "\tDROP TABLE _tmp;\n" + + "\tSELECT *\n" + + "\tFROM _result;\n" + + "END;"; + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); + SQLStatement stmt = statementList.get(0); +// print(statementList); +// assertEquals(1, statementList.size()); + + System.out.println(SQLUtils.toMySqlString(stmt)); + + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); + stmt.accept(visitor); + +// System.out.println("Tables : " + visitor.getTables()); +// System.out.println("fields : " + visitor.getColumns()); +// System.out.println("coditions : " + visitor.getConditions()); +// System.out.println("orderBy : " + visitor.getOrderByColumns()); + + assertEquals(3, visitor.getTables().size()); + assertEquals(6, visitor.getColumns().size()); + assertEquals(2, visitor.getConditions().size()); + } + + +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_1.java index e0b14c2856..7d974ff7ad 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_1.java @@ -40,9 +40,9 @@ public class MySqlCreateUserTest_1 extends MysqlTest { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - Assert.assertEquals("CREATE USER 'jeffrey'@'localhost'", // + Assert.assertEquals("CREATE USER 'jeffrey'@'localhost';", // SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("create user 'jeffrey'@'localhost'", // + Assert.assertEquals("create user 'jeffrey'@'localhost';", // SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_2.java index ccbe594144..20b565aeb8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_2.java @@ -40,9 +40,9 @@ public class MySqlCreateUserTest_2 extends MysqlTest { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - Assert.assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY 'mypass'", // + Assert.assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';", // SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("create user 'jeffrey'@'localhost' identified by 'mypass'", // + Assert.assertEquals("create user 'jeffrey'@'localhost' identified by 'mypass';", // SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_3.java index fb59bb5d9a..06ec2a2047 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_3.java @@ -41,10 +41,10 @@ public class MySqlCreateUserTest_3 extends MysqlTest { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - Assert.assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY PASSWORD '*90E462C37378CED12064BB3388827D2BA3A9B689'", // + Assert.assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY PASSWORD '*90E462C37378CED12064BB3388827D2BA3A9B689';", // SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("create user 'jeffrey'@'localhost' identified by password '*90E462C37378CED12064BB3388827D2BA3A9B689'", // + Assert.assertEquals("create user 'jeffrey'@'localhost' identified by password '*90E462C37378CED12064BB3388827D2BA3A9B689';", // SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_4.java index b6c84421ac..8c453acefe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_4.java @@ -41,10 +41,10 @@ public class MySqlCreateUserTest_4 extends MysqlTest { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - Assert.assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED WITH my_auth_plugin", // + Assert.assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED WITH my_auth_plugin;", // SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("create user 'jeffrey'@'localhost' identified with my_auth_plugin", // + Assert.assertEquals("create user 'jeffrey'@'localhost' identified with my_auth_plugin;", // SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest.java similarity index 96% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest.java index 29f88964d1..7264003066 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest1.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest1.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest1.java index 47584c8ef9..6c82f7a113 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest1.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest10.java similarity index 96% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest10.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest10.java index 39ff757301..b106591fb0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest10.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest11.java similarity index 96% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest11.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest11.java index a428cdd83b..1cf4c89cd4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest11.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest12.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest12.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest12.java index 8a46d22205..2b36878c50 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest12.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest13.java similarity index 96% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest13.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest13.java index 4fe5565cea..88b3091a7e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest13.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest14.java similarity index 96% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest14.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest14.java index 013cb186fc..d0f3ec9c08 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest14.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest15.java similarity index 96% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest15.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest15.java index 5e5797c89d..9a4dbaa6db 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest15.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest16.java similarity index 96% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest16.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest16.java index 055d4a5b8e..dff427803f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest16.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest17.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest17.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest17.java index 9fa3d7c2d9..0617c40f0e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest17.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest18.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest18.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest18.java index 8f10ec1079..1e04f5be29 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest18.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest19.java similarity index 89% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest19.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest19.java index 0df21993c8..cb564bbcec 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest19.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -35,9 +35,9 @@ public class MySqlCreateTableTest19 extends MysqlTest { List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - Assert.assertEquals("CREATE TABLE new_tbl LIKE orig_tbl", // + Assert.assertEquals("CREATE TABLE new_tbl LIKE orig_tbl;", // SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("create table new_tbl like orig_tbl", // + Assert.assertEquals("create table new_tbl like orig_tbl;", // SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest2.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest2.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest2.java index 77464aaa1b..be21ac8ca2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest2.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest20.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest20.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest20.java index c27e6b7b45..398262db78 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest20.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest21.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest21.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest21.java index 2ffb58526e..b2808f830c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest21.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest22.java similarity index 92% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest22.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest22.java index 1d0c6b9398..eaf6f3ce97 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest22.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -59,7 +59,7 @@ public class MySqlCreateTableTest22 extends MysqlTest { Assert.assertEquals("CREATE TABLE t1 (" + // "\n\tc1 INT STORAGE DISK," + // "\n\tc2 INT STORAGE MEMORY" + // - "\n) TABLESPACE ts_1 ENGINE = NDB", output); + "\n) TABLESPACE ts_1 ENGINE = NDB;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest23.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest23.java similarity index 93% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest23.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest23.java index 9ae2d71ff1..4613b23733 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest23.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest23 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) ENGINE = MEMORY", output); + "\n) ENGINE = MEMORY;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest24.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest24.java similarity index 92% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest24.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest24.java index 8c3d3b0be6..f6e8564591 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest24.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest24 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) AVG_ROW_LENGTH = 1024", output); + "\n) AVG_ROW_LENGTH = 1024;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest25.java similarity index 92% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest25.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest25.java index 8899c3196d..b41206c258 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest25.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest25 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) AVG_ROW_LENGTH = 1024", output); + "\n) AVG_ROW_LENGTH = 1024;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest26.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest26.java similarity index 93% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest26.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest26.java index 48fb65b8db..214fcf7528 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest26.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest26 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) MAX_ROWS = 1024", output); + "\n) MAX_ROWS = 1024;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest27.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest27.java similarity index 93% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest27.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest27.java index 23b5a378fa..b78240c0fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest27.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest27 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) MAX_ROWS = 1024", output); + "\n) MAX_ROWS = 1024;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest28.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest28.java similarity index 93% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest28.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest28.java index 0cb082f216..53169e8944 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest28.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest28 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) MIN_ROWS = 1024", output); + "\n) MIN_ROWS = 1024;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest29.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest29.java similarity index 93% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest29.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest29.java index c7ccd76ac7..88ede352d9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest29.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest29 extends MysqlTest { Assert.assertEquals("CREATE TABLE user (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) MIN_ROWS = 1024", output); + "\n) MIN_ROWS = 1024;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest3.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest3.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest3.java index 904b580d53..6618558739 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest3.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest30.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest30.java similarity index 92% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest30.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest30.java index a8b96f931b..6a9c76578e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest30.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest30 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) DELAY_KEY_WRITE = 0", output); + "\n) DELAY_KEY_WRITE = 0;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest31.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest31.java similarity index 92% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest31.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest31.java index da5fa46b3b..cb94e5ca0e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest31.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest31.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest31 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) DELAY_KEY_WRITE = 1", output); + "\n) DELAY_KEY_WRITE = 1;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest32.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest32.java similarity index 92% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest32.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest32.java index 1692fcf6dd..bdd1462499 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest32.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest32 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) DATA DIRECTORY = 'aaa'", output); + "\n) DATA DIRECTORY = 'aaa';", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest33.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest33.java similarity index 93% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest33.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest33.java index f602be0ef1..5a48bbd07e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest33.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest33 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) CONNECTION = 'aaa'", output); + "\n) CONNECTION = 'aaa';", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest34.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest34.java similarity index 93% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest34.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest34.java index b637cdf423..6eed9e317a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest34.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest34.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest34 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) CHECKSUM = 1", output); + "\n) CHECKSUM = 1;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest35.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest35.java similarity index 93% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest35.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest35.java index 3032f2c065..597592d44f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest35.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest35.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest35 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) AUTO_INCREMENT = 1", output); + "\n) AUTO_INCREMENT = 1;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest36.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest36.java similarity index 92% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest36.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest36.java index 9f928fe0c3..69ddad2f0a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest36.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest36 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) STATS_AUTO_RECALC = 1", output); + "\n) STATS_AUTO_RECALC = 1;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest37.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest37.java similarity index 92% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest37.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest37.java index 4f38ac70e7..1347a097f1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest37.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest37.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest37 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) STATS_AUTO_RECALC = DEFAULT", output); + "\n) STATS_AUTO_RECALC = DEFAULT;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest38.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest38.java similarity index 92% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest38.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest38.java index a5058dcd3a..cb6eb46ae8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest38.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest38.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest38 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) STATS_PERSISTENT = DEFAULT", output); + "\n) STATS_PERSISTENT = DEFAULT;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest39.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest39.java similarity index 92% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest39.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest39.java index 025f839ef0..abbadfbcdf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest39.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest39.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest39 extends MysqlTest { Assert.assertEquals("CREATE TABLE lookup (" + // "\n\tid INT," + // "\n\tINDEX USING BTREE(id)" + // - "\n) STATS_PERSISTENT = 1", output); + "\n) STATS_PERSISTENT = 1;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest4.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest4.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest4.java index 7e4f061f4b..3123017d5e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest4.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest40.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest40.java similarity index 92% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest40.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest40.java index 0a51e29f99..608b68791b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest40.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest40.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -58,7 +58,7 @@ public class MySqlCreateTableTest40 extends MysqlTest { "\n\tcol1 INT," + // "\n\tcol2 CHAR(5)" + // "\n)" - + "\nPARTITION BY HASH (col1)", output); + + "\nPARTITION BY HASH (col1);", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest41.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest41.java similarity index 94% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest41.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest41.java index 0b4da1e2c2..ff94d09a8a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest41.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest41.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -60,7 +60,7 @@ public class MySqlCreateTableTest41 extends MysqlTest { "\n\tcol2 CHAR(5)," + // "\n\tcol3 DATE" + // "\n)" - + "\nPARTITION BY LINEAR KEY (col3) PARTITIONS 5", output); + + "\nPARTITION BY LINEAR KEY (col3) PARTITIONS 5;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest42.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest42.java similarity index 94% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest42.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest42.java index 950a280aa1..c765db259c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest42.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest42.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -72,7 +72,7 @@ public class MySqlCreateTableTest42 extends MysqlTest { "\n\tPARTITION p1 VALUES LESS THAN (20, 10)," + // "\n\tPARTITION p2 VALUES LESS THAN (MAXVALUE, 15)," + // "\n\tPARTITION p3 VALUES LESS THAN (MAXVALUE, MAXVALUE)" + // - "\n)", output); + "\n);", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest43.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest43.java similarity index 94% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest43.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest43.java index 8de1842a26..0f4605021b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest43.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest43.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -72,7 +72,7 @@ public class MySqlCreateTableTest43 extends MysqlTest { "\n\tPARTITION r1 VALUES IN (2, 6, 10, 14, 18, 22), " + // "\n\tPARTITION r2 VALUES IN (3, 7, 11, 15, 19, 23), " + // "\n\tPARTITION r3 VALUES IN (4, 8, 12, 16, 20, 24)" + // - "\n)", output); + "\n);", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest44.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest44.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest44.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest44.java index 801cff9069..b40013344a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest44.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest44.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -72,7 +72,7 @@ public class MySqlCreateTableTest44 extends MysqlTest { "\n\tPARTITION p1 VALUES IN ((0, 1), (0, 2), (0, 3), (1, 1), (1, 2)), " + // "\n\tPARTITION p2 VALUES IN ((1, 0), (2, 0), (2, 1), (3, 0), (3, 1)), " + // "\n\tPARTITION p3 VALUES IN ((1, 3), (2, 2), (2, 3), (3, 2), (3, 3))" + // - "\n)", output); + "\n);", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest45.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest45.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest45.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest45.java index 0d6275058c..5fb6a42f04 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest45.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest45.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; @@ -87,7 +87,7 @@ public class MySqlCreateTableTest45 extends MysqlTest { "\n\tPARTITION p2002 VALUES IN (1998, 2002, 2006)" + // "\n\t\tDATA DIRECTORY '/var/appdata/98/data'" + // "\n\t\tINDEX DIRECTORY '/var/appdata/98/idx'" + // - "\n)", output); + "\n);", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest46.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest46.java similarity index 97% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest46.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest46.java index 5e39a6285b..52c9ab6898 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest46.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest46.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest47.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest47.java similarity index 98% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest47.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest47.java index 74584681e4..63366faf44 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest47.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest47.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest48.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest48.java similarity index 98% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest48.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest48.java index c2df48a698..fd7dfb608f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest48.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest48.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest49.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest49.java similarity index 98% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest49.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest49.java index 59951775b3..3631473b98 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest49.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest49.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest5.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest5.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest5.java index 97a388862d..a5db1bf880 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest5.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest50.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest50.java similarity index 97% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest50.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest50.java index 85b581013d..0d8cdfa1c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest50.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest50.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest51.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest51.java similarity index 97% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest51.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest51.java index a3d7ba5cdc..77094e8252 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest51.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest51.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest52.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest52.java similarity index 98% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest52.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest52.java index da06135c50..f3be5240de 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest52.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest52.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest53.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest53.java similarity index 99% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest53.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest53.java index 161376f6c8..456191aec1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest53.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest53.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest54.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest54.java similarity index 99% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest54.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest54.java index c44085c0ef..9d8b253496 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest54.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest54.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest55.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest55.java similarity index 97% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest55.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest55.java index a5f521dd4c..16c4651dad 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest55.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest55.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest56.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest56.java similarity index 98% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest56.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest56.java index 55bab8f075..896f2cb8e6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest56.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest56.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest57.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest57.java similarity index 98% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest57.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest57.java index dfbd3494ef..0b0417040f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest57.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest57.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest58.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest58.java similarity index 99% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest58.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest58.java index 51d6726016..5b4ba48c55 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest58.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest58.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest59.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest59.java similarity index 96% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest59.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest59.java index 47988b8102..40d25ac070 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest59.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest59.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest6.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest6.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest6.java index 163121a057..e0631bbc2c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest6.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest60.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest60.java similarity index 97% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest60.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest60.java index 0e2c782341..72c3b4a21f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest60.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest60.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest61.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest61.java similarity index 97% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest61.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest61.java index 7bbaa2dc74..540c816cb0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest61.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest61.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest62.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest62.java similarity index 97% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest62.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest62.java index c032b68db5..83db2dae31 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest62.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest62.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest63.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest63.java similarity index 97% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest63.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest63.java index d6f9bdca26..ee68264b95 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest63.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest63.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest64.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest64.java similarity index 97% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest64.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest64.java index f7b214c376..63ca6af2ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest64.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest64.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest65.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest65.java similarity index 97% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest65.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest65.java index 1e4bc92e2a..0f219a9fa1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest65.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest65.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest66.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest66.java similarity index 98% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest66.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest66.java index d1c3e451bb..acefceb916 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest66.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest66.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest67.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest67.java similarity index 98% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest67.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest67.java index 55d7196dd1..0970c2ba84 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest67.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest67.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest68.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest68.java similarity index 98% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest68.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest68.java index 5aac03997e..539123354d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest68.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest68.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest69.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest69.java similarity index 97% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest69.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest69.java index 46f1c2d914..44a7eb2e94 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest69.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest69.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest7.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest7.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest7.java index 9b39a53dd6..387c8dc4f7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest7.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest70.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest70.java similarity index 99% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest70.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest70.java index f03e9fef82..5e4d8a1c5c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest70.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest70.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest71.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest71.java similarity index 98% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest71.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest71.java index 8f708ef1d3..6197c7ffa2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest71.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest71.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest72.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest72.java similarity index 98% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest72.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest72.java index 736baf6056..829c452f9e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest72.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest72.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest73.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest73.java similarity index 97% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest73.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest73.java index 68435e6582..420a6ff980 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest73.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest73.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest74.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest74.java similarity index 98% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest74.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest74.java index 921416362a..1daa292fba 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest74.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest74.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest75.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest75.java similarity index 99% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest75.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest75.java index a652552615..b0751f7952 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest75.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest75.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest76.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest76.java similarity index 99% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest76.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest76.java index d2b69ccb48..e3c4afd963 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest76.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest76.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest8.java similarity index 96% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest8.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest8.java index 50f0bf87dc..d468f707cd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest8.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest9.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest9.java rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest9.java index ed1a63d9b1..111297609d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest9.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.bvt.sql.mysql.create; +package com.alibaba.druid.bvt.sql.mysql.createTable; import java.util.List; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropUserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropUserTest.java index df35e97bf7..13cc8dd02e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropUserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropUserTest.java @@ -41,7 +41,7 @@ public class MySqlDropUserTest extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("DROP USER 'jeffrey'@'localhost'", // + Assert.assertEquals("DROP USER 'jeffrey'@'localhost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest.java index 8919523a6c..56f768343a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest.java @@ -41,7 +41,7 @@ public class MySqlGrantTest extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT ALL ON db1.* TO 'jeffrey'@'localhost'", // + Assert.assertEquals("GRANT ALL ON db1.* TO 'jeffrey'@'localhost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_1.java index c5fa112531..a81e30ab9a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_1.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_1 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT SELECT ON db2.invoice TO 'jeffrey'@'localhost'", // + Assert.assertEquals("GRANT SELECT ON db2.invoice TO 'jeffrey'@'localhost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_10.java index 543ffc3d63..5d66ba3049 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_10.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_10 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT PROXY ON 'localuser'@'localhost' TO 'externaluser'@'somehost'", // + Assert.assertEquals("GRANT PROXY ON 'localuser'@'localhost' TO 'externaluser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_11.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_11.java index 55ed8f875b..04c320df1d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_11.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_11 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT CREATE TABLESPACE ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT CREATE TABLESPACE ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_12.java index 713edad897..0985b03b13 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_12.java @@ -40,9 +40,9 @@ public class MySqlGrantTest_12 extends MysqlTest { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - Assert.assertEquals("GRANT CREATE TEMPORARY TABLE ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT CREATE TEMPORARY TABLE ON mydb.* TO 'someuser'@'somehost';", // SQLUtils.toMySqlString(stmt)); - Assert.assertEquals("grant CREATE TEMPORARY TABLE on mydb.* to 'someuser'@'somehost'", // + Assert.assertEquals("grant CREATE TEMPORARY TABLE on mydb.* to 'someuser'@'somehost';", // SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_13.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_13.java index 5663cddaf7..7e6190a617 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_13.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_13 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT CREATE USER ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT CREATE USER ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_14.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_14.java index ca71df3201..a63146cc13 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_14.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_14 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT CREATE VIEW ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT CREATE VIEW ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_15.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_15.java index 8736b4a32d..e03bfc84bf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_15.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_15 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT DELETE ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT DELETE ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_16.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_16.java index f54fa8d4da..a0c23c10d3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_16.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_16 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT DROP ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT DROP ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_17.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_17.java index 0a0e3b6ad7..ac1bff9c0a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_17.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_17 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT EVENT ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT EVENT ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_18.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_18.java index acd30d18e8..02f9ac4a2f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_18.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_18 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT EXECUTE ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT EXECUTE ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_19.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_19.java index 9999a8ad48..40628a387c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_19.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_19 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT FILE ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT FILE ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_20.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_20.java index 0973e0453b..56d1635091 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_20.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_20 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT GRANT OPTION ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT GRANT OPTION ON mydb.* TO 'someuser'@'somehost';", // output); // // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_21.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_21.java index 52d25d4f1c..9993300345 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_21.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_21 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT INDEX ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT INDEX ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_22.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_22.java index 9944528eee..a1f7e58e97 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_22.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_22 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT LOCK TABLES ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT LOCK TABLES ON mydb.* TO 'someuser'@'somehost';", // output); // // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_23.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_23.java index 30f8a4ccc6..64300789ca 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_23.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_23 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT PROXY ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT PROXY ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_24.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_24.java index c69cffc927..36df78c513 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_24.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_24 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT PROCESS ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT PROCESS ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_25.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_25.java index 64158658f7..ef8724ca39 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_25.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_25 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT REFERENCES ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT REFERENCES ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_26.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_26.java index 54c5baee9a..9e92afd8ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_26.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_26 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT RELOAD ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT RELOAD ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_27.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_27.java index 516e754dd6..a5258e915b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_27.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_27 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT REPLICATION CLIENT ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT REPLICATION CLIENT ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_28.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_28.java index b6cb52430b..95984031c7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_28.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_28 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT REPLICATION SLAVE ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT REPLICATION SLAVE ON mydb.* TO 'someuser'@'somehost';", // output); // // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_29.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_29.java index 0300ee0cfd..70cbed4597 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_29.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_29 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT SHOW DATABASES ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT SHOW DATABASES ON mydb.* TO 'someuser'@'somehost';", // output); // // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_3.java index ef915e1954..57c11f6297 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_3.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_3 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT ALL ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT ALL ON mydb.* TO 'someuser'@'somehost';", // output); // // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_30.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_30.java index 94d6d451f0..9be1c1516f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_30.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_30 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT SHOW VIEW ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT SHOW VIEW ON mydb.* TO 'someuser'@'somehost';", // output); // // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_31.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_31.java index 24c0b580f5..52e9dd810b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_31.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_31.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_31 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT SHUTDOWN ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT SHUTDOWN ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_32.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_32.java index 7b0a489cf3..45da5b3086 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_32.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_32 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT SUPER ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT SUPER ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_33.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_33.java index 977cfa367f..d0f7f779b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_33.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_33 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT TRIGGER ON mydb.* TO 'someuser'@'somehost'", // + assertEquals("GRANT TRIGGER ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_34.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_34.java index e39af5f81d..a787960e2a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_34.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_34.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_34 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT USAGE ON *.* TO 'bob'@'%.example.org' IDENTIFIED BY 'cleartext password'", // + Assert.assertEquals("GRANT USAGE ON *.* TO 'bob'@'%.example.org' IDENTIFIED BY 'cleartext password';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_5.java index b5bf698e29..0ebe7b0844 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_5.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_5 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT ALL ON mydb.mytbl TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT ALL ON mydb.mytbl TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_6.java index 3e9cbd548c..1916dcfdca 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_6.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_6 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT SELECT, INSERT ON mydb.mytbl TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT SELECT, INSERT ON mydb.mytbl TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_7.java index 9ad567a858..6d92146504 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_7.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_7 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT SELECT(col1), INSERT(col1, col2) ON mydb.mytbl TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT SELECT(col1), INSERT(col1, col2) ON mydb.mytbl TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_8.java index 223ef4b22e..b835951457 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_8.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_8 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT CREATE ROUTINE ON mydb.* TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT CREATE ROUTINE ON mydb.* TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_9.java index a556a746b9..1a907877a6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_9.java @@ -41,7 +41,7 @@ public class MySqlGrantTest_9 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("GRANT EXECUTE ON PROCEDURE mydb.myproc TO 'someuser'@'somehost'", // + Assert.assertEquals("GRANT EXECUTE ON PROCEDURE mydb.myproc TO 'someuser'@'somehost';", // output); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_1.java index dcc3d496fc..f40e530ff0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_1.java @@ -45,6 +45,6 @@ public class MySqlInsertTest_1 extends MysqlTest { stmt.accept(visitor); Assert.assertEquals("INSERT INTO tbl_name" + // - "\nVALUES ()", SQLUtils.toMySqlString(insertStmt)); + "\nVALUES ();", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_10.java index f0ccd8b5ad..60b8968465 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_10.java @@ -76,7 +76,7 @@ public class MySqlInsertTest_10 extends MysqlTest { + "\nVALUES ('a1', 'b1'),"// + "\n\t('a2', 'b2'),"// + "\n\t('a3', 'b3'),"// - + "\n\t('a4', 'b4')"; + + "\n\t('a4', 'b4');"; Assert.assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_15.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_15.java index fee0ef3f4a..32504b5d89 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_15.java @@ -54,7 +54,7 @@ public class MySqlInsertTest_15 extends MysqlTest { assertTrue(visitor.containsTable("t.t1")); String formatSql = "INSERT INTO t.t1 (id, id2)\n" + - "VALUES (1, 2)"; + "VALUES (1, 2);"; Assert.assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_2.java index 88348155c4..8f7aab5f38 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_2.java @@ -45,6 +45,6 @@ public class MySqlInsertTest_2 extends MysqlTest { stmt.accept(visitor); Assert.assertEquals("INSERT INTO tbl_name (col1, col2)" + // - "\nVALUES (15, col1 * 2)", SQLUtils.toMySqlString(insertStmt)); + "\nVALUES (15, col1 * 2);", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_3.java index a114d5b6e0..b89f3ee292 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_3.java @@ -45,6 +45,6 @@ public class MySqlInsertTest_3 extends MysqlTest { stmt.accept(visitor); Assert.assertEquals("INSERT INTO tbl_name (col1, col2)" + // - "\nVALUES (col2 * 2, 15)", SQLUtils.toMySqlString(insertStmt)); + "\nVALUES (col2 * 2, 15);", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_4.java index 423f8e7b8c..be55ae60ee 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_4.java @@ -51,6 +51,6 @@ public class MySqlInsertTest_4 extends MysqlTest { Assert.assertEquals("INSERT INTO tbl_name (a, b, c)" + // "\nVALUES (1, 2, 3)," + "\n\t(4, 5, 6)," + - "\n\t(7, 8, 9)", SQLUtils.toMySqlString(insertStmt)); + "\n\t(7, 8, 9);", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_5.java index c8bb1d9972..bb7801d96c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_5.java @@ -48,6 +48,6 @@ public class MySqlInsertTest_5 extends MysqlTest { Assert.assertEquals("INSERT INTO tbl_name (a, b, c)" + // "\nVALUES (1, 2, 3, 4, 5" + // - "\n\t, 6, 7, 8, 9)", SQLUtils.toMySqlString(insertStmt)); + "\n\t, 6, 7, 8, 9);", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_9.java index 6ed477607e..2ed4f7e03d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_9.java @@ -45,6 +45,6 @@ public class MySqlInsertTest_9 extends MysqlTest { stmt.accept(visitor); Assert.assertEquals("INSERT INTO sequence" - + "\nVALUES ('seq_wlb_order_log', 268234128 + 10000000, now())", SQLUtils.toMySqlString(insertStmt)); + + "\nVALUES ('seq_wlb_order_log', 268234128 + 10000000, now());", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_18.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_18.java index d5de557eae..ede0c071de 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_18.java @@ -36,7 +36,7 @@ public class MySqlParameterizedOutputVisitorTest_18 extends TestCase { "VALUES (NOW(), NOW(), ?, ?, ?\n" + "\t\t, ?, ?, ?, ?, ?\n" + "\t\t, ?, ?, ?, ?, ?\n" + - "\t\t, ?)", psql); + "\t\t, ?);", psql); SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); List stmtList = parser.parseStatementList(); @@ -68,6 +68,6 @@ public class MySqlParameterizedOutputVisitorTest_18 extends TestCase { "VALUES (NOW(), NOW(), 123, 'abc', 'abd'\n" + "\t, 'tair:ldbcount:808', 0.0, 2.0, 0, 251\n" + "\t, 0, '172.29.60.62', 2, 1483686655818, 12\n" + - "\t, 0)", buf.toString()); + "\t, 0);", buf.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_24.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_24.java index 4f101f230c..9628187874 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_24.java @@ -24,7 +24,7 @@ public class MySqlParameterizedOutputVisitorTest_24 extends TestCase { String psql = ParameterizedOutputVisitorUtils.parameterize(sql, dbType); assertEquals("SELECT `xxx_reverse_order`.`id`\n" + "FROM xxx_reverse_order xxx_reverse_order\n" + - "LIMIT ?", psql); + "LIMIT ?;", psql); SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(psql, dbType); List stmtList = parser.parseStatementList(); @@ -52,6 +52,6 @@ public class MySqlParameterizedOutputVisitorTest_24 extends TestCase { assertEquals("SELECT `xxx_reverse_order`.`id`\n" + "FROM xxx_reverse_order_0446 xxx_reverse_order\n" + - "LIMIT ?", buf.toString()); + "LIMIT ?;", buf.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_25.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_25.java index 6f8380f12a..97ad7e47bb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_25.java @@ -24,7 +24,7 @@ public class MySqlParameterizedOutputVisitorTest_25 extends TestCase { String psql = ParameterizedOutputVisitorUtils.parameterize(sql, dbType); assertEquals("SELECT `xxx_reverse_order`.`id`\n" + "FROM xxx_reverse_order XXX_REVERSE_ORDER\n" + - "LIMIT ?", psql); + "LIMIT ?;", psql); SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(psql, dbType); List stmtList = parser.parseStatementList(); @@ -52,6 +52,6 @@ public class MySqlParameterizedOutputVisitorTest_25 extends TestCase { assertEquals("SELECT `xxx_reverse_order`.`id`\n" + "FROM xxx_reverse_order_0446 XXX_REVERSE_ORDER\n" + - "LIMIT ?", buf.toString()); + "LIMIT ?;", buf.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_26.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_26.java index e7d9b9c7c9..d613450213 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_26.java @@ -25,7 +25,7 @@ public class MySqlParameterizedOutputVisitorTest_26 extends TestCase { assertEquals("SELECT `xxx_reverse_od`.`id`\n" + "FROM xxx_reverse_od `xxx_reverse_od`\n" + "WHERE `xxx_reverse_od`.name = ?\n" + - "LIMIT ?", psql); + "LIMIT ?;", psql); SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(psql, dbType); List stmtList = parser.parseStatementList(); @@ -54,6 +54,6 @@ public class MySqlParameterizedOutputVisitorTest_26 extends TestCase { assertEquals("SELECT `xxx_reverse_od`.`id`\n" + "FROM xxx_reverse_od_0446 `xxx_reverse_od`\n" + "WHERE `xxx_reverse_od`.name = ?\n" + - "LIMIT ?", buf.toString()); + "LIMIT ?;", buf.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_6.java index e7bef630ff..3e53f4443a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_6.java @@ -32,7 +32,7 @@ public class MySqlParameterizedOutputVisitorTest_6 extends TestCase { public void test_1() throws Exception { String sql = "SET GLOBAL sort_buffer_size=1000000, SESSION sort_buffer_size=1000000;"; - String paramSql = "SET @@global.sort_buffer_size = ?, sort_buffer_size = ?"; + String paramSql = "SET @@global.sort_buffer_size = ?, sort_buffer_size = ?;"; Assert.assertEquals(paramSql, ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_14.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_14.java index bb9b683eb4..e24d0ae6d5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_14.java @@ -66,7 +66,7 @@ public class MySqlSelectTest_14 extends MysqlTest { "WHERE column1 = (\n" + "\tSELECT column1\n" + "\tFROM t2\n" + - ")", // + ");", // output); String output_lcase = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -75,7 +75,7 @@ public class MySqlSelectTest_14 extends MysqlTest { + "\nwhere column1 = ("// + "\n\tselect column1"// + "\n\tfrom t2"// - + "\n)", // + + "\n);", // output_lcase); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java index 6772000bbf..8b3ef04892 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java @@ -65,6 +65,6 @@ public class MySqlSelectTest_20 extends MysqlTest { Assert.assertEquals("SELECT bsvariety, MAX(bsh) AS bsh, MIN(bsl) AS bsl" + "\nFROM exchange_market_info" + "\nWHERE bsdate > date_sub(now(), INTERVAL 1 DAY)" - + "\nGROUP BY bsvariety DESC", output); + + "\nGROUP BY bsvariety DESC;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_26.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_26.java index 8e83943958..5c8842e68e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_26.java @@ -53,12 +53,12 @@ public class MySqlSelectTest_26 extends MysqlTest { { String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("SELECT truncate(12.0123, 2)", // + Assert.assertEquals("SELECT truncate(12.0123, 2);", // output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - Assert.assertEquals("select truncate(12.0123, 2)", // + Assert.assertEquals("select truncate(12.0123, 2);", // output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_35.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_35.java index 70610d7801..501326215b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_35.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_35.java @@ -52,14 +52,14 @@ public class MySqlSelectTest_35 extends MysqlTest { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *\n" + "FROM t1\n" + - "\tNATURAL LEFT JOIN t2", // + "\tNATURAL LEFT JOIN t2;", // output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select *\n" + "from t1\n" + - "\tnatural left join t2", // + "\tnatural left join t2;", // output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_36.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_36.java index 682bd0f88d..c8c9459344 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_36.java @@ -52,14 +52,14 @@ public class MySqlSelectTest_36 extends MysqlTest { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *\n" + "FROM mytable t1\n" + - "\tNATURAL LEFT JOIN t2", // + "\tNATURAL LEFT JOIN t2;", // output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select *\n" + "from mytable t1\n" + - "\tnatural left join t2", // + "\tnatural left join t2;", // output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_39.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_39.java index b26780939e..bfa3bd974a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_39.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_39.java @@ -50,12 +50,12 @@ public class MySqlSelectTest_39 extends MysqlTest { { String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("SELECT DATE_ADD(now(), INTERVAL -1 DAY)", // + Assert.assertEquals("SELECT DATE_ADD(now(), INTERVAL -1 DAY);", // output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - Assert.assertEquals("select DATE_ADD(now(), interval -1 day)", // + Assert.assertEquals("select DATE_ADD(now(), interval -1 day);", // output); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat.java index e34f4d4147..8b92cf3267 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat.java @@ -68,7 +68,7 @@ public class MySqlSelectTest_group_concat extends MysqlTest { + "\nFROM ad_texts" // + "\nWHERE customer_id = 13001" // + "\n\tAND description1 LIKE '%爱丽%'" // - + "\nORDER BY id ASC", // + + "\nORDER BY id ASC;", // output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_8.java index 758c8c7a33..a7154cd46c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_8.java @@ -60,14 +60,14 @@ public class MySqlUpdateTest_8 extends MysqlTest { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("UPDATE haskell_function" + "\nSET `arity` = arity - '1'" - + "\nWHERE id = 1", // + + "\nWHERE id = 1;", // output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("update haskell_function" + "\nset `arity` = arity - '1'" - + "\nwhere id = 1", // + + "\nwhere id = 1;", // output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest.java index a24474c365..ae5f67ce49 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableAddPartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE members" - + "\n\tADD PARTITION (PARTITION p3 VALUES LESS THAN (2000))", + + "\n\tADD PARTITION (PARTITION p3 VALUES LESS THAN (2000));", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table members" - + "\n\tadd partition (partition p3 values less than (2000))", + + "\n\tadd partition (partition p3 values less than (2000));", result); } print(stmtList); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest2.java index f51ea5abee..1abbc95637 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest2.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableAddPartitionTest2 extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE clients" - + "\n\tADD PARTITION PARTITIONS 18", + + "\n\tADD PARTITION PARTITIONS 18;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table clients" - + "\n\tadd partition partitions 18", + + "\n\tadd partition partitions 18;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest.java index cda5d04348..3f24b6fb34 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest.java @@ -36,13 +36,13 @@ public class OceanbaseAlterTableAnalyzePartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tANALYZE PARTITION p1", + + "\n\tANALYZE PARTITION p1;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tanalyze partition p1", + + "\n\tanalyze partition p1;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest2.java index f2cd734644..691b74b6da 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest2.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableAnalyzePartitionTest2 extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tANALYZE PARTITION ALL", + + "\n\tANALYZE PARTITION ALL;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tanalyze partition all", + + "\n\tanalyze partition all;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest3.java index fdc6267023..21b1bb44fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest3.java @@ -36,13 +36,13 @@ public class OceanbaseAlterTableAnalyzePartitionTest3 extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tANALYZE PARTITION p1, p2", + + "\n\tANALYZE PARTITION p1, p2;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tanalyze partition p1, p2", + + "\n\tanalyze partition p1, p2;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest.java index 4b97f1bd0b..2470074e64 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableCheckPartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tCHECK PARTITION p1", + + "\n\tCHECK PARTITION p1;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tcheck partition p1", + + "\n\tcheck partition p1;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest2.java index 0a424d7533..a89287a1b9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest2.java @@ -36,13 +36,13 @@ public class OceanbaseAlterTableCheckPartitionTest2 extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tCHECK PARTITION ALL", + + "\n\tCHECK PARTITION ALL;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tcheck partition all", + + "\n\tcheck partition all;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest.java index e576468993..314813fcf9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableDiscardPartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tDISCARD PARTITION p1", + + "\n\tDISCARD PARTITION p1;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tdiscard partition p1", + + "\n\tdiscard partition p1;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest2.java index 74eaddd422..63b8daa278 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest2.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableDiscardPartitionTest2 extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tDISCARD PARTITION ALL", + + "\n\tDISCARD PARTITION ALL;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tdiscard partition all", + + "\n\tdiscard partition all;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDropPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDropPartitionTest.java index 6a8bcfe7ba..a1434f87d8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDropPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDropPartitionTest.java @@ -37,12 +37,12 @@ public class OceanbaseAlterTableDropPartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" + // - "\n\tDROP PARTITION p1", result); + "\n\tDROP PARTITION p1;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" + // - "\n\tdrop partition p1", result); + "\n\tdrop partition p1;", result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest.java index 0516ce1d2e..2d5068e7af 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableImportPartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tIMPORT PARTITION p1", + + "\n\tIMPORT PARTITION p1;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\timport partition p1", + + "\n\timport partition p1;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest2.java index b23b4f165c..5a472fbbe2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest2.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableImportPartitionTest2 extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tIMPORT PARTITION ALL", + + "\n\tIMPORT PARTITION ALL;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\timport partition all", + + "\n\timport partition all;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest.java index 9c940be628..c77372fb8a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableOptimizePartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tOPTIMIZE PARTITION p1", + + "\n\tOPTIMIZE PARTITION p1;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\toptimize partition p1", + + "\n\toptimize partition p1;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest2.java index c075aedef8..e31318be83 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest2.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableOptimizePartitionTest2 extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tOPTIMIZE PARTITION ALL", + + "\n\tOPTIMIZE PARTITION ALL;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\toptimize partition all", + + "\n\toptimize partition all;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest.java index 9842127270..bb8e993927 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableReOrganizePartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE members" // - + "\n\tREORGANIZE p0 INTO (PARTITION s0 VALUES LESS THAN (1960), PARTITION s1 VALUES LESS THAN (1970))", + + "\n\tREORGANIZE p0 INTO (PARTITION s0 VALUES LESS THAN (1960), PARTITION s1 VALUES LESS THAN (1970));", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table members" // - + "\n\treorganize p0 into (partition s0 values less than (1960), partition s1 values less than (1970))", + + "\n\treorganize p0 into (partition s0 values less than (1960), partition s1 values less than (1970));", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest2.java index cc5eea0896..e0a2727799 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest2.java @@ -41,13 +41,13 @@ public class OceanbaseAlterTableReOrganizePartitionTest2 extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE members" - + "\n\tREORGANIZE s0, s1, p1, p2, p3 INTO (PARTITION m0 VALUES LESS THAN (1980), PARTITION m1 VALUES LESS THAN (2000))", + + "\n\tREORGANIZE s0, s1, p1, p2, p3 INTO (PARTITION m0 VALUES LESS THAN (1980), PARTITION m1 VALUES LESS THAN (2000));", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table members" - + "\n\treorganize s0, s1, p1, p2, p3 into (partition m0 values less than (1980), partition m1 values less than (2000))", + + "\n\treorganize s0, s1, p1, p2, p3 into (partition m0 values less than (1980), partition m1 values less than (2000));", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest.java index ffdc50d845..4ed6c99161 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableRebuildPartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tREBUILD PARTITION p1", + + "\n\tREBUILD PARTITION p1;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\trebuild partition p1", + + "\n\trebuild partition p1;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest2.java index d9e0cebf21..5927eaad52 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest2.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableRebuildPartitionTest2 extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tREBUILD PARTITION ALL", + + "\n\tREBUILD PARTITION ALL;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\trebuild partition all", + + "\n\trebuild partition all;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRemovePartitioningTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRemovePartitioningTest.java index b880c53214..09da1fe44e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRemovePartitioningTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRemovePartitioningTest.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableRemovePartitioningTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tREMOVE PARTITIONING", + + "\n\tREMOVE PARTITIONING;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tremove partitioning", + + "\n\tremove partitioning;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest.java index d2a22e8c81..4140a84355 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableRepairPartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tREPAIR PARTITION p1", + + "\n\tREPAIR PARTITION p1;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\trepair partition p1", + + "\n\trepair partition p1;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest2.java index 52d72315c0..5e64dae710 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest2.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableRepairPartitionTest2 extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tREPAIR PARTITION ALL", + + "\n\tREPAIR PARTITION ALL;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\trepair partition all", + + "\n\trepair partition all;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest.java index 378291c511..fedbc9815b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableTruncatePartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tTRUNCATE PARTITION p1", + + "\n\tTRUNCATE PARTITION p1;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\ttruncate partition p1", + + "\n\ttruncate partition p1;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest2.java index 213b858775..13269d58a3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest2.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableTruncatePartitionTest2 extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tTRUNCATE PARTITION ALL", + + "\n\tTRUNCATE PARTITION ALL;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\ttruncate partition all", + + "\n\ttruncate partition all;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableUpgradePartitioningTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableUpgradePartitioningTest.java index d8ba92c128..b13a2b547e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableUpgradePartitioningTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableUpgradePartitioningTest.java @@ -37,13 +37,13 @@ public class OceanbaseAlterTableUpgradePartitioningTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tUPGRADE PARTITIONING", + + "\n\tUPGRADE PARTITIONING;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tupgrade partitioning", + + "\n\tupgrade partitioning;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash.java index bce644b753..73f7cf974f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash.java @@ -40,7 +40,7 @@ public class OceanbaseCreateTableTest_partitionByHash extends MysqlTest { + "\n\tid INT," + "\n\tname VARCHAR(5)" + "\n)" - + "\nPARTITION BY HASH (id) PARTITIONS 2", + + "\nPARTITION BY HASH (id) PARTITIONS 2;", result); } { @@ -49,7 +49,7 @@ public class OceanbaseCreateTableTest_partitionByHash extends MysqlTest { + "\n\tid INT," + "\n\tname VARCHAR(5)" + "\n)" - + "\npartition by hash (id) partitions 2", + + "\npartition by hash (id) partitions 2;", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition5.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition5.java index f19217e760..980f197b67 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition5.java @@ -48,7 +48,7 @@ public class OceanbaseCreateTableTest_rangePartition5 extends MysqlTest { + "\n(" + "\n\tPARTITION p1 VALUES LESS THAN (1)," + "\n\tPARTITION p2 VALUES LESS THAN MAXVALUE" - + "\n)", + + "\n);", result); } { @@ -61,7 +61,7 @@ public class OceanbaseCreateTableTest_rangePartition5 extends MysqlTest { + "\n(" + "\n\tpartition p1 values less than (1)," + "\n\tpartition p2 values less than maxvalue" - + "\n)", + + "\n);", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java index 2e8db6748f..313cbedd56 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java @@ -38,13 +38,13 @@ public class OceanbaseHintTest_Index extends MysqlTest { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT /*+ INDEX(t1 i1) , INDEX(t2 i2)*/ *" + "\nFROM t1, t2" - + "\nWHERE t1.c1 = t2.c1", result); + + "\nWHERE t1.c1 = t2.c1;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select /*+ INDEX(t1 i1) , INDEX(t2 i2)*/ *" + "\nfrom t1, t2" - + "\nwhere t1.c1 = t2.c1", result); + + "\nwhere t1.c1 = t2.c1;", result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index2.java index d915ac80d3..b81766d8d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index2.java @@ -36,7 +36,7 @@ public class OceanbaseHintTest_Index2 extends MysqlTest { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DELETE /*+ INDEX(t1 i1) */ FROM t1" - + "\nWHERE t1.c1 = 1", result); + + "\nWHERE t1.c1 = 1;", result); print(stmtList); Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java index e3689f0b0d..f73f0413da 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java @@ -36,7 +36,7 @@ public class OceanbaseHintTest_parallel extends MysqlTest { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT /*+ parallel(5) */ COUNT(*)" - + "\nFROM t1", result); + + "\nFROM t1;", result); print(stmtList); Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectPartitionTest.java index 0681089de8..f7e83135b3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectPartitionTest.java @@ -37,12 +37,12 @@ public class OceanbaseSelectPartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *" + // - "\nFROM tnhash PARTITION (p0)", result); + "\nFROM tnhash PARTITION (p0);", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select *" + // - "\nfrom tnhash partition (p0)", result); + "\nfrom tnhash partition (p0);", result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest_hierarchical_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest_hierarchical_1.java index 774f74d38b..dfc62a7de9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest_hierarchical_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest_hierarchical_1.java @@ -42,7 +42,7 @@ public class OceanbaseSelectTest_hierarchical_1 extends MysqlTest { "FROM employees\n" + "START WITH employee_id = 100\n" + "CONNECT BY PRIOR employee_id = manager_id\n" + - "ORDER SIBLINGS BY last_name", result); + "ORDER SIBLINGS BY last_name;", result); } { String result = SQLUtils.toSQLString(stmt, dbType, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -50,7 +50,7 @@ public class OceanbaseSelectTest_hierarchical_1 extends MysqlTest { "from employees\n" + "start with employee_id = 100\n" + "connect by prior employee_id = manager_id\n" + - "order siblings by last_name", result); + "order siblings by last_name;", result); } assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java index 7fb7630ebf..465618651c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java @@ -35,6 +35,6 @@ public class OdpsCreateTableTest extends TestCase { + "\n\tsale_date STRING," + "\n\tregion STRING" + "\n)"// - + "\nLIFECYCLE 5", output); + + "\nLIFECYCLE 5;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest2.java index 74100221be..87031e12c8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest2.java @@ -20,6 +20,6 @@ public class OdpsCreateTableTest2 extends TestCase { Assert.assertEquals("CREATE TABLE sale_detail" + "\nAS" + "\nSELECT *" // - + "\nFROM dual", output); + + "\nFROM dual;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest_1.java index ee70e3c024..9d64a06d51 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest_1.java @@ -17,6 +17,6 @@ public class OdpsCreateTableTest_1 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toOdpsString(stmt); - Assert.assertEquals("CREATE TABLE sale_detail_like LIKE sale_detail", output); + Assert.assertEquals("CREATE TABLE sale_detail_like LIKE sale_detail;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java index 3cadaa97a1..aeb1357b4f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java @@ -20,7 +20,7 @@ public class OdpsCreateViewTest extends TestCase { Assert.assertEquals("CREATE VIEW sale_detail" // + "\nAS" // + "\nSELECT *" // - + "\nFROM dual", output); + + "\nFROM dual;", output); } public void test_create_or_replace() throws Exception { @@ -32,7 +32,7 @@ public class OdpsCreateViewTest extends TestCase { Assert.assertEquals("CREATE OR REPLACE VIEW sale_detail" // + "\nAS" // + "\nSELECT *" // - + "\nFROM dual", output); + + "\nFROM dual;", output); } @@ -45,7 +45,7 @@ public class OdpsCreateViewTest extends TestCase { Assert.assertEquals("CREATE VIEW IF NOT EXISTS sale_detail" // + "\nAS" // + "\nSELECT *" // - + "\nFROM dual", output); + + "\nFROM dual;", output); } public void test_create_comments() throws Exception { @@ -58,7 +58,7 @@ public class OdpsCreateViewTest extends TestCase { + "\nCOMMENT 'aaaa'" // + "\nAS" // + "\nSELECT *" // - + "\nFROM dual", output); + + "\nFROM dual;", output); } public void test_create_column_comments() throws Exception { @@ -74,6 +74,6 @@ public class OdpsCreateViewTest extends TestCase { + "\n)" // + "\nAS" // + "\nSELECT *" // - + "\nFROM dual", output); + + "\nFROM dual;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/param/Oracle_param_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/param/Oracle_param_1.java index c2445d138a..1fdb5dee39 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/param/Oracle_param_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/param/Oracle_param_1.java @@ -41,7 +41,7 @@ public class Oracle_param_1 extends TestCase { String psql = out.toString(); assertEquals("SELECT TO_CHAR(SYSDATE, 'YYYY-MM-DD')\n" + - "FROM dual", psql); + "FROM dual;", psql); String params_json = JSONArray.toJSONString(parameters, SerializerFeature.WriteClassName); System.out.println(params_json); JSONArray jsonArray = JSON.parseArray(params_json); @@ -50,6 +50,6 @@ public class Oracle_param_1 extends TestCase { String rsql = SQLUtils.toSQLString(SQLUtils.parseStatements(psql, dbType), dbType, jsonArray); assertEquals("SELECT TO_CHAR(SYSDATE, 'YYYY-MM-DD')\n" + - "FROM dual", rsql); + "FROM dual;", rsql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/param/Oracle_param_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/param/Oracle_param_2.java index b8c51f2467..cd1b183307 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/param/Oracle_param_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/param/Oracle_param_2.java @@ -41,7 +41,7 @@ public class Oracle_param_2 extends TestCase { String psql = out.toString(); assertEquals("SELECT TO_DATE(?, 'YYYY-MM-DD')\n" + - "FROM dual", psql); + "FROM dual;", psql); String params_json = JSONArray.toJSONString(parameters, SerializerFeature.WriteClassName); System.out.println(params_json); JSONArray jsonArray = JSON.parseArray(params_json); @@ -50,6 +50,6 @@ public class Oracle_param_2 extends TestCase { String rsql = SQLUtils.toSQLString(SQLUtils.parseStatements(psql, dbType), dbType, jsonArray); assertEquals("SELECT TO_DATE('2013-02-11', 'YYYY-MM-DD')\n" + - "FROM dual", rsql); + "FROM dual;", rsql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCommitTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCommitTest.java index 85d00b7d1b..839cd27ec0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCommitTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCommitTest.java @@ -21,7 +21,7 @@ import com.alibaba.druid.sql.ast.statement.SQLCommitStatement; public class PGCommitTest extends PGTest { public void testCommit() throws Exception { String sql = "commit;"; - String expected = "COMMIT"; + String expected = "COMMIT;"; testParseSql(sql, expected, expected, SQLCommitStatement.class); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_4.java index d446e5c23f..3629865dcc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_4.java @@ -44,14 +44,14 @@ public class PGCreateTableTest_4 extends PGTest { + "\n\tname text," + "\n\tprice numeric" + "\n\t\tCHECK (price > 0)" - + "\n)", SQLUtils.toPGString(stmt)); + + "\n);", SQLUtils.toPGString(stmt)); Assert.assertEquals("create table products (" + "\n\tproduct_no integer," + "\n\tname text," + "\n\tprice numeric" + "\n\t\tcheck (price > 0)" - + "\n)", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\n);", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_5.java index 520c452a96..a9264a118f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_5.java @@ -39,11 +39,11 @@ public class PGCreateTableTest_5 extends PGTest { Assert.assertEquals("CREATE TABLE products (" + "\n\tstate char(2)" - + "\n) INHERITS (cities)", SQLUtils.toPGString(stmt)); + + "\n) INHERITS (cities);", SQLUtils.toPGString(stmt)); Assert.assertEquals("create table products (" + "\n\tstate char(2)" - + "\n) inherits (cities)", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\n) inherits (cities);", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFromAsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFromAsTest.java index 6cba77fbc5..26cc390622 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFromAsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFromAsTest.java @@ -21,7 +21,7 @@ import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectStatement; public class PGFromAsTest extends PGTest { public void testFromAs() throws Exception { String sql = "SELECT Count(*) FROM tb_abc AS t1 WHERE ((t1.a_id = 'global_a_id') AND (t1.owner = 'global_bc'));"; - String expectedSql = "SELECT COUNT(*)\nFROM tb_abc t1\nWHERE t1.a_id = 'global_a_id'\n\tAND t1.owner = 'global_bc'"; + String expectedSql = "SELECT COUNT(*)\nFROM tb_abc t1\nWHERE t1.a_id = 'global_a_id'\n\tAND t1.owner = 'global_bc';"; String expectedPattern = "SELECT COUNT(*)\nFROM tb_abc t1\nWHERE t1.a_id = ?\n\tAND t1.owner = ?"; testParseSql(sql, expectedSql, expectedPattern, PGSelectStatement.class); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest3.java index 94f01fd804..312843f742 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest3.java @@ -23,20 +23,20 @@ public class PGSetTest3 extends PGTest { Class type = PGSetStatement.class; String sql = "SET TIME ZONE 'Europe/Rome';"; - String expectedSql = "SET TIME ZONE 'Europe/Rome'"; - String expectedPattern = "SET TIME ZONE ?"; + String expectedSql = "SET TIME ZONE 'Europe/Rome';"; + String expectedPattern = "SET TIME ZONE ?;"; testParseSql(sql, expectedSql, expectedPattern, type); sql = "SET configuration_parameter TO DEFAULT;"; - expectedSql = "SET configuration_parameter TO DEFAULT"; + expectedSql = "SET configuration_parameter TO DEFAULT;"; testParseSql(sql, expectedSql, expectedSql, type); sql = "SET search_path TO my_schema, public;"; - expectedSql = "SET search_path TO my_schema, public"; + expectedSql = "SET search_path TO my_schema, public;"; testParseSql(sql, expectedSql, expectedSql, type); sql = "SET search_path = my_schema, public;"; - expectedSql = "SET search_path TO my_schema, public"; + expectedSql = "SET search_path TO my_schema, public;"; testParseSql(sql, expectedSql, expectedSql, type); sql = "SET a=1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGShowTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGShowTest1.java index 1f312dadf7..bd1c00540b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGShowTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGShowTest1.java @@ -21,11 +21,11 @@ import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGShowStatement; public class PGShowTest1 extends PGTest { public void testShowAll() throws Exception { String sql = "show all;"; - String expected = "SHOW ALL"; + String expected = "SHOW ALL;"; testParseSql(sql, expected, expected, PGShowStatement.class); sql = "show transaction_read_only;"; - expected = "SHOW transaction_read_only"; + expected = "SHOW transaction_read_only;"; testParseSql(sql, expected, expected, PGShowStatement.class); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropDefault.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropDefault.java index 0a8e604581..1b91080ec0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropDefault.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropDefault.java @@ -21,7 +21,7 @@ public class PGAlterTableDropDefault extends PGTest { print(statementList); Assert.assertEquals("ALTER TABLE products" - + "\n\tALTER COLUMN price DROP DEFAULT", stmt.toString()); + + "\n\tALTER COLUMN price DROP DEFAULT;", stmt.toString()); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropNotNull.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropNotNull.java index 9e410f6223..922cb19c38 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropNotNull.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropNotNull.java @@ -21,7 +21,7 @@ public class PGAlterTableDropNotNull extends PGTest { print(statementList); Assert.assertEquals("ALTER TABLE products" - + "\n\tALTER COLUMN product_no DROP NOT NULL", stmt.toString()); + + "\n\tALTER COLUMN product_no DROP NOT NULL;", stmt.toString()); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetDefault.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetDefault.java index 73763811f3..c24daab705 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetDefault.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetDefault.java @@ -21,7 +21,7 @@ public class PGAlterTableSetDefault extends PGTest { print(statementList); Assert.assertEquals("ALTER TABLE products" - + "\n\tALTER COLUMN price SET DEFAULT 7.77", stmt.toString()); + + "\n\tALTER COLUMN price SET DEFAULT 7.77;", stmt.toString()); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetNotNull.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetNotNull.java index 096d41bd1e..c63689972d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetNotNull.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetNotNull.java @@ -21,7 +21,7 @@ public class PGAlterTableSetNotNull extends PGTest { print(statementList); Assert.assertEquals("ALTER TABLE products" - + "\n\tALTER COLUMN product_no SET NOT NULL", stmt.toString()); + + "\n\tALTER COLUMN product_no SET NOT NULL;", stmt.toString()); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectIntoTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectIntoTest.java index d778822917..20d4ace7a5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectIntoTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectIntoTest.java @@ -55,12 +55,12 @@ public class PGSelectIntoTest extends PGTest { Assert.assertEquals(result,"SELECT *" // + "\nINTO films_recent" // + "\nFROM films" // - + "\nWHERE date_prod >= '2002-01-01'"); + + "\nWHERE date_prod >= '2002-01-01';"); String result_lcase = SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals(result_lcase,"select *" // + "\ninto films_recent" // + "\nfrom films" // - + "\nwhere date_prod >= '2002-01-01'"); + + "\nwhere date_prod >= '2002-01-01';"); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest18.java index 6dd30a617e..ed9f92f634 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest18.java @@ -51,7 +51,7 @@ public class PGSelectTest18 extends PGTest { + "\n\t)" + "\nSELECT n" + "\nFROM t" - + "\nLIMIT 100", result); + + "\nLIMIT 100;", result); } { String result = SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -66,7 +66,7 @@ public class PGSelectTest18 extends PGTest { + "\n\t)" + "\nselect n" + "\nfrom t" - + "\nlimit 100", result); + + "\nlimit 100;", result); } Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest49.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest49.java index ecb0162dd5..e6cc07aca3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest49.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest49.java @@ -46,7 +46,7 @@ public class PGSelectTest49 extends TestCase { "UPDATE goods_detail\n" + "SET gd_number = gd_number - gdnumber\n" + "FROM sel\n" + - "WHERE gd_id = gdid", SQLUtils.toPGString(stmt)); + "WHERE gd_id = gdid;", SQLUtils.toPGString(stmt)); assertEquals("with\n" + "\tsel\n" + @@ -57,7 +57,7 @@ public class PGSelectTest49 extends TestCase { "update goods_detail\n" + "set gd_number = gd_number - gdnumber\n" + "from sel\n" + - "where gd_id = gdid", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + "where gd_id = gdid;", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_10.java index 50544b627d..3074391478 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_10.java @@ -45,7 +45,7 @@ public class SQLServerAlterTableTest_10 extends TestCase { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE dbo.doc_exc" - + "\n\tADD (column_b VARCHAR(20) NULL CONSTRAINT exb_unique UNIQUE)", output); + + "\n\tADD (column_b VARCHAR(20) NULL CONSTRAINT exb_unique UNIQUE);", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_11.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_11.java index ad1f409301..a185de19f2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_11.java @@ -46,12 +46,12 @@ public class SQLServerAlterTableTest_11 extends TestCase { { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE dbo.doc_exd" // - + "\n\tWITH NOCHECK ADD CONSTRAINT exd_check CHECK (column_a > 1)", output); + + "\n\tWITH NOCHECK ADD CONSTRAINT exd_check CHECK (column_a > 1);", output); } { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table dbo.doc_exd" // - + "\n\twith nocheck add constraint exd_check check (column_a > 1)", output); + + "\n\twith nocheck add constraint exd_check check (column_a > 1);", output); } Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_7.java index 9441fb8cfe..ceb3a2cdff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_7.java @@ -44,7 +44,7 @@ public class SQLServerAlterTableTest_7 extends TestCase { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE dbo.doc_exa"// - + "\n\tADD (column_b VARCHAR(20) NULL)", output); + + "\n\tADD (column_b VARCHAR(20) NULL);", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_8.java index 5a6b515fc3..67264a77ba 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_8.java @@ -44,7 +44,7 @@ public class SQLServerAlterTableTest_8 extends TestCase { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE dbo.doc_exb"// - + "\n\tDROP COLUMN column_b", output); + + "\n\tDROP COLUMN column_b;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_9.java index 14c8faf1d4..afadfa832c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_9.java @@ -44,7 +44,7 @@ public class SQLServerAlterTableTest_9 extends TestCase { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE dbo.doc_exy"// - + "\n\tALTER COLUMN column_a DECIMAL(5, 2)", output); + + "\n\tALTER COLUMN column_a DECIMAL(5, 2);", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_2.java index 8d2999bf7c..93822c6f3d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_2.java @@ -41,7 +41,7 @@ public class SQLServerCreateIndexTest_2 extends TestCase { Assert.assertEquals(1, statementList.size()); - Assert.assertEquals("CREATE UNIQUE CLUSTERED INDEX Idx1 ON t1 (c)", // + Assert.assertEquals("CREATE UNIQUE CLUSTERED INDEX Idx1 ON t1 (c);", // SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_3.java index 0c720dac4e..35599b715c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_3.java @@ -43,7 +43,7 @@ public class SQLServerCreateIndexTest_3 extends TestCase { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE NONCLUSTERED INDEX IX_SalesPerson_SalesQuota_SalesYTD" // - + " ON Sales.SalesPerson (SalesQuota, SalesYTD)", // + + " ON Sales.SalesPerson (SalesQuota, SalesYTD);", // SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateTableTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateTableTest_2.java index 7a1ccbc7f0..bb5ca5f656 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateTableTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateTableTest_2.java @@ -46,7 +46,7 @@ public class SQLServerCreateTableTest_2 extends TestCase { + "\n\tC1 nvarchar(10),"// + "\n\tC2 nvarchar(50),"// + "\n\tC3 datetime"// - + "\n)", output); + + "\n);", output); SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDeclareTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDeclareTest.java index 29eb22219a..e8c5c8b0ba 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDeclareTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDeclareTest.java @@ -43,7 +43,7 @@ public class SQLServerDeclareTest extends TestCase { String text = SQLUtils.toSQLString(stmtList, JdbcUtils.SQL_SERVER); - Assert.assertEquals("DECLARE @Group nvarchar(50), @Sales money = 1", text); + Assert.assertEquals("DECLARE @Group nvarchar(50), @Sales money = 1;", text); } public void test_2() { @@ -74,7 +74,7 @@ public class SQLServerDeclareTest extends TestCase { + "\n\tOldVacationHours int,"// + "\n\tNewVacationHours int,"// + "\n\tModifiedDate datetime"// - + "\n)"; + + "\n);"; Assert.assertEquals(expected, text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropIndex_Test_2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropIndex_Test_2.java index cfd16dec08..3b1fba5988 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropIndex_Test_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropIndex_Test_2.java @@ -43,7 +43,7 @@ public class SQLServerDropIndex_Test_2 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); - Assert.assertEquals("DROP INDEX IX_ProductVendor_VendorID ON Purchasing.ProductVendor", output); + Assert.assertEquals("DROP INDEX IX_ProductVendor_VendorID ON Purchasing.ProductVendor;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest.java index 4d209f3fd2..72be63c5c3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest.java @@ -29,7 +29,7 @@ public class SQLServerInsertTest extends TestCase { "VALUES ( CONVERT(Point, '12.3:46.2') );"; String expect = "INSERT INTO Cities (Location)" + // - "\nVALUES (CONVERT(Point, '12.3:46.2'))"; + "\nVALUES (CONVERT(Point, '12.3:46.2'));"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest1.java index af9bf8ddc8..31e88677bf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest1.java @@ -29,7 +29,7 @@ public class SQLServerInsertTest1 extends TestCase { "VALUES ( dbo.CreateNewPoint(x, y) );"; String expect = "INSERT INTO Cities (Location)" + // - "\nVALUES (dbo.CreateNewPoint(x, y))"; + "\nVALUES (dbo.CreateNewPoint(x, y));"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest3.java index 5c56553738..cf66a3691c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest3.java @@ -29,7 +29,7 @@ public class SQLServerInsertTest3 extends TestCase { "VALUES (N'F2', N'Square Feet', GETDATE());;"; String expect = "INSERT INTO Production.UnitMeasure" + // - "\nVALUES (N'F2', N'Square Feet', GETDATE())"; + "\nVALUES (N'F2', N'Square Feet', GETDATE());"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest5.java index 0907d15549..d921c40f44 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest5.java @@ -77,7 +77,7 @@ public class SQLServerInsertTest5 extends TestCase { + "\nVALUES ('a1', 'b1'),"// + "\n('a2', 'b2'),"// + "\n('a3', 'b3'),"// - + "\n('a4', 'b4')"; + + "\n('a4', 'b4');"; Assert.assertEquals(formatSql, SQLUtils.toSQLServerString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest8.java index 1b286575a6..48bc228c67 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest8.java @@ -51,7 +51,7 @@ public class SQLServerInsertTest8 extends TestCase { String formatSql = "INSERT INTO Production.ScrapReason"// + "\nOUTPUT INSERTED.ScrapReasonID, INSERTED.Name, INSERTED.ModifiedDate"// + "\n\tINTO @MyTableVar"// - + "\nVALUES (N'Operator error', GETDATE())"; + + "\nVALUES (N'Operator error', GETDATE());"; Assert.assertEquals(formatSql, SQLUtils.toSQLServerString(insertStmt)); } @@ -79,7 +79,7 @@ public class SQLServerInsertTest8 extends TestCase { + "\nFROM Sales.SalesPerson sp"// + "\nINNER JOIN Person.Person c ON sp.BusinessEntityID = c.BusinessEntityID"// + "\nWHERE sp.SalesYTD > 250000.00"// - + "\nORDER BY sp.SalesYTD DESC"; + + "\nORDER BY sp.SalesYTD DESC;"; Assert.assertEquals(formatSql, SQLUtils.toSQLServerString(insertStmt)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest.java index 9f088f9ca8..c939c05bc7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest.java @@ -41,7 +41,7 @@ public class SQLServerRowNumberTest extends TestCase { + "\n\tINNER JOIN Person.Contact c ON s.SalesPersonID = c.ContactID" + "\n\tINNER JOIN Person.Address a ON a.AddressID = c.ContactID" // + "\nWHERE TerritoryID IS NOT NULL" // - + "\n\tAND SalesYTD <> 0"; + + "\n\tAND SalesYTD <> 0;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest.java index 39d39b50d5..473d1d57db 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest.java @@ -27,7 +27,7 @@ public class SQLServerSelectTest extends TestCase { public void test_isEmpty() throws Exception { String sql = "USE AdventureWorks2008R2;"; - String expect = "USE AdventureWorks2008R2"; + String expect = "USE AdventureWorks2008R2;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest1.java index 8bc1ad46d4..3932faaf93 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest1.java @@ -28,7 +28,7 @@ public class SQLServerSelectTest1 extends TestCase { public void test_isEmpty() throws Exception { String sql = "USE AdventureWorks2008R2;"; - String expect = "USE AdventureWorks2008R2"; + String expect = "USE AdventureWorks2008R2;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest10.java index f50b4ce4ed..ba5e31d9e7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest10.java @@ -42,7 +42,7 @@ public class SQLServerSelectTest10 extends TestCase { "\n\tJOIN HumanResources.Employee e ON e.ContactID = c.ContactID" + // "\n\tJOIN HumanResources.EmployeeAddress ea ON ea.EmployeeID = e.EmployeeID" + // "\n\tJOIN Person.Address a ON a.AddressID = ea.AddressID" + // - "\n\tJOIN Person.StateProvince sp ON sp.StateProvinceID = a.StateProvinceID"; + "\n\tJOIN Person.StateProvince sp ON sp.StateProvinceID = a.StateProvinceID;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest19.java index 84956e8e65..914bb4dfcf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest19.java @@ -38,7 +38,7 @@ public class SQLServerSelectTest19 extends TestCase { + "\n\tJOIN Person.PersonPhone pph ON p.BusinessEntityID = pph.BusinessEntityID" + "\nWHERE LastName LIKE 'G%'" + "\nORDER BY LastName, FirstName" - + "\nFOR XML , TYPE, XMLSCHEMA, ELEMENTS XSINIL"; + + "\nFOR XML , TYPE, XMLSCHEMA, ELEMENTS XSINIL;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest20.java index 31b7087e80..ac4ef38428 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest20.java @@ -31,14 +31,14 @@ public class SQLServerSelectTest20 extends TestCase { String expect = "SELECT First_Name + ' ' + Last AS Name" // + "\nFROM Employees" // + "\nORDER BY First_Name" // - + "\nOFFSET 10 ROWS"; + + "\nOFFSET 10 ROWS;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); String text = TestUtils.outputSqlServer(stmt); - Assert.assertEquals(expect, text); + assertEquals(expect, text); // System.out.println(text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest21.java index ab5134055b..798f87c0c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest21.java @@ -37,7 +37,7 @@ public class SQLServerSelectTest21 extends TestCase { Assert.assertEquals("SELECT First_Name + ' ' + Last AS Name" // + "\nFROM Employees" // + "\nORDER BY First_Name" // - + "\nOFFSET 10 ROWS FETCH NEXT 5 ROWS ONLY", text); + + "\nOFFSET 10 ROWS FETCH NEXT 5 ROWS ONLY;", text); } { String text = SQLUtils.toSQLServerString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -45,7 +45,7 @@ public class SQLServerSelectTest21 extends TestCase { Assert.assertEquals("select First_Name + ' ' + Last as Name" // + "\nfrom Employees" // + "\norder by First_Name" // - + "\noffset 10 rows fetch next 5 rows only", text); + + "\noffset 10 rows fetch next 5 rows only;", text); } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest6.java index c27f541310..6925b50d00 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest6.java @@ -48,7 +48,7 @@ public class SQLServerSelectTest6 extends TestCase { "\n\t)" + "\nSELECT ManagerID, DirectReports" + "\nFROM DirReps" + - "\nORDER BY ManagerID"; + "\nORDER BY ManagerID;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest8.java index be7ad9c982..8afe366dbe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest8.java @@ -29,7 +29,7 @@ public class SQLServerSelectTest8 extends TestCase { String sql = "SELECT Location.Distance (@p)" + " FROM Cities;"; String expect = "SELECT Location.Distance(@p)" + // - "\nFROM Cities"; + "\nFROM Cities;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest9.java index da505e6343..f79c3c49ed 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest9.java @@ -30,7 +30,7 @@ public class SQLServerSelectTest9 extends TestCase { "FROM Sales.SalesOrderDetail;"; String expect = "SELECT AVG(UnitPrice) AS 'Average Price'" + // - "\nFROM Sales.SalesOrderDetail"; + "\nFROM Sales.SalesOrderDetail;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerStartTransactionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerStartTransactionTest.java index 3d5d8994f5..2a4b6e234f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerStartTransactionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerStartTransactionTest.java @@ -30,6 +30,6 @@ public class SQLServerStartTransactionTest extends TestCase { SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); - assertEquals("BEGIN TRANSACTION T1", SQLUtils.toSQLServerString(stmt)); + assertEquals("BEGIN TRANSACTION T1;", SQLUtils.toSQLServerString(stmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest1.java index 4d0e6242ff..16af17a9a7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest1.java @@ -35,7 +35,7 @@ public class SQLServerUpdateTest1 extends TestCase { String expect = "UPDATE dbo.Table2" + // "\nSET dbo.Table2.ColB = dbo.Table2.ColB + dbo.Table1.ColB" + // "\nFROM dbo.Table2" + // - "\n\tINNER JOIN dbo.Table1 ON dbo.Table2.ColA = dbo.Table1.ColA"; + "\n\tINNER JOIN dbo.Table1 ON dbo.Table2.ColA = dbo.Table1.ColA;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest2.java index 15f7c3f925..e9ef29a233 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest2.java @@ -32,7 +32,7 @@ public class SQLServerUpdateTest2 extends TestCase { String expect = "UPDATE Cities" + // "\nSET Location = CONVERT(Point, '12.3:46.2')" + // - "\nWHERE Name = 'Anchorage'"; + "\nWHERE Name = 'Anchorage';"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest3.java index 7331538fc5..f36fa88fdd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest3.java @@ -48,7 +48,7 @@ public class SQLServerUpdateTest3 extends TestCase { "\n\t\t)" + "\n\t\tAND Sales.SalesPerson.SalesPersonID = so.SalesPersonID" + "\n\tGROUP BY so.SalesPersonID" + - "\n)"; + "\n);"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest4.java index 2919c7b88c..aa7e219b77 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest4.java @@ -30,7 +30,7 @@ public class SQLServerUpdateTest4 extends TestCase { "SET VacationHours = VacationHours * 1.25 ;"; String expect = "UPDATE TOP (10) HumanResources.Employee" + - "\nSET VacationHours = VacationHours * 1.25"; + "\nSET VacationHours = VacationHours * 1.25;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest5.java index 94d8ed87be..1839f28132 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest5.java @@ -31,7 +31,7 @@ public class SQLServerUpdateTest5 extends TestCase { String expect = "UPDATE TOP (10) HumanResources.Employee" + "\nSET VacationHours = VacationHours * 1.25, ModifiedDate = GETDATE()" + "\nOUTPUT inserted.BusinessEntityID, deleted.VacationHours, inserted.VacationHours, inserted.ModifiedDate" - + "\n\tINTO @MyTableVar"; + + "\n\tINTO @MyTableVar;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerWaitForTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerWaitForTest.java index 429f521b73..5991316936 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerWaitForTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerWaitForTest.java @@ -38,7 +38,7 @@ public class SQLServerWaitForTest extends TestCase { String text = SQLUtils.toSQLString(stmtList, JdbcUtils.SQL_SERVER); - Assert.assertEquals("WAITFOR TIME '22:20'", text); + Assert.assertEquals("WAITFOR TIME '22:20';", text); } public void test_1() { @@ -51,7 +51,7 @@ public class SQLServerWaitForTest extends TestCase { String text = SQLUtils.toSQLString(stmtList, JdbcUtils.SQL_SERVER); - Assert.assertEquals("WAITFOR DELAY '02:00'", text); + Assert.assertEquals("WAITFOR DELAY '02:00';", text); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/grants/SQLServerGrantTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/grants/SQLServerGrantTest_1.java index fb78a2eefd..771d9c5363 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/grants/SQLServerGrantTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/grants/SQLServerGrantTest_1.java @@ -28,7 +28,7 @@ public class SQLServerGrantTest_1 extends TestCase { System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); - Assert.assertEquals("GRANT CONTROL ON USER::Wanida TO RolandX", output); + Assert.assertEquals("GRANT CONTROL ON USER::Wanida TO RolandX;", output); Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/grants/SQLServerGrantTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/grants/SQLServerGrantTest_2.java index d8e6d0c5f7..05c5eb493b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/grants/SQLServerGrantTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/grants/SQLServerGrantTest_2.java @@ -28,7 +28,7 @@ public class SQLServerGrantTest_2 extends TestCase { System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); - Assert.assertEquals("GRANT IMPERSONATE ON USER::HamithaL TO AccountsPayable17", output); + Assert.assertEquals("GRANT IMPERSONATE ON USER::HamithaL TO AccountsPayable17;", output); Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size());