Merge pull request #657 from yakolee/master

improve sqlwall & parser

src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest_hint.java

@@ -110,4 +110,22 @@ public class MySqlWallTest_hint extends TestCase {
                      + ") /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */ ";
         Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); //
     }
+    
+    public void test_true_10() throws Exception {
+        WallConfig config = new WallConfig();
+        config.setHintAllow(true);
+        config.setMultiStatementAllow(true);
+        config.setNoneBaseStatementAllow(true);
+        String sql = "CREATE DATABASE `newsfocus` /*!40100 COLLATE 'big5_chinese_ci' */ ";
+        Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); //
+    }
+
+    public void test_true_11() throws Exception {
+        WallConfig config = new WallConfig();
+        config.setHintAllow(true);
+        config.setMultiStatementAllow(true);
+        config.setNoneBaseStatementAllow(true);
+        String sql = "EXPLAIN /*!40100 EXTENDED */ SELECT * FROM trade_order_header WHERE id = ?";
+        Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); //
+    }
 }

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

@@ -0,0 +1,120 @@
+/*
+ * 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.sqlserver;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser;
+import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor;
+import com.alibaba.druid.util.JdbcUtils;
+
+public class SQLServerSetTest extends TestCase {
+
+    public void test_0() {
+        String sql = "SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED";
+
+        SQLServerStatementParser parser = new SQLServerStatementParser(sql);
+        List<SQLStatement> stmtList = parser.parseStatementList();
+        SQLStatement stmt = stmtList.get(0);
+
+        Assert.assertEquals(1, stmtList.size());
+
+        SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor();
+        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());
+
+        String text = SQLUtils.toSQLString(stmtList, JdbcUtils.SQL_SERVER);
+
+        Assert.assertEquals("SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED", text);
+    }
+
+    public void test_1() {
+        String sql = "SET FMTONLY ON";
+
+        SQLServerStatementParser parser = new SQLServerStatementParser(sql);
+        List<SQLStatement> stmtList = parser.parseStatementList();
+        SQLStatement stmt = stmtList.get(0);
+
+        Assert.assertEquals(1, stmtList.size());
+
+        SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor();
+        stmt.accept(visitor);
+
+        Assert.assertEquals(0, visitor.getTables().size());
+        Assert.assertEquals(0, visitor.getColumns().size());
+        Assert.assertEquals(0, visitor.getConditions().size());
+
+        String text = SQLUtils.toSQLString(stmtList, JdbcUtils.SQL_SERVER);
+
+        Assert.assertEquals("SET FMTONLY ON", text);
+    }
+
+    public void test_2() {
+        String sql = "SET STATISTICS XML OFF";
+
+        SQLServerStatementParser parser = new SQLServerStatementParser(sql);
+        List<SQLStatement> stmtList = parser.parseStatementList();
+        SQLStatement stmt = stmtList.get(0);
+
+        Assert.assertEquals(1, stmtList.size());
+
+        SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor();
+        stmt.accept(visitor);
+
+        Assert.assertEquals(0, visitor.getTables().size());
+        Assert.assertEquals(0, visitor.getColumns().size());
+        Assert.assertEquals(0, visitor.getConditions().size());
+
+        String text = SQLUtils.toSQLString(stmtList, JdbcUtils.SQL_SERVER);
+
+        Assert.assertEquals("SET STATISTICS XML OFF", text);
+    }
+
+    public void test_3() {
+        String sql = "SET @state = N'Oregon'";
+
+        SQLServerStatementParser parser = new SQLServerStatementParser(sql);
+        List<SQLStatement> stmtList = parser.parseStatementList();
+        SQLStatement stmt = stmtList.get(0);
+
+        Assert.assertEquals(1, stmtList.size());
+
+        SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor();
+        stmt.accept(visitor);
+
+        Assert.assertEquals(0, visitor.getTables().size());
+        Assert.assertEquals(0, visitor.getColumns().size());
+        Assert.assertEquals(0, visitor.getConditions().size());
+
+        String text = SQLUtils.toSQLString(stmtList, JdbcUtils.SQL_SERVER);
+
+        Assert.assertEquals("SET @state = N'Oregon'", text);
+    }
+}