Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
b3456315
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,发现更多精彩内容 >>
提交
b3456315
编写于
9月 25, 2020
作者:
L
LonwoLonwo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#4644 extra options added in table DDL
上级
5e0081d0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
4 deletion
+26
-4
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTableBase.java
.../jkiss/dbeaver/ext/postgresql/model/PostgreTableBase.java
+1
-1
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerExtensionBase.java
...xt/postgresql/model/impls/PostgreServerExtensionBase.java
+22
-2
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/properties/TabbedFolderPageForm.java
...er/ui/editors/entity/properties/TabbedFolderPageForm.java
+3
-1
未找到文件。
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTableBase.java
浏览文件 @
b3456315
...
@@ -129,7 +129,7 @@ public abstract class PostgreTableBase extends JDBCTable<PostgreDataSource, Post
...
@@ -129,7 +129,7 @@ public abstract class PostgreTableBase extends JDBCTable<PostgreDataSource, Post
return
this
.
oid
;
return
this
.
oid
;
}
}
@Property
(
order
=
90
)
@Property
(
viewable
=
true
,
multiline
=
true
,
order
=
90
)
@Nullable
@Nullable
public
String
[]
getRelOptions
()
{
public
String
[]
getRelOptions
()
{
return
relOptions
;
return
relOptions
;
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerExtensionBase.java
浏览文件 @
b3456315
...
@@ -30,6 +30,7 @@ import org.jkiss.utils.ArrayUtils;
...
@@ -30,6 +30,7 @@ import org.jkiss.utils.ArrayUtils;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.CommonUtils
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -394,8 +395,27 @@ public abstract class PostgreServerExtensionBase implements PostgreServerExtensi
...
@@ -394,8 +395,27 @@ public abstract class PostgreServerExtensionBase implements PostgreServerExtensi
public
String
createWithClause
(
PostgreTableRegular
table
,
PostgreTableBase
tableBase
)
{
public
String
createWithClause
(
PostgreTableRegular
table
,
PostgreTableBase
tableBase
)
{
StringBuilder
withClauseBuilder
=
new
StringBuilder
();
StringBuilder
withClauseBuilder
=
new
StringBuilder
();
if
(
table
.
getDataSource
().
getServerType
().
supportsOids
()
&&
table
.
isHasOids
()
&&
table
.
getDataSource
().
getServerType
().
supportsHasOidsColumn
())
{
boolean
hasExtraOptions
=
dataSource
.
isServerVersionAtLeast
(
8
,
2
)
&&
table
.
getRelOptions
()
!=
null
;
withClauseBuilder
.
append
(
"\nWITH (\n\tOIDS="
).
append
(
table
.
isHasOids
()
?
"TRUE"
:
"FALSE"
);
boolean
tableSupportOids
=
table
.
getDataSource
().
getServerType
().
supportsOids
()
&&
table
.
isHasOids
()
&&
table
.
getDataSource
().
getServerType
().
supportsHasOidsColumn
();
List
<
String
>
extraOptions
=
new
ArrayList
<>();
if
(
tableSupportOids
)
{
extraOptions
.
add
(
"OIDS=TRUE"
);
}
if
(
hasExtraOptions
)
{
extraOptions
.
addAll
(
Arrays
.
asList
(
table
.
getRelOptions
()));
}
if
(!
CommonUtils
.
isEmpty
(
extraOptions
))
{
withClauseBuilder
.
append
(
"\nWITH (\n\t"
);
for
(
int
i
=
0
;
i
<
extraOptions
.
size
();
i
++)
{
if
(
i
==
0
)
{
withClauseBuilder
.
append
(
extraOptions
.
get
(
i
));
}
else
{
withClauseBuilder
.
append
(
",\n\t"
).
append
(
extraOptions
.
get
(
i
));
}
}
withClauseBuilder
.
append
(
"\n)"
);
withClauseBuilder
.
append
(
"\n)"
);
}
}
...
...
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/properties/TabbedFolderPageForm.java
浏览文件 @
b3456315
...
@@ -719,7 +719,9 @@ public class TabbedFolderPageForm extends TabbedFolderPage implements IRefreshab
...
@@ -719,7 +719,9 @@ public class TabbedFolderPageForm extends TabbedFolderPage implements IRefreshab
}
}
private
static
boolean
isTextPropertyType
(
Class
<?>
propertyType
)
{
private
static
boolean
isTextPropertyType
(
Class
<?>
propertyType
)
{
return
propertyType
==
null
||
CharSequence
.
class
.
isAssignableFrom
(
propertyType
)
||
BeanUtils
.
isNumericType
(
propertyType
);
return
propertyType
==
null
||
CharSequence
.
class
.
isAssignableFrom
(
propertyType
)
||
(
propertyType
.
getComponentType
()
!=
null
&&
CharSequence
.
class
.
isAssignableFrom
(
propertyType
.
getComponentType
()))
||
BeanUtils
.
isNumericType
(
propertyType
);
}
}
private
List
<
DBPPropertyDescriptor
>
filterProperties
(
DBPPropertyDescriptor
[]
props
)
{
private
List
<
DBPPropertyDescriptor
>
filterProperties
(
DBPPropertyDescriptor
[]
props
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录