Merge pull request alibaba#643 from yakolee/master

improve sqlwall
qidouhai · Sep 5, 2014 · e6eddc5 · e6eddc5
2 parents dab8f15 + 959e525
commit e6eddc5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/...ain/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java b/...ain/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java
@@ -44,6 +44,8 @@ public class MySqlCreateTableStatement extends SQLCreateTableStatement implement
 
     private List<SQLCommentHint>   hints        = new ArrayList<SQLCommentHint>();
 
+    private List<SQLCommentHint>   optionHints  = new ArrayList<SQLCommentHint>();
+
     private SQLExprTableSource     like;
 
     public MySqlCreateTableStatement(){
@@ -156,4 +158,12 @@ public void accept0(MySqlASTVisitor visitor) {
         }
 
     }
+
+    public List<SQLCommentHint> getOptionHints() {
+        return optionHints;
+    }
+
+    public void setOptionHints(List<SQLCommentHint> optionHints) {
+        this.optionHints = optionHints;
+    }
 }
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java
@@ -559,7 +559,10 @@ public MySqlCreateTableStatement parseCrateTable(boolean acceptCreate) {
             SQLSelect query = new MySqlSelectParser(this.exprParser).select();
             stmt.setQuery(query);
         }
-
+
+        while (lexer.token() == (Token.HINT)) {
+            this.exprParser.parseHints(stmt.getOptionHints());
+        }
         return stmt;
     }
 

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
@@ -497,6 +497,10 @@ public boolean visit(MySqlCreateTableStatement x) {
             decrementIndent();
         }
 
+        for (SQLCommentHint hint : x.getOptionHints()) {
+            print(' ');
+            hint.accept(this);
+        }
         return false;
     }
 

diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest_hint.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest_hint.java
@@ -95,4 +95,19 @@ public void test_true_8() throws Exception {
         Assert.assertTrue(WallUtils.isValidateMySql(sql)); //
     }
 
+    public void test_true_9() throws Exception {
+        WallConfig config = new WallConfig();
+        config.setHintAllow(true);
+        config.setMultiStatementAllow(true);
+        String sql = "CREATE TABLE `session` ("//
+                     + " `sess_id` varchar(128) NOT NULL,"//
+                     + " `created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',"//
+                     + " `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',"//
+                     + " `ip` varchar(40) NOT NULL,"//
+                     + " `vars` mediumtext NOT NULL,"//
+                     + " PRIMARY KEY(`sess_id`),"//
+                     + " INDEX `changed_index` (`changed`)"//
+                     + ") /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */ ";
+        Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); //
+    }
 }