Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
2e25f755
提交
2e25f755
authored
6 年前
作者:
Evgenij Ryazanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix JdbcPreparedStatement.set*() methods with null Calendar argument
上级
f3a1d182
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
19 行增加
和
3 行删除
+19
-3
JdbcPreparedStatement.java
h2/src/main/org/h2/jdbc/JdbcPreparedStatement.java
+6
-3
TestResultSet.java
h2/src/test/org/h2/test/jdbc/TestResultSet.java
+13
-0
没有找到文件。
h2/src/main/org/h2/jdbc/JdbcPreparedStatement.java
浏览文件 @
2e25f755
...
@@ -734,7 +734,8 @@ public class JdbcPreparedStatement extends JdbcStatement implements
...
@@ -734,7 +734,8 @@ public class JdbcPreparedStatement extends JdbcStatement implements
if
(
x
==
null
)
{
if
(
x
==
null
)
{
setParameter
(
parameterIndex
,
ValueNull
.
INSTANCE
);
setParameter
(
parameterIndex
,
ValueNull
.
INSTANCE
);
}
else
{
}
else
{
setParameter
(
parameterIndex
,
DateTimeUtils
.
convertDate
(
x
,
calendar
));
setParameter
(
parameterIndex
,
calendar
!=
null
?
DateTimeUtils
.
convertDate
(
x
,
calendar
)
:
ValueDate
.
get
(
x
));
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
throw
logAndConvert
(
e
);
throw
logAndConvert
(
e
);
...
@@ -760,7 +761,8 @@ public class JdbcPreparedStatement extends JdbcStatement implements
...
@@ -760,7 +761,8 @@ public class JdbcPreparedStatement extends JdbcStatement implements
if
(
x
==
null
)
{
if
(
x
==
null
)
{
setParameter
(
parameterIndex
,
ValueNull
.
INSTANCE
);
setParameter
(
parameterIndex
,
ValueNull
.
INSTANCE
);
}
else
{
}
else
{
setParameter
(
parameterIndex
,
DateTimeUtils
.
convertTime
(
x
,
calendar
));
setParameter
(
parameterIndex
,
calendar
!=
null
?
DateTimeUtils
.
convertTime
(
x
,
calendar
)
:
ValueTime
.
get
(
x
));
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
throw
logAndConvert
(
e
);
throw
logAndConvert
(
e
);
...
@@ -787,7 +789,8 @@ public class JdbcPreparedStatement extends JdbcStatement implements
...
@@ -787,7 +789,8 @@ public class JdbcPreparedStatement extends JdbcStatement implements
if
(
x
==
null
)
{
if
(
x
==
null
)
{
setParameter
(
parameterIndex
,
ValueNull
.
INSTANCE
);
setParameter
(
parameterIndex
,
ValueNull
.
INSTANCE
);
}
else
{
}
else
{
setParameter
(
parameterIndex
,
DateTimeUtils
.
convertTimestamp
(
x
,
calendar
));
setParameter
(
parameterIndex
,
calendar
!=
null
?
DateTimeUtils
.
convertTimestamp
(
x
,
calendar
)
:
ValueTimestamp
.
get
(
x
));
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
throw
logAndConvert
(
e
);
throw
logAndConvert
(
e
);
...
...
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/jdbc/TestResultSet.java
浏览文件 @
2e25f755
...
@@ -1497,6 +1497,12 @@ public class TestResultSet extends TestDb {
...
@@ -1497,6 +1497,12 @@ public class TestResultSet extends TestDb {
java
.
sql
.
Timestamp
.
valueOf
(
"2107-08-09 10:11:12.131415"
));
java
.
sql
.
Timestamp
.
valueOf
(
"2107-08-09 10:11:12.131415"
));
prep
.
execute
();
prep
.
execute
();
prep
.
setInt
(
1
,
5
);
prep
.
setDate
(
2
,
java
.
sql
.
Date
.
valueOf
(
"2101-02-03"
),
null
);
prep
.
setTime
(
3
,
java
.
sql
.
Time
.
valueOf
(
"14:05:06"
),
null
);
prep
.
setTimestamp
(
4
,
java
.
sql
.
Timestamp
.
valueOf
(
"2107-08-09 10:11:12.131415"
),
null
);
prep
.
execute
();
rs
=
stat
.
executeQuery
(
"SELECT * FROM TEST ORDER BY ID"
);
rs
=
stat
.
executeQuery
(
"SELECT * FROM TEST ORDER BY ID"
);
assertResultSetMeta
(
rs
,
4
,
assertResultSetMeta
(
rs
,
4
,
new
String
[]
{
"ID"
,
"D"
,
"T"
,
"TS"
},
new
String
[]
{
"ID"
,
"D"
,
"T"
,
"TS"
},
...
@@ -1545,6 +1551,13 @@ public class TestResultSet extends TestDb {
...
@@ -1545,6 +1551,13 @@ public class TestResultSet extends TestDb {
assertEquals
(
"14:05:06"
,
rs
.
getTime
(
"T"
).
toString
());
assertEquals
(
"14:05:06"
,
rs
.
getTime
(
"T"
).
toString
());
assertEquals
(
"2101-02-03"
,
rs
.
getDate
(
"D"
).
toString
());
assertEquals
(
"2101-02-03"
,
rs
.
getDate
(
"D"
).
toString
());
rs
.
next
();
assertEquals
(
5
,
rs
.
getInt
(
"ID"
));
assertEquals
(
"2107-08-09 10:11:12.131415"
,
rs
.
getTimestamp
(
"TS"
).
toString
());
assertEquals
(
"14:05:06"
,
rs
.
getTime
(
"T"
).
toString
());
assertEquals
(
"2101-02-03"
,
rs
.
getDate
(
"D"
).
toString
());
assertFalse
(
rs
.
next
());
assertFalse
(
rs
.
next
());
stat
.
execute
(
"DROP TABLE TEST"
);
stat
.
execute
(
"DROP TABLE TEST"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论