Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
03a337de
提交
03a337de
authored
11 年前
作者:
Thomas Mueller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Union queries: duplicate rows could be returned if the sub-queries contained "order by".
上级
e9e955f8
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
26 行增加
和
5 行删除
+26
-5
changelog.html
h2/src/docsrc/html/changelog.html
+2
-1
SelectUnion.java
h2/src/main/org/h2/command/dml/SelectUnion.java
+11
-2
testScript.sql
h2/src/test/org/h2/test/testScript.sql
+13
-2
没有找到文件。
h2/src/docsrc/html/changelog.html
浏览文件 @
03a337de
...
@@ -18,7 +18,8 @@ Change Log
...
@@ -18,7 +18,8 @@ Change Log
<h1>
Change Log
</h1>
<h1>
Change Log
</h1>
<h2>
Next Version (unreleased)
</h2>
<h2>
Next Version (unreleased)
</h2>
<ul><li>
The GEOMETRY data type now works for user defined functions that return a result set.
<ul><li>
Union queries: duplicate rows could be returned if the sub-queries contained "order by".
</li><li>
The GEOMETRY data type now works for user defined functions that return a result set.
</li><li>
PostgreSQL compatibility: the PgServer was not working properly when the setting
</li><li>
PostgreSQL compatibility: the PgServer was not working properly when the setting
database_to_upper was set to false.
database_to_upper was set to false.
</li><li>
JdbcDataSource: the methods setUrl and getUrl where added as aliases for setURL and getURL.
</li><li>
JdbcDataSource: the methods setUrl and getUrl where added as aliases for setURL and getURL.
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/command/dml/SelectUnion.java
浏览文件 @
03a337de
...
@@ -103,11 +103,20 @@ public class SelectUnion extends Query {
...
@@ -103,11 +103,20 @@ public class SelectUnion extends Query {
}
}
private
Value
[]
convert
(
Value
[]
values
,
int
columnCount
)
{
private
Value
[]
convert
(
Value
[]
values
,
int
columnCount
)
{
Value
[]
newValues
;
if
(
columnCount
==
values
.
length
)
{
// re-use the array if possible
newValues
=
values
;
}
else
{
// create a new array if needed,
// for the value hash set
newValues
=
new
Value
[
columnCount
];
}
for
(
int
i
=
0
;
i
<
columnCount
;
i
++)
{
for
(
int
i
=
0
;
i
<
columnCount
;
i
++)
{
Expression
e
=
expressions
.
get
(
i
);
Expression
e
=
expressions
.
get
(
i
);
v
alues
[
i
]
=
values
[
i
].
convertTo
(
e
.
getType
());
newV
alues
[
i
]
=
values
[
i
].
convertTo
(
e
.
getType
());
}
}
return
v
alues
;
return
newV
alues
;
}
}
@Override
@Override
...
...
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/testScript.sql
浏览文件 @
03a337de
...
@@ -4,6 +4,18 @@
...
@@ -4,6 +4,18 @@
-- Initial Developer: H2 Group
-- Initial Developer: H2 Group
--
--
--- special grammar and test cases ---------------------------------------------------------------------------------------------
--- special grammar and test cases ---------------------------------------------------------------------------------------------
create
table
test
(
id
int
,
name
varchar
)
as
select
1
,
'a'
;
>
ok
(
select
id
from
test
order
by
id
)
union
(
select
id
from
test
order
by
name
);
>
ID
>
--
>
1
>
rows
(
ordered
):
1
drop
table
test
;
>
ok
create
sequence
seq
;
create
sequence
seq
;
>
ok
>
ok
...
@@ -1334,8 +1346,7 @@ drop table p;
...
@@ -1334,8 +1346,7 @@ drop table p;
> X
> X
> -
> -
> 1
> 1
> 1
> rows (ordered): 1
> rows (ordered): 2
create table test(a int, b int default 1);
create table test(a int, b int default 1);
> ok
> ok
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论