Merge remote-tracking branch 'upstream/master'

This commit is contained in:
kiki
2013-06-03 14:19:34 +08:00
20 changed files with 3882 additions and 3730 deletions
@@ -36,6 +36,9 @@ public class SQLCastExpr extends SQLExprImpl {
}
public void setExpr(SQLExpr expr) {
if (expr != null) {
expr.setParent(this);
}
this.expr = expr;
}
@@ -796,6 +796,10 @@ public class SQLEvalVisitorUtils {
if (wallConditionContext != null) {
wallConditionContext.setConstArithmetic(true);
}
if (leftValue == null || rightValue == null) {
return false;
}
Object value = null;
switch (x.getOperator()) {
@@ -33,7 +33,7 @@ public class Concat implements Function {
Object itemValue = item.getAttributes().get(EVAL_VALUE);
if (itemValue == null) {
continue;
return null;
}
buf.append(itemValue.toString());
}