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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
kiki
2013-08-29 14:37:09 +08:00
parent 6243809d39 d179a8752e
commit ad672ae950
9 changed files with 159 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java
+14 -13
View File
@@ -345,19 +345,20 @@ public class MySqlLexer extends Lexer {
putChar(ch);
break;
}
} else {
if (ch == '\'') {
scanChar();
if (ch != '\'') {
token = LITERAL_CHARS;
break;
} else {
initBuff(bufPos);
arraycopy(mark + 1, buf, 0, bufPos);
hasSpecial = true;
putChar('\'');
continue;
}
continue;
}
if (ch == '\'') {
scanChar();
if (ch != '\'') {
token = LITERAL_CHARS;
break;
} else {
initBuff(bufPos);
arraycopy(mark + 1, buf, 0, bufPos);
hasSpecial = true;
putChar('\'');
continue;
}
}
src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java
+6 -4
View File
@@ -1117,9 +1117,7 @@ public class SQLEvalVisitorUtils {
return true;
}
if ("0".equals(val) || "false".equalsIgnoreCase((String) val)) {
return false;
}
return false;
}
throw new IllegalArgumentException(val.getClass() + " not supported.");
@@ -1378,7 +1376,11 @@ public class SQLEvalVisitorUtils {
if (decimalB.scale() < decimalA.scale()) {
decimalB = decimalB.setScale(decimalA.scale());
}
return decimalA.divide(decimalB, BigDecimal.ROUND_HALF_UP);
try {
return decimalA.divide(decimalB);
} catch (ArithmeticException ex) {
return decimalA.divide(decimalB, BigDecimal.ROUND_HALF_UP);
}
}
if (a instanceof Double || b instanceof Double) {
src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
+4 -4
View File
@@ -228,11 +228,11 @@ public class WallVisitorUtils {
Object whereValue = getConditionValue(visitor, where, visitor.getConfig().isSelectWhereAlwayTrueCheck());
if (queryBlockFromIsNull(visitor, x, false) && whereValue != null) {
addViolation(visitor, ErrorCode.EMPTY_QUERY_HAS_CONDITION, "empty select has condition", x);
}
if (Boolean.TRUE == whereValue) {
if (queryBlockFromIsNull(visitor, x, false)) {
addViolation(visitor, ErrorCode.EMPTY_QUERY_HAS_CONDITION, "empty select has condition", x);
}
boolean isSimpleConstExpr = false;
SQLExpr first = getFirst(where);