Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
f806d7ed
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,发现更多精彩内容 >>
提交
f806d7ed
编写于
2月 21, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#5333 PostGIS support improvement
Former-commit-id:
7fa232ae
上级
27a43733
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
60 addition
and
7 deletion
+60
-7
plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GISGeometryTest.java
.../org/jkiss/dbeaver/data/gis/handlers/GISGeometryTest.java
+42
-0
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreConstants.java
...rc/org/jkiss/dbeaver/ext/postgresql/PostgreConstants.java
+1
-0
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/data/PostgreGeometryValueHandler.java
...xt/postgresql/model/data/PostgreGeometryValueHandler.java
+17
-7
未找到文件。
plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GISGeometryTest.java
0 → 100644
浏览文件 @
f806d7ed
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2019 Serge Rider (serge@jkiss.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.jkiss.dbeaver.data.gis.handlers
;
import
com.vividsolutions.jts.geom.Geometry
;
import
com.vividsolutions.jts.io.WKTReader
;
import
org.jkiss.dbeaver.model.exec.DBCException
;
import
org.jkiss.dbeaver.model.exec.DBCSession
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCSession
;
import
org.jkiss.dbeaver.model.impl.jdbc.data.handlers.JDBCAbstractValueHandler
;
import
org.jkiss.dbeaver.model.struct.DBSTypedObject
;
import
java.sql.SQLException
;
/**
* GIS geometry handler
*/
public
class
GISGeometryTest
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
WKTReader
wktReader
=
new
WKTReader
();
Geometry
g
=
wktReader
.
read
(
"MultiPointZ((1 2 3))"
);
System
.
out
.
println
(
g
);
}
}
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreConstants.java
浏览文件 @
f806d7ed
...
...
@@ -68,6 +68,7 @@ public class PostgreConstants {
public
static
final
String
PG_OBJECT_CLASS
=
"org.postgresql.util.PGobject"
;
public
static
final
String
PG_ARRAY_CLASS
=
"org.postgresql.jdbc.PgArray"
;
public
static
final
String
PG_INTERVAL_CLASS
=
"org.postgresql.util.PGInterval"
;
public
static
final
String
PG_GEOMETRY_CLASS
=
"org.postgis.PGgeometry"
;
public
static
final
DBDPseudoAttribute
PSEUDO_ATTR_OID
=
new
DBDPseudoAttribute
(
DBDPseudoAttributeType
.
ROWID
,
"oid"
,
"oid"
,
"oid"
,
"Row identifier"
,
false
);
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/data/PostgreGeometryValueHandler.java
浏览文件 @
f806d7ed
...
...
@@ -17,15 +17,13 @@
package
org.jkiss.dbeaver.ext.postgresql.model.data
;
import
com.vividsolutions.jts.geom.Geometry
;
import
org.jkiss.dbeaver.data.gis.handlers.GISGeometryValueHandler
;
import
org.jkiss.dbeaver.data.gis.handlers.GeometryConverter
;
import
org.jkiss.dbeaver.ext.postgresql.PostgreConstants
;
import
org.jkiss.dbeaver.model.DBUtils
;
import
org.jkiss.dbeaver.model.exec.DBCException
;
import
org.jkiss.dbeaver.model.exec.DBCSession
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCSession
;
import
org.jkiss.dbeaver.model.impl.data.formatters.BinaryFormatterHex
;
import
org.jkiss.dbeaver.model.impl.jdbc.data.handlers.JDBCAbstractValueHandler
;
import
org.jkiss.dbeaver.model.struct.DBSTypedObject
;
import
org.jkiss.utils.BeanUtils
;
...
...
@@ -44,7 +42,7 @@ public class PostgreGeometryValueHandler extends JDBCAbstractValueHandler {
@Override
protected
Object
fetchColumnValue
(
DBCSession
session
,
JDBCResultSet
resultSet
,
DBSTypedObject
type
,
int
index
)
throws
DBCException
,
SQLException
{
return
getValueFromObject
(
session
,
type
,
resultSet
.
get
String
(
index
),
resultSet
.
get
Object
(
index
),
false
);
}
...
...
@@ -54,8 +52,10 @@ public class PostgreGeometryValueHandler extends JDBCAbstractValueHandler {
statement
.
setNull
(
paramIndex
,
paramType
.
getTypeID
());
}
else
if
(
value
instanceof
Geometry
)
{
statement
.
setObject
(
paramIndex
,
getStringFromGeometry
(
session
,
(
Geometry
)
value
),
Types
.
OTHER
);
}
else
if
(
value
.
getClass
().
getName
().
equals
(
PostgreConstants
.
PG_GEOMETRY_CLASS
))
{
statement
.
setObject
(
paramIndex
,
value
,
Types
.
OTHER
);
}
else
{
throw
new
DBCException
(
"Invalid geometry object: "
+
value
);
statement
.
setObject
(
paramIndex
,
value
.
toString
(),
Types
.
OTHER
);
}
}
...
...
@@ -72,17 +72,27 @@ public class PostgreGeometryValueHandler extends JDBCAbstractValueHandler {
return
object
;
}
else
if
(
object
instanceof
String
)
{
return
makeGeometryFromString
(
session
,
(
String
)
object
);
}
else
if
(
object
.
getClass
().
getName
().
equals
(
PostgreConstants
.
PG_GEOMETRY_CLASS
))
{
return
makeGeometryFromPGGeometry
(
session
,
object
);
}
else
{
return
makeGeometryFromString
(
session
,
object
.
toString
());
}
}
private
Object
makeGeometryFromPGGeometry
(
DBCSession
session
,
Object
pgGeometry
)
throws
DBCException
{
try
{
return
BeanUtils
.
invokeObjectMethod
(
pgGeometry
,
"getGeometry"
,
null
,
null
);
}
catch
(
Throwable
e
)
{
throw
new
DBCException
(
e
,
session
.
getDataSource
());
}
}
private
Object
makeGeometryFromString
(
DBCSession
session
,
String
object
)
throws
DBCException
{
if
(
CommonUtils
.
isEmpty
(
object
))
{
return
null
;
}
try
{
Class
<?>
jtsGeometry
=
DBUtils
.
getDriverClass
(
session
.
getDataSource
(),
"org.postgis.jts.JtsGeometry"
);
Class
<?>
jtsGeometry
=
DBUtils
.
getDriverClass
(
session
.
getDataSource
(),
PostgreConstants
.
PG_GEOMETRY_CLASS
);
return
BeanUtils
.
invokeStaticMethod
(
jtsGeometry
,
"geomFromString"
,
new
Class
[]
{
String
.
class
},
new
Object
[]
{
object
}
);
...
...
@@ -93,7 +103,7 @@ public class PostgreGeometryValueHandler extends JDBCAbstractValueHandler {
private
String
getStringFromGeometry
(
JDBCSession
session
,
Geometry
geometry
)
throws
DBCException
{
try
{
Class
<?>
jtsGeometry
=
DBUtils
.
getDriverClass
(
session
.
getDataSource
(),
"org.postgis.jts.JtsGeometry"
);
Class
<?>
jtsGeometry
=
DBUtils
.
getDriverClass
(
session
.
getDataSource
(),
PostgreConstants
.
PG_GEOMETRY_CLASS
);
Object
jtsg
=
jtsGeometry
.
getConstructor
(
Geometry
.
class
).
newInstance
(
geometry
);
return
(
String
)
BeanUtils
.
invokeObjectMethod
(
jtsg
,
"getValue"
,
null
,
null
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录