From b603e8ee568635ddc0790107f5b4e392df110df9 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Wed, 18 May 2011 15:30:22 +0000
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@127 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 src/main/java/com/alibaba/druid/sql/parser/Lexer.java      | 2 +-
 .../java/com/alibaba/druid/sql/parser/SQLExprParser.java   | 5 +----
 src/main/java/com/alibaba/druid/sql/parser/Token.java      | 7 ++-----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java
index be7131d363..eebbac05ff 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java
@@ -248,7 +248,7 @@ public class Lexer {
                     throw new SQLParseException("TODO"); // TODO
                 case '@':
                     scanVariable();
-                    token = Token.USR_VAR;
+                    token = Token.VARIANT;
                     return;
                 case '/':
                     scanComment();
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 45cc0f9823..0e09aec11e 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
@@ -179,13 +179,10 @@ public class SQLExprParser extends SQLParser {
                 sqlExpr = new SQLNCharExpr(lexer.stringVal());
                 lexer.nextToken();
                 break;
-            case USR_VAR:
+            case VARIANT:
                 sqlExpr = new SQLVariantRefExpr(lexer.stringVal());
                 lexer.nextToken();
                 break;
-            case SYS_VAR:
-                // QS_TODO add support for system var
-                break;
             case CASE:
                 SQLCaseExpr caseExpr = new SQLCaseExpr();
                 lexer.nextToken();
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 d6514cc928..fb7a2ba712 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/Token.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/Token.java
@@ -99,16 +99,13 @@ public enum Token {
     EOF, ERROR,
     IDENTIFIER,
     HINT,
-    // QS_TODO add support in Lexer
-    SYS_VAR, USR_VAR,
+    VARIANT,
     LITERAL_INT,
     LITERAL_FLOAT,
     LITERAL_HEX,
-    // QS_TODO add syntax support
-    LITERAL_BIT,
     LITERAL_CHARS,
     LITERAL_NCHARS,
-    // QS_TODO remove alias token
+    
     LITERAL_ALIAS,
     LINE_COMMENT,
     MULTI_LINE_COMMENT,