From a3701c61b8c0f089dcb7218e9c7bbdd162bebcc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= <szujobs@hotmail.com>
Date: Wed, 16 May 2012 09:01:12 +0800
Subject: [PATCH] refactor

---
 .../druid/sql/dialect/mysql/parser/MySqlLexer.java        | 2 --
 .../sql/dialect/mysql/parser/MySqlStatementParser.java    | 8 ++++----
 .../druid/sql/dialect/postgresql/parser/PGLexer.java      | 1 -
 .../java/com/alibaba/druid/sql/parser/SQLExprParser.java  | 2 --
 .../com/alibaba/druid/sql/parser/SQLStatementParser.java  | 2 +-
 src/main/java/com/alibaba/druid/sql/parser/Token.java     | 1 -
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java
index 07359146ac..c04a8b013a 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java
@@ -102,7 +102,6 @@ public class MySqlLexer extends Lexer {
         map.put("SOME", Token.SOME);
         map.put("ANY", Token.ANY);
         map.put("TRUNCATE", Token.TRUNCATE);
-        map.put("USER", Token.USER);
         map.put("IF", Token.IF);
 
         map.put("TRUE", Token.TRUE);
@@ -110,7 +109,6 @@ public class MySqlLexer extends Lexer {
         map.put("LIMIT", Token.LIMIT);
         map.put("KILL", Token.KILL);
         map.put("IDENTIFIED", Token.IDENTIFIED);
-        map.put("PASSWORD", Token.PASSWORD);
         map.put("DUAL", Token.DUAL);
 
         DEFAULT_MYSQL_KEYWORDS = new Keywords(map);
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 20817b6718..1c2af478a3 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
@@ -192,7 +192,7 @@ public class MySqlStatementParser extends SQLStatementParser {
             return parser.parseCrateTable(false);
         }
 
-        if (lexer.token() == Token.USER) {
+        if (identifierEquals("USER")) {
             return parseCreateUser();
         }
 
@@ -200,7 +200,7 @@ public class MySqlStatementParser extends SQLStatementParser {
     }
 
     public SQLStatement parseCreateUser() throws ParserException {
-        accept(Token.USER);
+        acceptIdentifier("USER");
 
         MySqlCreateUserStatement stmt = new MySqlCreateUserStatement();
 
@@ -222,7 +222,7 @@ public class MySqlStatementParser extends SQLStatementParser {
                 if (lexer.token() == Token.BY) {
                     lexer.nextToken();
 
-                    if (lexer.token() == Token.PASSWORD) {
+                    if (identifierEquals("PASSWORD")) {
                         lexer.nextToken();
                     }
 
@@ -1264,7 +1264,7 @@ public class MySqlStatementParser extends SQLStatementParser {
     }
 
     public SQLStatement parseDropUser() throws ParserException {
-        accept(Token.USER);
+        acceptIdentifier("USER");
 
         MySqlDropUser stmt = new MySqlDropUser();
         for (;;) {
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java
index 480a8aa2fd..a887161803 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java
@@ -82,7 +82,6 @@ public class PGLexer extends Lexer {
         map.put("SOME", Token.SOME);
         map.put("ANY", Token.ANY);
         map.put("TRUNCATE", Token.TRUNCATE);
-        map.put("USER", Token.USER);
 
         map.put("LIMIT", Token.LIMIT);
         map.put("OFFSET", Token.OFFSET);
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 6a7f8678bb..6bc50bcc42 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
@@ -211,8 +211,6 @@ public class SQLExprParser extends SQLParser {
                 sqlExpr = new SQLDefaultExpr();
                 lexer.nextToken();
                 break;
-            case USER:
-            case PASSWORD:
             case DUAL:
             case KEY:
             case DISTINCT:
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 2c15ce5c60..87eae1d6f9 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java
@@ -121,7 +121,7 @@ public class SQLStatementParser extends SQLParser {
 
                     statementList.add(stmt);
                     continue;
-                } else if (lexer.token() == Token.USER) {
+                } else if (identifierEquals("USER")) {
                     SQLStatement stmt = parseDropUser();
                     statementList.add(stmt);
                     continue;
diff --git a/src/main/java/com/alibaba/druid/sql/parser/Token.java b/src/main/java/com/alibaba/druid/sql/parser/Token.java
index b46f204cd8..b2d3bc520a 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/Token.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/Token.java
@@ -67,7 +67,6 @@ public enum Token {
     ON("ON"), 
     SCHEMA("SCHEMA"), 
     CAST("CAST"),
-    USER("USER"),
     COLUMN("COLUMN"),
     USE("USE"),