提交 c427908d authored 作者: Thomas Mueller's avatar Thomas Mueller

--no commit message

--no commit message
上级 64a622bf
...@@ -277,10 +277,6 @@ public class Select extends Query { ...@@ -277,10 +277,6 @@ public class Select extends Query {
Value[] row = new Value[columnCount]; Value[] row = new Value[columnCount];
for (int i = 0; i < columnCount; i++) { for (int i = 0; i < columnCount; i++) {
Expression expr = (Expression) expressions.get(i); Expression expr = (Expression) expressions.get(i);
int testing;
if(expr == null) {
System.out.println("stop");
}
row[i] = expr.getValue(session); row[i] = expr.getValue(session);
} }
result.addRow(row); result.addRow(row);
......
...@@ -682,9 +682,12 @@ public class Function extends Expression implements FunctionCall { ...@@ -682,9 +682,12 @@ public class Function extends Expression implements FunctionCall {
return ValueTimestamp.getNoCopy(dateadd(v0.getString(), v1.getInt(), v2.getTimestampNoCopy())); return ValueTimestamp.getNoCopy(dateadd(v0.getString(), v1.getInt(), v2.getTimestampNoCopy()));
case DATEDIFF: case DATEDIFF:
return ValueLong.get(datediff(v0.getString(), v1.getTimestampNoCopy(), v2.getTimestampNoCopy())); return ValueLong.get(datediff(v0.getString(), v1.getTimestampNoCopy(), v2.getTimestampNoCopy()));
case DAYNAME: case DAYNAME: {
Value result;
synchronized(FORMAT_DAYNAME) { synchronized(FORMAT_DAYNAME) {
return ValueString.get(FORMAT_DAYNAME.format(v0.getDateNoCopy())); result = ValueString.get(FORMAT_DAYNAME.format(v0.getDateNoCopy()));
}
return result;
} }
case DAYOFMONTH: case DAYOFMONTH:
return ValueInt.get(getDatePart(v0.getTimestampNoCopy(), Calendar.DAY_OF_MONTH)); return ValueInt.get(getDatePart(v0.getTimestampNoCopy(), Calendar.DAY_OF_MONTH));
...@@ -698,9 +701,12 @@ public class Function extends Expression implements FunctionCall { ...@@ -698,9 +701,12 @@ public class Function extends Expression implements FunctionCall {
return ValueInt.get(getDatePart(v0.getTimestampNoCopy(), Calendar.MINUTE)); return ValueInt.get(getDatePart(v0.getTimestampNoCopy(), Calendar.MINUTE));
case MONTH: case MONTH:
return ValueInt.get(getDatePart(v0.getTimestampNoCopy(), Calendar.MONTH)); return ValueInt.get(getDatePart(v0.getTimestampNoCopy(), Calendar.MONTH));
case MONTHNAME: case MONTHNAME: {
Value v;
synchronized(FORMAT_MONTHNAME) { synchronized(FORMAT_MONTHNAME) {
return ValueString.get(FORMAT_MONTHNAME.format(v0.getDateNoCopy())); v = ValueString.get(FORMAT_MONTHNAME.format(v0.getDateNoCopy()));
}
return v;
} }
case QUARTER: case QUARTER:
return ValueInt.get((getDatePart(v0.getTimestamp(), Calendar.MONTH) - 1) / 3 + 1); return ValueInt.get((getDatePart(v0.getTimestamp(), Calendar.MONTH) - 1) / 3 + 1);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论