Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

bug fix for WallFilter setLimit, fix #2649

Browse Source
This commit is contained in:
高铁
2021-02-17 18:09:05 +08:00
parent 6e6c809671
commit 7fed345f0a
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/wall/WallProvider.java
+14 -1
View File
@@ -34,6 +34,7 @@ import com.alibaba.druid.DbType;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlHintStatement;
import com.alibaba.druid.sql.parser.Lexer;
@@ -708,7 +709,19 @@ public abstract class WallProvider {
}
} else {
if ((!updateCheckHandlerEnable) && sql.length() < MAX_SQL_LENGTH) {
sqlStat = addWhiteSql(sql, tableStat, context.getFunctionStats(), syntaxError);
boolean selectLimit = false;
if (config.getSelectLimit() > 0) {
for (SQLStatement stmt : statementList) {
if (stmt instanceof SQLSelectStatement) {
selectLimit = true;
break;
}
}
}
if (!selectLimit) {
sqlStat = addWhiteSql(sql, tableStat, context.getFunctionStats(), syntaxError);
}
}
}
src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest_2.java
+21 -1
View File
@@ -15,7 +15,6 @@
*/
package com.alibaba.druid.bvt.filter.wall;
import com.alibaba.druid.DbType;
import com.alibaba.druid.sql.PagerUtils;
import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.wall.WallCheckResult;
@@ -42,6 +41,27 @@ public class WallSelectLimitTest_2 extends TestCase {
"LIMIT 10", resultSql);
}
public void testMySql_0() throws Exception {
String sql = "select * from t";
WallProvider provider = new MySqlWallProvider(config);
{
WallCheckResult checkResult = provider.check(sql);
String resultSql = checkResult.getSql();
System.out.println(resultSql);
assertEquals("SELECT *\n" +
"FROM t\n" +
"LIMIT 1000", resultSql);
}
{
WallCheckResult checkResult = provider.check(sql);
String resultSql = checkResult.getSql();
System.out.println(resultSql);
assertEquals("SELECT *\n" +
"FROM t\n" +
"LIMIT 1000", resultSql);
}
}
public void testPG() throws Exception {
String sql = "select * from t limit 10";
WallProvider provider = new PGWallProvider(config);