Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
13dc84af
Unverified
提交
13dc84af
authored
6 年前
作者:
Evgenij Ryazanov
提交者:
GitHub
6 年前
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1339 from katzyn/datetime
Add support of TIMESTAMP WITH TIME ZONE to addition and subtraction operators
上级
6ad9d310
974ad323
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
147 行增加
和
99 行删除
+147
-99
Operation.java
h2/src/main/org/h2/expression/Operation.java
+128
-99
timestamp-with-timezone.sql
...org/h2/test/scripts/datatypes/timestamp-with-timezone.sql
+19
-0
没有找到文件。
h2/src/main/org/h2/expression/Operation.java
浏览文件 @
13dc84af
...
@@ -216,10 +216,30 @@ public class Operation extends Expression {
...
@@ -216,10 +216,30 @@ public class Operation extends Expression {
}
else
{
}
else
{
dataType
=
Value
.
DECIMAL
;
dataType
=
Value
.
DECIMAL
;
}
}
}
else
if
(
l
==
Value
.
DATE
||
l
==
Value
.
TIMESTAMP
||
}
else
if
(
DataType
.
isDateTimeType
(
l
)
||
DataType
.
isDateTimeType
(
r
))
{
l
==
Value
.
TIME
||
r
==
Value
.
DATE
||
return
optimizeDateTime
(
session
,
l
,
r
);
r
==
Value
.
TIMESTAMP
||
r
==
Value
.
TIME
)
{
}
else
{
if
(
opType
==
OpType
.
PLUS
)
{
dataType
=
Value
.
getHigherOrder
(
l
,
r
);
if
(
dataType
==
Value
.
ENUM
)
{
dataType
=
Value
.
INT
;
}
else
if
(
DataType
.
isStringType
(
dataType
)
&&
session
.
getDatabase
().
getMode
().
allowPlusForStringConcat
)
{
opType
=
OpType
.
CONCAT
;
}
}
break
;
default
:
DbException
.
throwInternalError
(
"type="
+
opType
);
}
if
(
left
.
isConstant
()
&&
(
right
==
null
||
right
.
isConstant
()))
{
return
ValueExpression
.
get
(
getValue
(
session
));
}
return
this
;
}
private
Expression
optimizeDateTime
(
Session
session
,
int
l
,
int
r
)
{
switch
(
opType
)
{
case
PLUS:
if
(
r
!=
Value
.
getHigherOrder
(
l
,
r
))
{
if
(
r
!=
Value
.
getHigherOrder
(
l
,
r
))
{
// order left and right: INT < TIME < DATE < TIMESTAMP
// order left and right: INT < TIME < DATE < TIMESTAMP
swap
();
swap
();
...
@@ -227,7 +247,8 @@ public class Operation extends Expression {
...
@@ -227,7 +247,8 @@ public class Operation extends Expression {
l
=
r
;
l
=
r
;
r
=
t
;
r
=
t
;
}
}
if
(
l
==
Value
.
INT
)
{
switch
(
l
)
{
case
Value
.
INT
:
{
// Oracle date add
// Oracle date add
Function
f
=
Function
.
getFunction
(
session
.
getDatabase
(),
"DATEADD"
);
Function
f
=
Function
.
getFunction
(
session
.
getDatabase
(),
"DATEADD"
);
f
.
setParameter
(
0
,
ValueExpression
.
get
(
ValueString
.
get
(
"DAY"
)));
f
.
setParameter
(
0
,
ValueExpression
.
get
(
ValueString
.
get
(
"DAY"
)));
...
@@ -235,7 +256,10 @@ public class Operation extends Expression {
...
@@ -235,7 +256,10 @@ public class Operation extends Expression {
f
.
setParameter
(
2
,
right
);
f
.
setParameter
(
2
,
right
);
f
.
doneWithParameters
();
f
.
doneWithParameters
();
return
f
.
optimize
(
session
);
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
// Oracle date add
Function
f
=
Function
.
getFunction
(
session
.
getDatabase
(),
"DATEADD"
);
Function
f
=
Function
.
getFunction
(
session
.
getDatabase
(),
"DATEADD"
);
f
.
setParameter
(
0
,
ValueExpression
.
get
(
ValueString
.
get
(
"SECOND"
)));
f
.
setParameter
(
0
,
ValueExpression
.
get
(
ValueString
.
get
(
"SECOND"
)));
...
@@ -245,15 +269,24 @@ public class Operation extends Expression {
...
@@ -245,15 +269,24 @@ public class Operation extends Expression {
f
.
setParameter
(
2
,
right
);
f
.
setParameter
(
2
,
right
);
f
.
doneWithParameters
();
f
.
doneWithParameters
();
return
f
.
optimize
(
session
);
return
f
.
optimize
(
session
);
}
else
if
(
l
==
Value
.
TIME
&&
r
==
Value
.
TIME
)
{
}
dataType
=
Value
.
TIME
;
case
Value
.
TIME
:
if
(
r
==
Value
.
TIME
||
r
==
Value
.
TIMESTAMP_TZ
)
{
dataType
=
r
;
return
this
;
return
this
;
}
else
if
(
l
==
Value
.
TIME
)
{
}
else
{
// DATE, TIMESTAMP
dataType
=
Value
.
TIMESTAMP
;
dataType
=
Value
.
TIMESTAMP
;
return
this
;
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
:
case
Value
.
TIMESTAMP_TZ
:
switch
(
r
)
{
case
Value
.
INT
:
{
// Oracle date subtract
// Oracle date subtract
Function
f
=
Function
.
getFunction
(
session
.
getDatabase
(),
"DATEADD"
);
Function
f
=
Function
.
getFunction
(
session
.
getDatabase
(),
"DATEADD"
);
f
.
setParameter
(
0
,
ValueExpression
.
get
(
ValueString
.
get
(
"DAY"
)));
f
.
setParameter
(
0
,
ValueExpression
.
get
(
ValueString
.
get
(
"DAY"
)));
...
@@ -263,8 +296,10 @@ public class Operation extends Expression {
...
@@ -263,8 +296,10 @@ public class Operation extends Expression {
f
.
setParameter
(
2
,
left
);
f
.
setParameter
(
2
,
left
);
f
.
doneWithParameters
();
f
.
doneWithParameters
();
return
f
.
optimize
(
session
);
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
// Oracle date subtract
Function
f
=
Function
.
getFunction
(
session
.
getDatabase
(),
"DATEADD"
);
Function
f
=
Function
.
getFunction
(
session
.
getDatabase
(),
"DATEADD"
);
f
.
setParameter
(
0
,
ValueExpression
.
get
(
ValueString
.
get
(
"SECOND"
)));
f
.
setParameter
(
0
,
ValueExpression
.
get
(
ValueString
.
get
(
"SECOND"
)));
...
@@ -276,11 +311,13 @@ public class Operation extends Expression {
...
@@ -276,11 +311,13 @@ public class Operation extends Expression {
f
.
setParameter
(
2
,
left
);
f
.
setParameter
(
2
,
left
);
f
.
doneWithParameters
();
f
.
doneWithParameters
();
return
f
.
optimize
(
session
);
return
f
.
optimize
(
session
);
}
else
if
(
l
==
Value
.
DATE
||
l
==
Value
.
TIMESTAMP
)
{
}
if
(
r
==
Value
.
TIME
)
{
case
Value
.
TIME
:
dataType
=
Value
.
TIMESTAMP
;
dataType
=
Value
.
TIMESTAMP
;
return
this
;
return
this
;
}
else
if
(
r
==
Value
.
DATE
||
r
==
Value
.
TIMESTAMP
)
{
case
Value
.
DATE
:
case
Value
.
TIMESTAMP
:
case
Value
.
TIMESTAMP_TZ
:
{
// Oracle date subtract
// Oracle date subtract
Function
f
=
Function
.
getFunction
(
session
.
getDatabase
(),
"DATEDIFF"
);
Function
f
=
Function
.
getFunction
(
session
.
getDatabase
(),
"DATEDIFF"
);
f
.
setParameter
(
0
,
ValueExpression
.
get
(
ValueString
.
get
(
"DAY"
)));
f
.
setParameter
(
0
,
ValueExpression
.
get
(
ValueString
.
get
(
"DAY"
)));
...
@@ -289,11 +326,17 @@ public class Operation extends Expression {
...
@@ -289,11 +326,17 @@ public class Operation extends Expression {
f
.
doneWithParameters
();
f
.
doneWithParameters
();
return
f
.
optimize
(
session
);
return
f
.
optimize
(
session
);
}
}
}
else
if
(
l
==
Value
.
TIME
&&
r
==
Value
.
TIME
)
{
}
break
;
case
Value
.
TIME
:
if
(
r
==
Value
.
TIME
)
{
dataType
=
Value
.
TIME
;
dataType
=
Value
.
TIME
;
return
this
;
return
this
;
}
}
}
else
if
(
opType
==
OpType
.
MULTIPLY
)
{
break
;
}
break
;
case
MULTIPLY:
if
(
l
==
Value
.
TIME
)
{
if
(
l
==
Value
.
TIME
)
{
dataType
=
Value
.
TIME
;
dataType
=
Value
.
TIME
;
convertRight
=
false
;
convertRight
=
false
;
...
@@ -304,34 +347,20 @@ public class Operation extends Expression {
...
@@ -304,34 +347,20 @@ public class Operation extends Expression {
convertRight
=
false
;
convertRight
=
false
;
return
this
;
return
this
;
}
}
}
else
if
(
opType
==
OpType
.
DIVIDE
)
{
break
;
case
DIVIDE:
if
(
l
==
Value
.
TIME
)
{
if
(
l
==
Value
.
TIME
)
{
dataType
=
Value
.
TIME
;
dataType
=
Value
.
TIME
;
convertRight
=
false
;
convertRight
=
false
;
return
this
;
return
this
;
}
}
break
;
default
:
}
}
throw
DbException
.
getUnsupportedException
(
throw
DbException
.
getUnsupportedException
(
DataType
.
getDataType
(
l
).
name
+
" "
+
DataType
.
getDataType
(
l
).
name
+
" "
+
getOperationToken
()
+
" "
+
getOperationToken
()
+
" "
+
DataType
.
getDataType
(
r
).
name
);
DataType
.
getDataType
(
r
).
name
);
}
else
{
dataType
=
Value
.
getHigherOrder
(
l
,
r
);
if
(
dataType
==
Value
.
ENUM
)
{
dataType
=
Value
.
INT
;
}
else
if
(
DataType
.
isStringType
(
dataType
)
&&
session
.
getDatabase
().
getMode
().
allowPlusForStringConcat
)
{
opType
=
OpType
.
CONCAT
;
}
}
break
;
default
:
DbException
.
throwInternalError
(
"type="
+
opType
);
}
if
(
left
.
isConstant
()
&&
(
right
==
null
||
right
.
isConstant
()))
{
return
ValueExpression
.
get
(
getValue
(
session
));
}
return
this
;
}
}
private
void
swap
()
{
private
void
swap
()
{
...
...
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/scripts/datatypes/timestamp-with-timezone.sql
浏览文件 @
13dc84af
...
@@ -93,3 +93,22 @@ SELECT T0 FROM TEST;
...
@@ -93,3 +93,22 @@ SELECT T0 FROM TEST;
DROP
TABLE
TEST
;
DROP
TABLE
TEST
;
>
ok
>
ok
SELECT
(
LOCALTIMESTAMP
+
1
)
=
(
CURRENT_TIMESTAMP
+
1
);
>>
TRUE
SELECT
(
TIMESTAMP
WITH
TIME
ZONE
'2010-01-01 10:00:00+01'
+
1
)
A
,
(
1
+
TIMESTAMP
WITH
TIME
ZONE
'2010-01-01 10:00:00+01'
)
B
;
>
A
B
>
---------------------- ----------------------
>
2010
-
01
-
02
10
:
00
:
00
+
01
2010
-
01
-
02
10
:
00
:
00
+
01
>
rows
:
1
SELECT
(
LOCALTIMESTAMP
-
1
)
=
(
CURRENT_TIMESTAMP
-
1
);
>>
TRUE
SELECT
(
TIMESTAMP
WITH
TIME
ZONE
'2010-01-01 10:00:00+01'
-
1
)
A
;
>
A
>
----------------------
>
2009
-
12
-
31
10
:
00
:
00
+
01
>
rows
:
1
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论