Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
54efc692
提交
54efc692
authored
10 年前
作者:
noelgrandin@gmail.com
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow DATEADD to take a long value for count when manipulating milliseconds.
上级
a021f586
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
17 行增加
和
4 行删除
+17
-4
help.csv
h2/src/docsrc/help/help.csv
+3
-1
changelog.html
h2/src/docsrc/html/changelog.html
+1
-0
Function.java
h2/src/main/org/h2/expression/Function.java
+13
-3
没有找到文件。
h2/src/docsrc/help/help.csv
浏览文件 @
54efc692
...
...
@@ -3427,10 +3427,12 @@ CURRENT_TIMESTAMP()
"
"Functions (Time and Date)","DATEADD","
{ DATEADD| TIMESTAMPADD } (unitString, addInt, timestamp)
{ DATEADD| TIMESTAMPADD } (unitString, addInt
Long
, timestamp)
","
Adds units to a timestamp. The string indicates the unit.
Use negative values to subtract units.
addIntLong may be a long value when manipulating milliseconds,
otherwise it's range is restricted to int.
The same units as in the EXTRACT function are supported.
This method returns a timestamp.
","
...
...
This diff is collapsed.
Click to expand it.
h2/src/docsrc/html/changelog.html
浏览文件 @
54efc692
...
...
@@ -32,6 +32,7 @@ Change Log
Please note it is strongly recommended to avoid calling Thread.interrupt;
this is a problem for various libraries, including Apache Lucene.
</li><li>
MVStore: use RandomAccessFile file system if the file name starts with "file:".
</li><li>
Allow DATEADD to take a long value for count when manipulating milliseconds.
</li></ul>
<h2>
Version 1.4.186 Beta (2015-03-02)
</h2>
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/expression/Function.java
浏览文件 @
54efc692
...
...
@@ -1413,7 +1413,7 @@ public class Function extends Expression implements FunctionCall {
break
;
case
DATE_ADD:
result
=
ValueTimestamp
.
get
(
dateadd
(
v0
.
getString
(),
v1
.
get
Int
(),
v2
.
getTimestamp
()));
v0
.
getString
(),
v1
.
get
Long
(),
v2
.
getTimestamp
()));
break
;
case
DATE_DIFF:
result
=
ValueLong
.
get
(
datediff
(
...
...
@@ -1696,12 +1696,22 @@ public class Function extends Expression implements FunctionCall {
return
p
.
intValue
();
}
private
static
Timestamp
dateadd
(
String
part
,
int
count
,
Timestamp
d
)
{
private
static
Timestamp
dateadd
(
String
part
,
long
count
,
Timestamp
d
)
{
int
field
=
getDatePart
(
part
);
if
(
field
==
Calendar
.
MILLISECOND
)
{
Timestamp
ts
=
new
Timestamp
(
d
.
getTime
()
+
count
);
ts
.
setNanos
(
ts
.
getNanos
()
+
(
d
.
getNanos
()
%
1000000
));
return
ts
;
}
// We allow long for manipulating the millisecond component,
// for the rest we only allow int.
if
(
count
>
Integer
.
MAX_VALUE
)
{
throw
DbException
.
getInvalidValueException
(
"DATEADD count"
,
count
);
}
Calendar
calendar
=
Calendar
.
getInstance
();
int
nanos
=
d
.
getNanos
()
%
1000000
;
calendar
.
setTime
(
d
);
calendar
.
add
(
field
,
count
);
calendar
.
add
(
field
,
(
int
)
count
);
long
t
=
calendar
.
getTime
().
getTime
();
Timestamp
ts
=
new
Timestamp
(
t
);
ts
.
setNanos
(
ts
.
getNanos
()
+
nanos
);
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论