Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
ce2af391
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,发现更多精彩内容 >>
提交
ce2af391
编写于
4月 03, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
PostgreSQL < 8.4 support fix (data types)
上级
49a7946e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
42 addition
and
15 deletion
+42
-15
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataType.java
...g/jkiss/dbeaver/ext/postgresql/model/PostgreDataType.java
+9
-6
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreGenericTypeCache.java
...dbeaver/ext/postgresql/model/PostgreGenericTypeCache.java
+33
-9
未找到文件。
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataType.java
浏览文件 @
ce2af391
...
...
@@ -121,13 +121,16 @@ public class PostgreDataType extends JDBCDataType<PostgreSchema> implements Post
log
.
debug
(
"Invalid type type ["
+
typTypeStr
+
"] - "
+
e
.
getMessage
());
}
this
.
typeCategory
=
PostgreTypeCategory
.
X
;
String
typCategoryStr
=
JDBCUtils
.
safeGetString
(
dbResult
,
"typcategory"
);
try
{
if
(
typCategoryStr
!=
null
&&
!
typCategoryStr
.
isEmpty
())
{
this
.
typeCategory
=
PostgreTypeCategory
.
valueOf
(
typCategoryStr
.
toUpperCase
(
Locale
.
ENGLISH
));
boolean
supportsCategory
=
session
.
getDataSource
().
isServerVersionAtLeast
(
8
,
4
);
if
(
supportsCategory
)
{
String
typCategoryStr
=
JDBCUtils
.
safeGetString
(
dbResult
,
"typcategory"
);
try
{
if
(
typCategoryStr
!=
null
&&
!
typCategoryStr
.
isEmpty
())
{
this
.
typeCategory
=
PostgreTypeCategory
.
valueOf
(
typCategoryStr
.
toUpperCase
(
Locale
.
ENGLISH
));
}
}
catch
(
Throwable
e
)
{
log
.
debug
(
"Invalid type category ["
+
typCategoryStr
+
"] - "
+
e
.
getMessage
());
}
}
catch
(
Throwable
e
)
{
log
.
debug
(
"Invalid type category ["
+
typCategoryStr
+
"] - "
+
e
.
getMessage
());
}
this
.
dataKind
=
JDBCDataSource
.
getDataKind
(
getName
(),
valueType
);
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreGenericTypeCache.java
浏览文件 @
ce2af391
...
...
@@ -56,35 +56,43 @@ public class PostgreGenericTypeCache extends JDBCBasicDataTypeCache<GenericStruc
super
(
owner
);
}
private
boolean
supportsTypeCategory
()
{
return
owner
.
getDataSource
().
isServerVersionAtLeast
(
8
,
4
);
}
@Override
protected
JDBCStatement
prepareObjectsStatement
(
@NotNull
JDBCSession
session
,
@NotNull
GenericStructContainer
owner
)
throws
SQLException
{
boolean
supportsCategory
=
supportsTypeCategory
();
return
session
.
prepareStatement
(
"SELECT t.oid as typid,tn.nspname typnsname,t.* \n"
+
"FROM pg_catalog.pg_type t , pg_catalog.pg_namespace tn\n"
+
"WHERE tn.oid=t.typnamespace \n"
+
"AND t.typtype<>'c' AND t.typcategory not in ('A','P')\n"
+
"
ORDER by t.oid"
);
"FROM pg_catalog.pg_type t , pg_catalog.pg_namespace tn\n"
+
"WHERE tn.oid=t.typnamespace \n"
+
"AND t.typtype<>'c'"
+
(
supportsCategory
?
" AND t.typcategory not in ('A','P')"
:
""
)
+
"\n
ORDER by t.oid"
);
}
@Override
protected
JDBCDataType
fetchObject
(
@NotNull
JDBCSession
session
,
@NotNull
GenericStructContainer
owner
,
@NotNull
JDBCResultSet
dbResult
)
throws
SQLException
,
DBException
{
boolean
supportsTypeCategory
=
supportsTypeCategory
();
String
name
=
JDBCUtils
.
safeGetString
(
dbResult
,
"typname"
);
if
(
CommonUtils
.
isEmpty
(
name
))
{
return
null
;
}
int
typeLength
=
JDBCUtils
.
safeGetInt
(
dbResult
,
"typlen"
);
PostgreTypeCategory
typeCategory
=
PostgreTypeCategory
.
X
;
try
{
typeCategory
=
PostgreTypeCategory
.
valueOf
(
JDBCUtils
.
safeGetString
(
dbResult
,
"typcategory"
));
}
catch
(
IllegalArgumentException
e
)
{
log
.
debug
(
e
);
if
(
supportsTypeCategory
)
{
try
{
typeCategory
=
PostgreTypeCategory
.
valueOf
(
JDBCUtils
.
safeGetString
(
dbResult
,
"typcategory"
));
}
catch
(
IllegalArgumentException
e
)
{
log
.
debug
(
e
);
}
}
int
valueType
;
if
(
ArrayUtils
.
contains
(
OID_TYPES
,
name
)
||
name
.
equals
(
PostgreConstants
.
TYPE_HSTORE
))
{
valueType
=
Types
.
VARCHAR
;
}
else
{
}
else
if
(
supportsTypeCategory
)
{
switch
(
typeCategory
)
{
case
A:
case
P:
...
...
@@ -153,6 +161,22 @@ public class PostgreGenericTypeCache extends JDBCBasicDataTypeCache<GenericStruc
valueType
=
Types
.
OTHER
;
break
;
}
}
else
{
String
typType
=
null
;
try
{
typType
=
JDBCUtils
.
safeGetString
(
dbResult
,
"typtype"
);
}
catch
(
IllegalArgumentException
e
)
{
log
.
debug
(
e
);
}
if
(
"c"
.
equals
(
typType
))
{
valueType
=
Types
.
STRUCT
;
}
else
if
(
"d"
.
equals
(
typType
))
{
valueType
=
Types
.
DISTINCT
;
}
else
if
(
"e"
.
equals
(
typType
))
{
valueType
=
Types
.
VARCHAR
;
}
else
{
valueType
=
Types
.
OTHER
;
}
}
return
new
JDBCDataType
<>(
owner
,
valueType
,
name
,
null
,
false
,
true
,
typeLength
,-
1
,-
1
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录