From a4db6594fe55f0ac1908e3b1a67c8c2ad2989bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E9=93=81?= <shaojin.wensj@alibaba-inc.com>
Date: Tue, 4 May 2021 13:59:29 +0800
Subject: [PATCH] improved oracle parser, fix #4253

---
 src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java | 2 --
 src/test/resources/bvt/parser/oracle-63.txt                   | 3 ---
 2 files changed, 5 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 92a3a6b2d3..2e89932a20 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
@@ -2048,8 +2048,6 @@ public class SQLExprParser extends SQLParser {
                 case SHOW:
                 case FOR:
                 case LEAVE:
-                case MODE:
-                case NOWAIT:
                     identName = lexer.stringVal();
                     lexer.nextToken();
                     break;
diff --git a/src/test/resources/bvt/parser/oracle-63.txt b/src/test/resources/bvt/parser/oracle-63.txt
index 8b6b543d8f..aa9c0679e1 100644
--- a/src/test/resources/bvt/parser/oracle-63.txt
+++ b/src/test/resources/bvt/parser/oracle-63.txt
@@ -124,8 +124,6 @@ INITRANS 1
 MAXTRANS 255
 NOCOMPRESS
 LOGGING
-<<<<<<< HEAD
-=======
 TABLESPACE USERS
 ---------------------------
 CREATE TABLE CLOUDCANAL.BB (
@@ -254,5 +252,4 @@ INITRANS 1
 MAXTRANS 255
 NOCOMPRESS
 LOGGING
->>>>>>> improved oracle parser, fix #4253
 TABLESPACE USERS
\ No newline at end of file