Skip to content

H
h2database
提交 6b6db5e3 authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov
浏览文件
操作

Reorganize conditions in Operation.optimize()

上级 6ad9d310
显示空白字符变更
内嵌 并排
正在显示 包含 65 行增加 和 40 行删除
h2/src/main/org/h2/expression/Operation.java
浏览文件 @ 6b6db5e3
......@@ -219,7 +219,8 @@ public class Operation extends Expression {
} else if (l == Value.DATE || l == Value.TIMESTAMP ||
l == Value.TIME || r == Value.DATE ||
r == Value.TIMESTAMP || r == Value.TIME) {
if (opType == OpType.PLUS) {
switch (opType) {
case PLUS:
if (r != Value.getHigherOrder(l, r)) {
// order left and right: INT < TIME < DATE < TIMESTAMP
swap();
......@@ -227,7 +228,8 @@ public class Operation extends Expression {
l = r;
r = t;
}
if (l == Value.INT) {
switch (l) {
case Value.INT: {
// Oracle date add
Function f = Function.getFunction(session.getDatabase(), "DATEADD");
f.setParameter(0, ValueExpression.get(ValueString.get("DAY")));
......@@ -235,7 +237,10 @@ public class Operation extends Expression {
f.setParameter(2, right);
f.doneWithParameters();
return f.optimize(session);
} else if (l == Value.DECIMAL || l == Value.FLOAT || l == Value.DOUBLE) {
}
case Value.DECIMAL:
case Value.FLOAT:
case Value.DOUBLE: {
// Oracle date add
Function f = Function.getFunction(session.getDatabase(), "DATEADD");
f.setParameter(0, ValueExpression.get(ValueString.get("SECOND")));
......@@ -245,15 +250,23 @@ public class Operation extends Expression {
f.setParameter(2, right);
f.doneWithParameters();
return f.optimize(session);
} else if (l == Value.TIME && r == Value.TIME) {
}
case Value.TIME:
if (r == Value.TIME) {
dataType = Value.TIME;
return this;
} else if (l == Value.TIME) {
} else {
dataType = Value.TIMESTAMP;
return this;
}
} else if (opType == OpType.MINUS) {
if ((l == Value.DATE || l == Value.TIMESTAMP) && r == Value.INT) {
}
break;
case MINUS:
switch (l) {
case Value.DATE:
case Value.TIMESTAMP:
switch (r) {
case Value.INT: {
// Oracle date subtract
Function f = Function.getFunction(session.getDatabase(), "DATEADD");
f.setParameter(0, ValueExpression.get(ValueString.get("DAY")));
......@@ -263,8 +276,10 @@ public class Operation extends Expression {
f.setParameter(2, left);
f.doneWithParameters();
return f.optimize(session);
} else if ((l == Value.DATE || l == Value.TIMESTAMP) &&
(r == Value.DECIMAL || r == Value.FLOAT || r == Value.DOUBLE)) {
}
case Value.DECIMAL:
case Value.FLOAT:
case Value.DOUBLE: {
// Oracle date subtract
Function f = Function.getFunction(session.getDatabase(), "DATEADD");
f.setParameter(0, ValueExpression.get(ValueString.get("SECOND")));
......@@ -276,11 +291,12 @@ public class Operation extends Expression {
f.setParameter(2, left);
f.doneWithParameters();
return f.optimize(session);
} else if (l == Value.DATE || l == Value.TIMESTAMP) {
if (r == Value.TIME) {
}
case Value.TIME:
dataType = Value.TIMESTAMP;
return this;
} else if (r == Value.DATE || r == Value.TIMESTAMP) {
case Value.DATE:
case Value.TIMESTAMP: {
// Oracle date subtract
Function f = Function.getFunction(session.getDatabase(), "DATEDIFF");
f.setParameter(0, ValueExpression.get(ValueString.get("DAY")));
......@@ -289,11 +305,17 @@ public class Operation extends Expression {
f.doneWithParameters();
return f.optimize(session);
}
} else if (l == Value.TIME && r == Value.TIME) {
}
break;
case Value.TIME:
if (r == Value.TIME) {
dataType = Value.TIME;
return this;
}
} else if (opType == OpType.MULTIPLY) {
break;
}
break;
case MULTIPLY:
if (l == Value.TIME) {
dataType = Value.TIME;
convertRight = false;
......@@ -304,12 +326,15 @@ public class Operation extends Expression {
convertRight = false;
return this;
}
} else if (opType == OpType.DIVIDE) {
break;
case DIVIDE:
if (l == Value.TIME) {
dataType = Value.TIME;
convertRight = false;
return this;
}
break;
default:
}
throw DbException.getUnsupportedException(
DataType.getDataType(l).name + " " +
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论