Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
cb5ae717
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cb5ae717
编写于
5月 03, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'devel' of
https://github.com/dbeaver/dbeaver
into debug__refactoring
上级
9897ddc8
e6b3b850
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
18 addition
and
3 deletion
+18
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetDataReceiver.java
.../dbeaver/ui/controls/resultset/ResultSetDataReceiver.java
+8
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetUtils.java
...g/jkiss/dbeaver/ui/controls/resultset/ResultSetUtils.java
+4
-1
plugins/org.jkiss.dbeaver.data.office/src/org/jkiss/dbeaver/data/office/export/DataExporterXLSX.java
...rg/jkiss/dbeaver/data/office/export/DataExporterXLSX.java
+6
-1
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetDataReceiver.java
浏览文件 @
cb5ae717
...
...
@@ -22,6 +22,8 @@ import org.jkiss.dbeaver.model.DBUtils;
import
org.jkiss.dbeaver.model.data.DBDAttributeBindingMeta
;
import
org.jkiss.dbeaver.model.data.DBDDataReceiver
;
import
org.jkiss.dbeaver.model.exec.*
;
import
org.jkiss.dbeaver.model.struct.DBSDataContainer
;
import
org.jkiss.dbeaver.model.struct.DBSEntity
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
...
...
@@ -140,7 +142,12 @@ class ResultSetDataReceiver implements DBDDataReceiver {
if
(!
nextSegmentRead
)
{
try
{
// Read locators' metadata
ResultSetUtils
.
bindAttributes
(
session
,
resultSet
,
metaColumns
,
rows
);
DBSEntity
entity
=
null
;
DBSDataContainer
dataContainer
=
resultSetViewer
.
getDataContainer
();
if
(
dataContainer
instanceof
DBSEntity
)
{
entity
=
(
DBSEntity
)
dataContainer
;
}
ResultSetUtils
.
bindAttributes
(
session
,
entity
,
resultSet
,
metaColumns
,
rows
);
}
catch
(
Throwable
e
)
{
errorList
.
add
(
e
);
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetUtils.java
浏览文件 @
cb5ae717
...
...
@@ -66,6 +66,7 @@ public class ResultSetUtils
public
static
void
bindAttributes
(
@NotNull
DBCSession
session
,
@Nullable
DBSEntity
sourceEntity
,
@Nullable
DBCResultSet
resultSet
,
@NotNull
DBDAttributeBindingMeta
[]
bindings
,
@Nullable
List
<
Object
[]>
rows
)
throws
DBException
...
...
@@ -84,7 +85,9 @@ public class ResultSetUtils
try
{
SQLQuery
sqlQuery
=
null
;
DBSEntity
entity
=
null
;
if
(
resultSet
!=
null
)
{
if
(
sourceEntity
!=
null
)
{
entity
=
sourceEntity
;
}
else
if
(
resultSet
!=
null
)
{
DBCStatement
sourceStatement
=
resultSet
.
getSourceStatement
();
if
(
sourceStatement
!=
null
&&
sourceStatement
.
getStatementSource
()
!=
null
)
{
DBCExecutionSource
executionSource
=
sourceStatement
.
getStatementSource
();
...
...
plugins/org.jkiss.dbeaver.data.office/src/org/jkiss/dbeaver/data/office/export/DataExporterXLSX.java
浏览文件 @
cb5ae717
...
...
@@ -33,6 +33,7 @@ import org.jkiss.dbeaver.model.data.DBDContent;
import
org.jkiss.dbeaver.model.data.DBDContentStorage
;
import
org.jkiss.dbeaver.model.exec.DBCSession
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.struct.DBSEntity
;
import
org.jkiss.dbeaver.tools.transfer.stream.IStreamDataExporterSite
;
import
org.jkiss.dbeaver.tools.transfer.stream.impl.StreamExporterAbstract
;
import
org.jkiss.dbeaver.ui.controls.resultset.ResultSetUtils
;
...
...
@@ -306,7 +307,11 @@ public class DataExporterXLSX extends StreamExporterAbstract {
}
}
if
(
bindingsOk
)
{
ResultSetUtils
.
bindAttributes
(
session
,
null
,
bindings
,
null
);
DBSEntity
sourceEntity
=
null
;
if
(
getSite
().
getSource
()
instanceof
DBSEntity
)
{
sourceEntity
=
(
DBSEntity
)
getSite
().
getSource
();
}
ResultSetUtils
.
bindAttributes
(
session
,
sourceEntity
,
null
,
bindings
,
null
);
}
}
/*if (printHeader) { FIXME
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录