improve db2 sqlparser

src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2StatementImpl.java

@@ -0,0 +1,35 @@
+/*
+ * 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.sql.dialect.db2.ast;
+
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
+import com.alibaba.druid.sql.dialect.db2.visitor.DB2ASTVisitor;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public abstract class DB2StatementImpl extends SQLStatementImpl implements DB2Object {
+    @Override
+    protected void accept0(SQLASTVisitor visitor) {
+        if (visitor instanceof DB2ASTVisitor) {
+            accept0((DB2ASTVisitor) visitor);
+            return;
+        }
+
+        super.accept0(visitor);
+    }
+
+    @Override
+    public abstract void accept0(DB2ASTVisitor visitor);
+}

src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2ValuesStatement.java

@@ -0,0 +1,45 @@
+/*
+ * 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.sql.dialect.db2.ast.stmt;
+
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.dialect.db2.ast.DB2StatementImpl;
+import com.alibaba.druid.sql.dialect.db2.visitor.DB2ASTVisitor;
+
+public class DB2ValuesStatement extends DB2StatementImpl {
+
+    private SQLExpr expr;
+
+    @Override
+    public void accept0(DB2ASTVisitor visitor) {
+        if (visitor.visit(this)) {
+            acceptChild(visitor, expr);
+        }
+        visitor.endVisit(this);
+    }
+
+    public SQLExpr getExpr() {
+        return expr;
+    }
+
+    public void setExpr(SQLExpr expr) {
+        if (expr != null) {
+            expr.setParent(this);
+        }
+        this.expr = expr;
+    }
+
+}

src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParser.java

@@ -15,8 +15,13 @@
  */
 package com.alibaba.druid.sql.dialect.db2.parser;
 
+import java.util.List;
+
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2ValuesStatement;
 import com.alibaba.druid.sql.parser.Lexer;
 import com.alibaba.druid.sql.parser.SQLStatementParser;
+import com.alibaba.druid.sql.parser.Token;
 
 
 public class DB2StatementParser extends SQLStatementParser {
@@ -31,4 +36,16 @@ public class DB2StatementParser extends SQLStatementParser {
     public DB2SelectParser createSQLSelectParser() {
         return new DB2SelectParser(this.exprParser);
     }
+    
+    public boolean parseStatementListDialect(List<SQLStatement> statementList) {
+        if (lexer.token() == Token.VALUES) {
+            lexer.nextToken();
+            DB2ValuesStatement stmt = new DB2ValuesStatement();
+            stmt.setExpr(this.exprParser.expr());
+            statementList.add(stmt);
+            return true;
+        }
+        
+        return false;
+    }
 }

src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ASTVisitor.java

@@ -16,6 +16,7 @@
 package com.alibaba.druid.sql.dialect.db2.visitor;
 
 import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock;
+import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2ValuesStatement;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public interface DB2ASTVisitor extends SQLASTVisitor {
@@ -23,4 +24,8 @@ public interface DB2ASTVisitor extends SQLASTVisitor {
     boolean visit(DB2SelectQueryBlock x);
 
     void endVisit(DB2SelectQueryBlock x);
+    
+    boolean visit(DB2ValuesStatement x);
+    
+    void endVisit(DB2ValuesStatement x);
 }

src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ASTVisitorAdapter.java

@@ -16,6 +16,7 @@
 package com.alibaba.druid.sql.dialect.db2.visitor;
 
 import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock;
+import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2ValuesStatement;
 import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter;
 
 public class DB2ASTVisitorAdapter extends SQLASTVisitorAdapter implements DB2ASTVisitor {
@@ -29,5 +30,15 @@ public class DB2ASTVisitorAdapter extends SQLASTVisitorAdapter implements DB2AST
     public void endVisit(DB2SelectQueryBlock x) {
 
     }
+    
+    @Override
+    public boolean visit(DB2ValuesStatement x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(DB2ValuesStatement x) {
+        
+    }
 
 }

src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java

@@ -17,6 +17,7 @@ package com.alibaba.druid.sql.dialect.db2.visitor;
 
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock;
+import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2ValuesStatement;
 import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
 
 public class DB2OutputVisitor extends SQLASTOutputVisitor implements DB2ASTVisitor {
@@ -28,31 +29,31 @@ public class DB2OutputVisitor extends SQLASTOutputVisitor implements DB2ASTVisit
     @Override
     public boolean visit(DB2SelectQueryBlock x) {
         this.visit((SQLSelectQueryBlock) x);
-        
+
         if (x.getFirst() != null) {
             println();
             print("FETCH FIRST ");
             x.getFirst().accept(this);
             print(" ROWS ONLY");
         }
-        
+
         if (x.isForReadOnly()) {
             println();
             print("FOR READ ONLY");
         }
-        
+
         if (x.getIsolation() != null) {
             println();
             print("WITH ");
             print(x.getIsolation().name());
         }
-        
+
         if (x.getOptimizeFor() != null) {
             println();
             print("OPTIMIZE FOR ");
             x.getOptimizeFor().accept(this);
         }
-        
+
         return false;
     }
 
@@ -60,4 +61,16 @@ public class DB2OutputVisitor extends SQLASTOutputVisitor implements DB2ASTVisit
     public void endVisit(DB2SelectQueryBlock x) {
 
     }
+
+    @Override
+    public boolean visit(DB2ValuesStatement x) {
+        print("VALUES ");
+        x.getExpr().accept(this);
+        return false;
+    }
+
+    @Override
+    public void endVisit(DB2ValuesStatement x) {
+
+    }
 }

src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2SchemaStatVisitor.java

@@ -17,6 +17,7 @@ package com.alibaba.druid.sql.dialect.db2.visitor;
 
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock;
+import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2ValuesStatement;
 import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -37,4 +38,13 @@ public class DB2SchemaStatVisitor extends SchemaStatVisitor implements DB2ASTVis
         
     }
 
+    @Override
+    public boolean visit(DB2ValuesStatement x) {
+        return false;
+    }
+    
+    @Override
+    public void endVisit(DB2ValuesStatement x) {
+        
+    }
 }

src/test/java/com/alibaba/druid/bvt/sql/db2/DB2Values_Test.java

@@ -0,0 +1,65 @@
+/*
+ * 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.db2;
+
+import java.util.List;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.sql.DB2Test;
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser;
+import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+import com.alibaba.druid.stat.TableStat.Column;
+import com.alibaba.druid.util.JdbcConstants;
+
+public class DB2Values_Test extends DB2Test {
+
+    public void test_0() throws Exception {
+        String sql = "values 1";
+
+        DB2StatementParser parser = new DB2StatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement stmt = statementList.get(0);
+        print(statementList);
+
+        Assert.assertEquals(1, statementList.size());
+
+        DB2SchemaStatVisitor visitor = new DB2SchemaStatVisitor();
+        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(0, visitor.getTables().size());
+        Assert.assertEquals(0, visitor.getColumns().size());
+        Assert.assertEquals(0, visitor.getConditions().size());
+
+//        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t")));
+
+//        Assert.assertTrue(visitor.getColumns().contains(new Column("t", "*")));
+        // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name")));
+        // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name")));
+
+        String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2);
+        Assert.assertEquals("VALUES 1", //
+                            output);
+    }
+}