improved odps sql parser.

src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsExprParser.java

@@ -36,7 +36,8 @@ public class OdpsExprParser extends SQLExprParser {
             "MIN", //
             "STDDEV", //
             "SUM", //
-            "ROW_NUMBER"//
+            "ROW_NUMBER",
+            "WM_CONCAT"//
                                                      };
 
     public OdpsExprParser(Lexer lexer){

src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java

@@ -770,6 +770,12 @@ public class SQLExprParser extends SQLParser {
         }
 
         if (expr instanceof SQLName || expr instanceof SQLDefaultExpr || expr instanceof SQLCharExpr) {
+            boolean distinct = false;
+            if (lexer.token() == Token.DISTINCT) {
+                lexer.nextToken();
+                distinct = true;
+            }
+
             String methodName;
 
             SQLMethodInvokeExpr methodInvokeExpr;
@@ -784,6 +790,9 @@ public class SQLExprParser extends SQLParser {
 
             if (isAggreateFunction(methodName)) {
                 SQLAggregateExpr aggregateExpr = parseAggregateExpr(methodName);
+                if (distinct) {
+                    aggregateExpr.setOption(SQLAggregateOption.DISTINCT);
+                }
 
                 return aggregateExpr;
             }

src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest.java

@@ -0,0 +1,56 @@
+/*
+ * 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.odps;
+
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
+import com.alibaba.druid.util.JdbcConstants;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+import java.util.List;
+
+public class OdpsAlterTableChangeColumnTest extends TestCase {
+
+    public void test_select() throws Exception {
+        String sql = "ALTER TABLE adl_smeta_indi_rule_relation_sdt CHANGE COLUMN indi_level COMMENT 'xxxx';";//
+        Assert.assertEquals("ALTER TABLE adl_smeta_indi_rule_relation_sdt\n" +
+                "\tCHANGE COLUMN indi_level COMMENT 'xxxx';", SQLUtils.formatOdps(sql));
+        Assert.assertEquals("alter table adl_smeta_indi_rule_relation_sdt\n" +
+                "\tchange column indi_level comment 'xxxx';", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION));
+        
+        List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS);
+        SQLStatement stmt = statementList.get(0);
+
+        Assert.assertEquals(1, statementList.size());
+        
+        SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS);
+        stmt.accept(visitor);
+        
+//        System.out.println("Tables : " + visitor.getTables());
+//      System.out.println("fields : " + visitor.getColumns());
+//      System.out.println("coditions : " + visitor.getConditions());
+//      System.out.println("orderBy : " + visitor.getOrderByColumns());
+        
+        Assert.assertEquals(1, visitor.getTables().size());
+        Assert.assertEquals(1, visitor.getColumns().size());
+        Assert.assertEquals(0, visitor.getConditions().size());
+        
+//        Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name")));
+    }
+    
+}

src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest19.java

@@ -0,0 +1,69 @@
+/*
+ * 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.odps;
+
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
+import com.alibaba.druid.util.JdbcConstants;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+import java.util.List;
+
+public class OdpsSelectTest19 extends TestCase {
+
+    public void test_select() throws Exception {
+        byte[] bytes = new byte[8];
+        putLong(bytes, 0, 1095288847322L);
+        // 1095288847322
+        String sql = "select wm_concat(distinct ',', name) from mytable";//
+        Assert.assertEquals("SELECT WM_CONCAT(DISTINCT ',', name)\n" +
+                "FROM mytable", SQLUtils.formatOdps(sql));
+        Assert.assertEquals("select wm_concat(DISTINCT ',', name)\n" +
+                "from mytable", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION));
+        
+        List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS);
+        SQLStatement stmt = statementList.get(0);
+
+        Assert.assertEquals(1, statementList.size());
+        
+        SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS);
+        stmt.accept(visitor);
+        
+//        System.out.println("Tables : " + visitor.getTables());
+//      System.out.println("fields : " + visitor.getColumns());
+//      System.out.println("coditions : " + visitor.getConditions());
+//      System.out.println("orderBy : " + visitor.getOrderByColumns());
+        
+        Assert.assertEquals(1, visitor.getTables().size());
+        Assert.assertEquals(1, visitor.getColumns().size());
+        Assert.assertEquals(0, visitor.getConditions().size());
+        
+//        Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name")));
+    }
+
+    static void putLong(byte[] b, int off, long val) {
+        b[off + 7] = (byte) (val       );
+        b[off + 6] = (byte) (val >>>  8);
+        b[off + 5] = (byte) (val >>> 16);
+        b[off + 4] = (byte) (val >>> 24);
+        b[off + 3] = (byte) (val >>> 32);
+        b[off + 2] = (byte) (val >>> 40);
+        b[off + 1] = (byte) (val >>> 48);
+        b[off    ] = (byte) (val >>> 56);
+    }
+}