improved SchemaStatVisitor, support function condition

src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java

@@ -383,6 +383,7 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
             case GreaterThan:
             case GreaterThanOrEqual:
             case LessThan:
+            case LessThanOrGreater:
             case LessThanOrEqual:
             case LessThanOrEqualOrGreaterThan:
             case Like:
@@ -459,6 +460,14 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
         if (aliasMap == null) {
             return null;
         }
+        
+        if (expr instanceof SQLMethodInvokeExpr) {
+            SQLMethodInvokeExpr methodInvokeExp = (SQLMethodInvokeExpr) expr;
+            if (methodInvokeExp.getParameters().size() == 1) {
+                SQLExpr firstExpr = methodInvokeExp.getParameters().get(0);
+                return getColumn(firstExpr);
+            }
+        }
 
         if (expr instanceof SQLPropertyExpr) {
             SQLExpr owner = ((SQLPropertyExpr) expr).getOwner();

src/main/java/com/alibaba/druid/support/json/JSONWriter.java

@@ -15,6 +15,7 @@
  */
 package com.alibaba.druid.support.json;
 
+import com.alibaba.druid.sql.visitor.SQLEvalVisitor;
 import com.alibaba.druid.util.Utils;
 
 import javax.management.openmbean.CompositeData;
@@ -127,6 +128,11 @@ public class JSONWriter {
             writeMap((Map) o);
             return;
         }
+        
+        if (o == SQLEvalVisitor.EVAL_VALUE_NULL) {
+            write("null");
+            return;
+        }
 
         throw new IllegalArgumentException("not support type : " + o.getClass());
     }

src/main/java/com/alibaba/druid/support/opds/udf/ExportConditions.java

@@ -22,6 +22,7 @@ import com.alibaba.druid.sql.SQLUtils;
 import com.alibaba.druid.sql.ast.SQLStatement;
 import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
 import com.alibaba.druid.stat.TableStat;
+import com.alibaba.druid.stat.TableStat.Column;
 import com.alibaba.druid.stat.TableStat.Condition;
 import com.alibaba.druid.support.json.JSONUtils;
 import com.aliyun.odps.udf.UDF;
@@ -45,12 +46,13 @@ public class ExportConditions extends UDF {
             List<Condition> conditions = visitor.getConditions();
             for (int i = 0; i < conditions.size(); ++i) {
                 TableStat.Condition condition = conditions.get(i);
-                String column = condition.getColumn().toString();
+                Column column = condition.getColumn();
                 String operator = condition.getOperator();
                 List<Object> values = condition.getValues();
                 
                 List<Object> row = new ArrayList<Object>();
-                row.add(column);
+                row.add(column.getTable());
+                row.add(column.getName());
                 row.add(operator);
                 if (values.size() == 0) {
                     row.add(null);

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

@@ -50,7 +50,7 @@ public class MySqlUpdateTest_3 extends MysqlTest {
 
         Assert.assertEquals(1, visitor.getTables().size());
         Assert.assertEquals(5, visitor.getColumns().size());
-        Assert.assertEquals(1, visitor.getConditions().size());
+        Assert.assertEquals(3, visitor.getConditions().size());
 
         Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("scheme.table")));
 

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

@@ -67,7 +67,7 @@ public class OracleBlockTest5 extends OracleTest {
          Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("ipay_contract")));
 
         Assert.assertEquals(7, visitor.getColumns().size());
-        Assert.assertEquals(2, visitor.getConditions().size());
+        Assert.assertEquals(3, visitor.getConditions().size());
 
 //         Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("departments", "department_id")));
     }

src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest.java

@@ -11,6 +11,6 @@ public class ExportConditionsTest extends TestCase {
     
     public void test_export_conditions() throws Exception {
         String result = udf.evaluate("select * from t where id = 3 and name = 'chensheng'");
-        Assert.assertEquals("[[\"t.id\",\"=\",3],[\"t.name\",\"=\",\"chensheng\"]]", result);
+        Assert.assertEquals("[[\"t\",\"id\",\"=\",3],[\"t\",\"name\",\"=\",\"chensheng\"]]", result);
     }
 }

src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest2.java

@@ -0,0 +1,16 @@
+package com.alibaba.druid.bvt.support.odps.udf;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.support.opds.udf.ExportConditions;
+
+import junit.framework.TestCase;
+
+public class ExportConditionsTest2 extends TestCase {
+    ExportConditions udf = new ExportConditions();
+    
+    public void test_export_conditions() throws Exception {
+        String result = udf.evaluate("select * from t where proof_account is not null");
+        Assert.assertEquals("[[\"t\",\"proof_account\",\"IS NOT\",null]]", result);
+    }
+}

src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest3.java

@@ -0,0 +1,16 @@
+package com.alibaba.druid.bvt.support.odps.udf;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.support.opds.udf.ExportConditions;
+
+import junit.framework.TestCase;
+
+public class ExportConditionsTest3 extends TestCase {
+    ExportConditions udf = new ExportConditions();
+    
+    public void test_export_conditions() throws Exception {
+        String result = udf.evaluate("select * from t where trim(name) = 'abc'");
+        Assert.assertEquals("[[\"t\",\"name\",\"=\",\"abc\"]]", result);
+    }
+}

src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest4.java

@@ -0,0 +1,16 @@
+package com.alibaba.druid.bvt.support.odps.udf;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.support.opds.udf.ExportConditions;
+
+import junit.framework.TestCase;
+
+public class ExportConditionsTest4 extends TestCase {
+    ExportConditions udf = new ExportConditions();
+    
+    public void test_export_conditions() throws Exception {
+        String result = udf.evaluate("select * from t where trim(name) <> 'abc'");
+        Assert.assertEquals("[[\"t\",\"name\",\"<>\",\"abc\"]]", result);
+    }
+}