From 87d6258ba923c1ddc1ac6befee9579ae3cbbdd81 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Mon, 26 Sep 2011 12:02:23 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=BF=90=E7=AE=97=E4=BC=98?=
 =?UTF-8?q?=E5=85=88=E7=BA=A7=E5=88=AB=E9=97=AE=E9=A2=98?=
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@908 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 .../druid/sql/parser/SQLExprParser.java       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

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 baa7d50474..7b26204b26 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
@@ -673,7 +673,7 @@ public class SQLExprParser extends SQLParser {
     }
 
     public final SQLExpr equality() throws ParserException {
-        SQLExpr expr = additive();
+        SQLExpr expr = bitOr();
         return equalityRest(expr);
     }
 
@@ -681,14 +681,14 @@ public class SQLExprParser extends SQLParser {
         SQLExpr rightExp;
         if (lexer.token() == Token.EQ) {
             lexer.nextToken();
-            rightExp = additive();
+            rightExp = bitOr();
 
             rightExp = equalityRest(rightExp);
 
             expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Equality, rightExp);
         } else if (lexer.token() == Token.BANGEQ) {
             lexer.nextToken();
-            rightExp = additive();
+            rightExp = bitOr();
 
             rightExp = equalityRest(rightExp);
 
@@ -834,63 +834,63 @@ public class SQLExprParser extends SQLParser {
 
         if (lexer.token() == Token.LT) {
             lexer.nextToken();
-            rightExp = equality();
+            rightExp = bitOr();
 
             rightExp = relationalRest(rightExp);
 
             expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.LessThan, rightExp);
         } else if (lexer.token() == Token.LTEQ) {
             lexer.nextToken();
-            rightExp = shift();
+            rightExp = bitOr();
 
             rightExp = relationalRest(rightExp);
 
             expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.LessThanOrEqual, rightExp);
         } else if (lexer.token() == Token.LTEQGT) {
             lexer.nextToken();
-            rightExp = shift();
+            rightExp = bitOr();
 
             rightExp = relationalRest(rightExp);
 
             expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.LessThanOrEqualOrGreaterThan, rightExp);
         } else if (lexer.token() == Token.GT) {
             lexer.nextToken();
-            rightExp = shift();
+            rightExp = bitOr();
 
             rightExp = relationalRest(rightExp);
 
             expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.GreaterThan, rightExp);
         } else if (lexer.token() == Token.GTEQ) {
             lexer.nextToken();
-            rightExp = shift();
+            rightExp = bitOr();
 
             rightExp = relationalRest(rightExp);
 
             expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.GreaterThanOrEqual, rightExp);
         } else if (lexer.token() == Token.BANGLT) {
             lexer.nextToken();
-            rightExp = shift();
+            rightExp = bitOr();
 
             rightExp = relationalRest(rightExp);
 
             expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.NotLessThan, rightExp);
         } else if (lexer.token() == Token.BANGGT) {
             lexer.nextToken();
-            rightExp = shift();
+            rightExp = bitOr();
 
             rightExp = relationalRest(rightExp);
 
             expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.NotGreaterThan, rightExp);
         } else if (lexer.token() == Token.LTGT) {
             lexer.nextToken();
-            rightExp = shift();
+            rightExp = bitOr();
 
             rightExp = relationalRest(rightExp);
 
             expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.LessThanOrGreater, rightExp);
         } else if (lexer.token() == Token.LIKE) {
             lexer.nextToken();
-            rightExp = shift();
+            rightExp = bitOr();
 
             rightExp = relationalRest(rightExp);
 
@@ -931,7 +931,7 @@ public class SQLExprParser extends SQLParser {
     public SQLExpr notRationalRest(SQLExpr expr) {
         if (lexer.token() == (Token.LIKE)) {
             lexer.nextToken();
-            SQLExpr rightExp = shift();
+            SQLExpr rightExp = equality();
 
             rightExp = relationalRest(rightExp);