Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
78c554f5
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
78c554f5
编写于
2月 12, 2021
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/devel' into devel
Former-commit-id:
7669b3cb
上级
94de85d6
0ddd2a45
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
12 deletion
+28
-12
plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/database/DatabaseConsumerPageMapping.java
...ansfer/ui/pages/database/DatabaseConsumerPageMapping.java
+11
-12
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
...eaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
+17
-0
未找到文件。
plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/database/DatabaseConsumerPageMapping.java
浏览文件 @
78c554f5
...
...
@@ -74,7 +74,7 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
private
TreeViewer
mappingViewer
;
private
Button
autoAssignButton
;
private
ObjectContainerSelectorPanel
containerPanel
;
private
boolean
autoAssignedOnFirstActivation
=
fals
e
;
private
boolean
firstInit
=
tru
e
;
private
static
abstract
class
MappingLabelProvider
extends
CellLabelProvider
{
@Override
...
...
@@ -698,6 +698,8 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
}
private
void
autoAssignMappings
()
{
getWizard
().
getSettings
().
sortDataPipes
();
loadAndUpdateColumnsModel
();
for
(
TreeItem
item
:
mappingViewer
.
getTree
().
getItems
())
{
Object
element
=
item
.
getData
();
if
(
element
instanceof
DatabaseMappingContainer
)
{
...
...
@@ -711,8 +713,6 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
}
}
}
getWizard
().
getSettings
().
sortDataPipes
();
loadAndUpdateColumnsModel
();
updateMappingsAndButtons
();
updatePageCompletion
();
}
...
...
@@ -976,9 +976,15 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
}
}
loadAndUpdateColumnsModel
();
if
(
!
autoAssignedOnFirstActivation
)
{
autoAssignedOnFirstActivation
=
tru
e
;
if
(
firstInit
)
{
firstInit
=
fals
e
;
autoAssignMappings
();
Tree
table
=
mappingViewer
.
getTree
();
int
totalWidth
=
table
.
getClientArea
().
width
;
TreeColumn
[]
columns
=
table
.
getColumns
();
columns
[
0
].
setWidth
(
totalWidth
*
40
/
100
);
columns
[
1
].
setWidth
(
totalWidth
*
40
/
100
);
columns
[
2
].
setWidth
(
totalWidth
*
20
/
100
);
}
updatePageCompletion
();
}
...
...
@@ -1024,13 +1030,6 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
// Select first element
mappingViewer
.
setSelection
(
new
StructuredSelection
(
model
.
get
(
0
)));
}
Tree
table
=
mappingViewer
.
getTree
();
int
totalWidth
=
table
.
getClientArea
().
width
;
TreeColumn
[]
columns
=
table
.
getColumns
();
columns
[
0
].
setWidth
(
totalWidth
*
40
/
100
);
columns
[
1
].
setWidth
(
totalWidth
*
40
/
100
);
columns
[
2
].
setWidth
(
totalWidth
*
20
/
100
);
}
@Override
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
浏览文件 @
78c554f5
...
...
@@ -1195,4 +1195,21 @@ public final class SQLUtils {
}
return
true
;
}
public
static
String
removeQueryDelimiter
(
SQLDialect
sqlDialect
,
String
query
)
{
String
delimiter
=
sqlDialect
.
getScriptDelimiter
();
if
(!
delimiter
.
isEmpty
()
&&
query
.
contains
(
delimiter
))
{
String
queryWithoutDelimiter
=
query
.
substring
(
0
,
query
.
lastIndexOf
(
delimiter
));
if
(
Character
.
isLetterOrDigit
(
delimiter
.
charAt
(
0
)))
{
if
(
query
.
toUpperCase
().
endsWith
(
delimiter
.
toUpperCase
()))
{
if
(!
Character
.
isLetterOrDigit
(
query
.
charAt
(
query
.
length
()
-
delimiter
.
length
()
-
1
)))
{
return
queryWithoutDelimiter
;
}
}
}
else
if
(
query
.
endsWith
(
delimiter
))
{
return
queryWithoutDelimiter
;
}
}
return
query
;
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录