From 5126b4df2cc72b5d8772f3f538fca45050f4dcc4 Mon Sep 17 00:00:00 2001 From: wenshao Date: Thu, 29 Aug 2013 15:40:50 +0800 Subject: [PATCH] improve sql wall --- .../sql/dialect/mysql/parser/MySqlLexer.java | 11 ++- .../com/alibaba/druid/sql/parser/Lexer.java | 2 +- .../bvt/filter/wall/MySqlWallTest71.java | 2 +- .../bvt/sql/mysql/MySqlSelectTest_15.java | 68 +++++++++++++++++++ 4 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_15.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java index 39939fac41..35316c3e6a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java @@ -384,8 +384,15 @@ public class MySqlLexer extends Lexer { public void scanComment() { Token lastToken = this.token; - - if (ch != '/' && ch != '-') { + + if (ch == '-') { + char next_2 = charAt(pos + 2); + if (isDigit(next_2)) { + scanChar(); + token = Token.SUB; + return; + } + } else if (ch != '/') { throw new IllegalStateException(); } diff --git a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java index 2d2ae4b53d..16f05be6c9 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java @@ -173,7 +173,7 @@ public class Lexer { protected final void scanChar() { ch = charAt(++pos); } - + protected void unscan() { ch = charAt(--pos); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest71.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest71.java index 8a8c1b9700..13dd058802 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest71.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest71.java @@ -36,7 +36,7 @@ public class MySqlWallTest71 extends TestCase { provider.getConfig().setCommentAllow(true); - Assert.assertFalse(provider.checkValid(// + Assert.assertTrue(provider.checkValid(// "update order_return set return_goods_money =0.00 ,return_other_money = 8--149.00, return_total_fee = ifnull(return_shipping,0)+ifnull(return_other_discount,0)+0.00--149.00-0.00,return_goods_amount=1,return_real_money=0.00 where id=1319")); Assert.assertEquals(1, provider.getTableStats().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_15.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_15.java new file mode 100644 index 0000000000..77806455d0 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_15.java @@ -0,0 +1,68 @@ +/* + * 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.mysql; + +import java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.statement.SQLSelect; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; + +public class MySqlSelectTest_15 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "SELECT 1--1 from t where id = 1"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + + SQLSelectStatement selectStmt = (SQLSelectStatement) stmt; + + SQLSelect select = selectStmt.getSelect(); + Assert.assertNotNull(select.getQuery()); + MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) select.getQuery(); + Assert.assertNull(queryBlock.getOrderBy()); + + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(1, visitor.getColumns().size()); + Assert.assertEquals(1, visitor.getConditions().size()); + Assert.assertEquals(0, visitor.getOrderByColumns().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t"))); + + String output = SQLUtils.toMySqlString(stmt); + Assert.assertEquals("SELECT 1 - -1" // + + "\nFROM t" // + + "\nWHERE id = 1", // + output); + } +}