Merge branch 'master' of https://github.com/wenshao/druid

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java

@@ -446,6 +446,19 @@ public class MySqlExprParser extends SQLExprParser {
 
                 expr = methodInvokeExpr;
 
+                return primaryRest(expr);
+            } else if ("POSITION".equalsIgnoreCase(ident)) {
+                accept(Token.LPAREN);
+                SQLExpr subStr = this.primary();
+                accept(Token.IN);
+                SQLExpr str = this.expr();
+                accept(Token.RPAREN);
+                
+                SQLMethodInvokeExpr locate = new SQLMethodInvokeExpr("LOCATE");
+                locate.getParameters().add(subStr);
+                locate.getParameters().add(str);
+                
+                expr = locate;
                 return primaryRest(expr);
             }
         }

src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_POSITION.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 1999-2011 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.mysql;
+
+import java.util.List;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.sql.MysqlTest;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.statement.SQLSelect;
+import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
+import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+
+public class MySqlSelectTest_POSITION extends MysqlTest {
+
+    public void test_0() throws Exception {
+        String sql = "select a.rule_id, " + //
+                     "b.object_id, " + //
+                     "a.user_nick, " + //
+                     "SUBSTRING(b.content, POSITION('bizOrderId' IN b.content), 30) as dingdanhao, " + //
+                     "SUBSTRING(b.content, POSITION('loginIn7Days' IN b.content), 88) as shengdajieguo, " + //
+                     "a.action_time " + //
+                     "from ctu_scheme_0025 a, " + //
+                     "ctu_scheme_detail_0025 b";
+
+        MySqlStatementParser parser = new MySqlStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement stmt = statementList.get(0);
+
+        SQLSelectStatement selectStmt = (SQLSelectStatement) stmt;
+
+        SQLSelect select = selectStmt.getSelect();
+        Assert.assertNotNull(select.getQuery());
+        MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) select.getQuery();
+        Assert.assertNull(queryBlock.getOrderBy());
+
+        print(statementList);
+
+        Assert.assertEquals(1, statementList.size());
+
+        MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
+        stmt.accept(visitor);
+
+        Assert.assertEquals(2, visitor.getTables().size());
+        Assert.assertEquals(5, visitor.getColumns().size());
+        Assert.assertEquals(0, visitor.getConditions().size());
+        Assert.assertEquals(0, visitor.getOrderByColumns().size());
+
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("ctu_scheme_0025")));
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("ctu_scheme_detail_0025")));
+    }
+}