improved sql parser. bug fixed for oracle extract function. issue #1481

src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_oracle.java

@@ -1,10 +1,10 @@
 package com.alibaba.druid.bvt.sql;
 
+import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
 import junit.framework.TestCase;
 
 import org.junit.Assert;
 
-import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExtractExpr;
 import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser;
 
 public class EqualTest_extract_oracle extends TestCase {
@@ -12,18 +12,18 @@ public class EqualTest_extract_oracle extends TestCase {
     public void test_exits() throws Exception {
         String sql = "EXTRACT(MONTH FROM x)";
         String sql_c = "EXTRACT(MONTH FROM 7)";
-        OracleExtractExpr exprA, exprB, exprC;
+        SQLMethodInvokeExpr exprA, exprB, exprC;
         {
             OracleExprParser parser = new OracleExprParser(sql);
-            exprA = (OracleExtractExpr) parser.expr();
+            exprA = (SQLMethodInvokeExpr) parser.expr();
         }
         {
             OracleExprParser parser = new OracleExprParser(sql);
-            exprB = (OracleExtractExpr) parser.expr();
+            exprB = (SQLMethodInvokeExpr) parser.expr();
         }
         {
             OracleExprParser parser = new OracleExprParser(sql_c);
-            exprC = (OracleExtractExpr) parser.expr();
+            exprC = (SQLMethodInvokeExpr) parser.expr();
         }
         Assert.assertEquals(exprA, exprB);
         Assert.assertNotEquals(exprA, exprC);
@@ -31,7 +31,7 @@ public class EqualTest_extract_oracle extends TestCase {
         Assert.assertFalse(exprA.equals(new Object()));
         Assert.assertEquals(exprA.hashCode(), exprB.hashCode());
         
-        Assert.assertEquals(new OracleExtractExpr(), new OracleExtractExpr());
-        Assert.assertEquals(new OracleExtractExpr().hashCode(), new OracleExtractExpr().hashCode());
+        Assert.assertEquals(new SQLMethodInvokeExpr(), new SQLMethodInvokeExpr());
+        Assert.assertEquals(new SQLMethodInvokeExpr().hashCode(), new SQLMethodInvokeExpr().hashCode());
     }
 }

src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest2.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 1999-2101 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.bvt.sql.oracle;
+
+import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
+import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
+import com.alibaba.druid.sql.test.TestUtils;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+public class OracleEXTRACTTest2 extends TestCase {
+
+    public void test_Extract() throws Exception {
+        String sql = "SELECT warehouse_name, EXTRACT(warehouse_spec, '/Warehouse/Docks')\n" +
+                "   \"Number of Docks\"\n" +
+                "   FROM warehouses\n" +
+                "   WHERE warehouse_spec IS NOT NULL;";
+
+        String expect = "SELECT warehouse_name, EXTRACT(warehouse_spec, '/Warehouse/Docks') AS \"Number of Docks\"\n" +
+                "FROM warehouses\n" +
+                "WHERE warehouse_spec IS NOT NULL;\n" +
+                "";
+
+        OracleStatementParser parser = new OracleStatementParser(sql);
+        SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0);
+
+        String text = TestUtils.outputOracle(stmt);
+
+        assertEquals(expect, text);
+    }
+}

src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleASTVisitorAdapterTest.java

@@ -37,7 +37,6 @@ import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleCursorExpr;
 import com.alibaba.druid.sql.ast.expr.SQLDateExpr;
 import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDatetimeExpr;
 import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDbLinkExpr;
-import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExtractExpr;
 import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr;
 import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIsSetExpr;
 import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleRangeExpr;
@@ -102,7 +101,6 @@ public class OracleASTVisitorAdapterTest extends TestCase {
         new OracleAnalyticWindowing().accept(adapter);
         new SQLDateExpr().accept(adapter);
         new OracleDbLinkExpr().accept(adapter);
-        new OracleExtractExpr().accept(adapter);
         new OracleSelectForUpdate().accept(adapter);
         new OracleSelectHierachicalQueryClause().accept(adapter);
         new OracleSelectPivot.Item().accept(adapter);

src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerStartTransactionTest.java

@@ -26,7 +26,7 @@ public class SQLServerStartTransactionTest extends TestCase {
 
     public void test_stmt() throws Exception {
         String sql = "BEGIN TRAN T1;";
-        
+
         SQLServerStatementParser parser = new SQLServerStatementParser(sql);
         SQLStatement stmt = parser.parseStatementList().get(0);