Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/AlibabaTech/druid

Browse Source 
Conflicts:
	src/main/java/com/alibaba/druid/sql/ast/expr/SQLHexExpr.java
	src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
	src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java
	src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java
	src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
	src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java
	src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java
This commit is contained in:
温少
2012-05-15 17:17:49 +08:00
parent cd36f31b77 fc222e6172
commit d821cc5a02
3 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
+3
View File
@@ -52,8 +52,11 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlReplicateStatement
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlResetStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlRollbackStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
<<<<<<< HEAD
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetCharSetStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetNamesStatement;
=======
>>>>>>> fc222e6172fe4786fb2c68d21d9ef79937042e92
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetTransactionIsolationLevelStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowColumnsStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowDatabasesStatement;
src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java
-1
View File
@@ -476,5 +476,4 @@ public class MySqlASTVisitorAdapter extends SQLASTVisitorAdapter implements
public void endVisit(MySqlSetCharSetStatement x) {
}
}
src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java
+49
View File
@@ -9,8 +9,11 @@ import junit.framework.TestCase;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.statement.SQLSetStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlDescribeStatement;
<<<<<<< HEAD
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetCharSetStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetNamesStatement;
=======
>>>>>>> fc222e6172fe4786fb2c68d21d9ef79937042e92
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetTransactionIsolationLevelStatement;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.parser.Token;
@@ -120,6 +123,7 @@ public class DALParserTest extends TestCase {
Assert.assertEquals("SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE", output);
}
<<<<<<< HEAD
public void test_setNames() throws Exception {
String sql = "SET names default ";
MySqlStatementParser parser = new MySqlStatementParser(sql);
@@ -165,6 +169,51 @@ public class DALParserTest extends TestCase {
Assert.assertEquals("SET CHARACTER SET DEFAULT", output);
}
=======
// public void testSet() throws Exception {
//
//
// sql = "SET names default ";
// lexer = new SQLLexer(sql);
// parser = new DALParser(lexer, new SQLExprParser(lexer));
// set = (DALSetNamesStatement) parser.set();
// parser.match(Token.EOF);
// output = output2MySQL(set, sql);
// Assert.assertEquals("SET NAMES DEFAULT", output);
//
// sql = "SET NAMEs 'utf8' collatE \"latin1_danish_ci\" ";
// lexer = new SQLLexer(sql);
// parser = new DALParser(lexer, new SQLExprParser(lexer));
// set = (DALSetNamesStatement) parser.set();
// parser.match(Token.EOF);
// output = output2MySQL(set, sql);
// Assert.assertEquals("SET NAMES utf8 COLLATE latin1_danish_ci", output);
//
// sql = "SET NAMEs utf8 ";
// lexer = new SQLLexer(sql);
// parser = new DALParser(lexer, new SQLExprParser(lexer));
// set = (DALSetNamesStatement) parser.set();
// parser.match(Token.EOF);
// output = output2MySQL(set, sql);
// Assert.assertEquals("SET NAMES utf8", output);
//
// sql = "SET CHARACTEr SEt 'utf8' ";
// lexer = new SQLLexer(sql);
// parser = new DALParser(lexer, new SQLExprParser(lexer));
// set = (DALSetCharacterSetStatement) parser.set();
// parser.match(Token.EOF);
// output = output2MySQL(set, sql);
// Assert.assertEquals("SET CHARACTER SET utf8", output);
//
// sql = "SET CHARACTEr SEt DEFaULT ";
// lexer = new SQLLexer(sql);
// parser = new DALParser(lexer, new SQLExprParser(lexer));
// set = (DALSetCharacterSetStatement) parser.set();
// parser.match(Token.EOF);
// output = output2MySQL(set, sql);
// Assert.assertEquals("SET CHARACTER SET DEFAULT", output);
// }
>>>>>>> fc222e6172fe4786fb2c68d21d9ef79937042e92
//
// public void testShow() throws Exception {
// String sql = "shoW authors ";