Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
4f42093f
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,发现更多精彩内容 >>
提交
4f42093f
编写于
2月 21, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#5333 PG: GIS data types uspport improvement
Former-commit-id:
0e6c945c
上级
f806d7ed
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
9 deletion
+16
-9
plugins/org.jkiss.dbeaver.ext.greenplum/plugin.xml
plugins/org.jkiss.dbeaver.ext.greenplum/plugin.xml
+0
-1
plugins/org.jkiss.dbeaver.ext.postgresql/plugin.xml
plugins/org.jkiss.dbeaver.ext.postgresql/plugin.xml
+0
-3
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/editors/BaseValueEditor.java
...rc/org/jkiss/dbeaver/ui/data/editors/BaseValueEditor.java
+16
-5
未找到文件。
plugins/org.jkiss.dbeaver.ext.greenplum/plugin.xml
浏览文件 @
4f42093f
...
...
@@ -61,7 +61,6 @@
<file
type=
"license"
path=
"drivers/postgresql/LICENSE.txt"
bundle=
"drivers.postgresql"
/>
<file
type=
"jar"
path=
"drivers/postgresql/postgresql.jar"
bundle=
"drivers.postgresql"
/>
<file
type=
"jar"
path=
"drivers/postgis/postgis-jdbc.jar"
bundle=
"drivers.postgresql"
/>
<file
type=
"jar"
path=
"drivers/postgis/postgis-jdbc-jtsparser.jar"
bundle=
"drivers.postgresql"
/>
<parameter
name=
"serverType"
value=
"greenplum"
/>
<property
name=
"loginTimeout"
value=
"20"
/>
<property
name=
"connectTimeout"
value=
"20"
/>
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/plugin.xml
浏览文件 @
4f42093f
...
...
@@ -236,13 +236,11 @@
<replace
provider=
"generic"
driver=
"postgresql"
/>
<file
type=
"jar"
path=
"maven:/org.postgresql:postgresql:RELEASE[42.2.5]"
bundle=
"!drivers.postgresql"
/>
<file
type=
"jar"
path=
"maven:/net.postgis:postgis-jdbc:RELEASE[2.2.1]"
ignore-dependencies=
"true"
optional=
"true"
bundle=
"!drivers.postgresql"
/>
<file
type=
"jar"
path=
"maven:/net.postgis:postgis-jdbc-jtsparser:RELEASE[2.2.1]"
ignore-dependencies=
"true"
optional=
"true"
bundle=
"!drivers.postgresql"
/>
<file
type=
"license"
path=
"drivers/postgresql/LICENSE.txt"
bundle=
"drivers.postgresql"
/>
<file
type=
"jar"
path=
"drivers/postgresql/postgresql.jar"
bundle=
"drivers.postgresql"
/>
<!-- Postgis -->
<file
type=
"jar"
path=
"drivers/postgis/postgis-jdbc.jar"
bundle=
"drivers.postgresql"
/>
<file
type=
"jar"
path=
"drivers/postgis/postgis-jdbc-jtsparser.jar"
bundle=
"drivers.postgresql"
/>
<parameter
name=
"serverType"
value=
"postgresql"
/>
<property
name=
"loginTimeout"
value=
"20"
/>
...
...
@@ -304,7 +302,6 @@
<file
type=
"license"
path=
"drivers/postgresql/LICENSE.txt"
bundle=
"drivers.postgresql"
/>
<file
type=
"jar"
path=
"drivers/postgresql/postgresql.jar"
bundle=
"drivers.postgresql"
/>
<file
type=
"jar"
path=
"drivers/postgis/postgis-jdbc.jar"
bundle=
"drivers.postgresql"
/>
<file
type=
"jar"
path=
"drivers/postgis/postgis-jdbc-jtsparser.jar"
bundle=
"drivers.postgresql"
/>
<parameter
name=
"serverType"
value=
"timescale"
/>
<property
name=
"loginTimeout"
value=
"20"
/>
<property
name=
"connectTimeout"
value=
"20"
/>
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/editors/BaseValueEditor.java
浏览文件 @
4f42093f
...
...
@@ -27,7 +27,9 @@ import org.eclipse.swt.events.TraverseListener;
import
org.eclipse.swt.widgets.*
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.model.exec.DBCException
;
import
org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCResultSetImpl
;
import
org.jkiss.dbeaver.runtime.DBWorkbench
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.controls.resultset.ResultSetPreferences
;
...
...
@@ -44,6 +46,8 @@ public abstract class BaseValueEditor<T extends Control> implements IValueEditor
private
static
final
String
RESULTS_EDIT_CONTEXT_ID
=
"org.jkiss.dbeaver.ui.context.resultset.edit"
;
private
static
final
Log
log
=
Log
.
getLog
(
BaseValueEditor
.
class
);
protected
final
IValueController
valueController
;
protected
T
control
;
protected
boolean
dirty
;
...
...
@@ -142,7 +146,7 @@ public abstract class BaseValueEditor<T extends Control> implements IValueEditor
// Check new focus control in async mode
// (because right now focus is still on edit control)
if
(!
valueController
.
isReadOnly
())
{
saveValue
();
saveValue
(
false
);
}
if
(
valueController
instanceof
IMultiController
)
{
((
IMultiController
)
valueController
).
closeInlineEditor
();
...
...
@@ -151,8 +155,11 @@ public abstract class BaseValueEditor<T extends Control> implements IValueEditor
});
}
protected
void
saveValue
()
{
protected
void
saveValue
()
{
saveValue
(
true
);
}
protected
void
saveValue
(
boolean
showError
)
{
try
{
Object
newValue
=
extractEditorValue
();
if
(
dirty
||
control
instanceof
Combo
||
control
instanceof
CCombo
||
control
instanceof
List
)
{
...
...
@@ -163,7 +170,11 @@ public abstract class BaseValueEditor<T extends Control> implements IValueEditor
if
(
valueController
instanceof
IMultiController
)
{
((
IMultiController
)
valueController
).
closeInlineEditor
();
}
DBWorkbench
.
getPlatformUI
().
showError
(
"Value save"
,
"Can't save edited value"
,
e
);
if
(
showError
)
{
DBWorkbench
.
getPlatformUI
().
showError
(
"Value save"
,
"Can't save edited value"
,
e
);
}
else
{
log
.
debug
(
"Error saving value: "
+
e
.
getMessage
());
}
}
}
...
...
@@ -195,7 +206,7 @@ public abstract class BaseValueEditor<T extends Control> implements IValueEditor
}
setDirty
(
true
);
if
(
autoSaveEnabled
&&
DBWorkbench
.
getPlatform
().
getPreferenceStore
().
getBoolean
(
ResultSetPreferences
.
RS_EDIT_AUTO_UPDATE_VALUE
))
{
saveValue
();
saveValue
(
false
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录