From 12cc948fdefe40027071941eb0bd6c6fb3bf880f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= <szujobs@hotmail.com>
Date: Tue, 15 May 2012 17:25:00 +0800
Subject: [PATCH] mysql parser

---
 .../mysql/parser/MySqlStatementParser.java    |  3 --
 .../druid/bvt/sql/cobar/DALParserTest.java    | 49 -------------------
 2 files changed, 52 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
index f41f4afd04..f163244818 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
@@ -52,11 +52,8 @@ 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;
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 f19d23b7ce..1a921c63a3 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
@@ -9,11 +9,8 @@ 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;
@@ -123,7 +120,6 @@ 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);
@@ -169,51 +165,6 @@ 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  ";