From 47c76252472ac84097219876cb1dfeba3c4f85ec Mon Sep 17 00:00:00 2001
From: yakolee <yakolyh@gmail.com>
Date: Fri, 30 May 2014 16:38:39 +0800
Subject: [PATCH] bug fix

---
 .../dialect/mysql/parser/MySqlExprParser.java |  2 +-
 .../mysql/visitor/MySqlOutputVisitor.java     |  5 ---
 .../druid/sql/parser/SQLExprParser.java       | 10 ------
 .../java/com/alibaba/druid/DruidTest.java     | 36 -------------------
 4 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 src/test/java/com/alibaba/druid/DruidTest.java

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
index 3e03284208..c9d334b2d5 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
@@ -250,7 +250,7 @@ public class MySqlExprParser extends SQLExprParser {
 
                     return primaryRest(expr);
                 }
-            } else if ("COLLATE".equalsIgnoreCase(lexer.stringVal()) && !(expr instanceof SQLIdentifierExpr)) {
+            } else if ("COLLATE".equalsIgnoreCase(lexer.stringVal())) {
                 lexer.nextToken();
 
                 if (lexer.token() == Token.EQ) {
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 f18724700c..3fc53a8b7c 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
@@ -384,11 +384,6 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
             print(" CHARACTER SET ");
             print(x.getCharSetName());
         }
-        if (x.getCollate() != null) {
-            print(" COLLATE ");
-            print(x.getCollate());
-        }
-        
         if (x.getCollate() != null) {
             print(" COLLATE ");
             print(x.getCollate());
diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
index e0be2fb7b7..602162851c 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
@@ -1371,17 +1371,7 @@ public class SQLExprParser extends SQLParser {
                 charType.setCollate(lexer.stringVal());
                 lexer.nextToken();
             }
-        }else if(identifierEquals("COLLATE")){
-            lexer.nextToken();
-            
-            if (lexer.token() != Token.IDENTIFIER) {
-                throw new ParserException();
-            }
-            
-            charType.setCollate(lexer.stringVal());
-            lexer.nextToken();
         }
-        
         return charType;
     }
 
diff --git a/src/test/java/com/alibaba/druid/DruidTest.java b/src/test/java/com/alibaba/druid/DruidTest.java
deleted file mode 100644
index 13ae9d095c..0000000000
--- a/src/test/java/com/alibaba/druid/DruidTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 1999-2011 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;
-
-import junit.framework.TestCase;
-
-import com.alibaba.druid.pool.DruidDataSource;
-
-public class DruidTest extends TestCase {
-
-    public void test_0() throws Exception {
-        DruidDataSource ds = new DruidDataSource();
-        ds.setMaxWait(30);
-        ds.setInitialSize(0);
-        ds.setUrl("jdbc:mysql:xxx");
-
-        try {
-            ds.getConnection();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-}