提交 8ee4c2e4 编写于 作者: S Serge Rider

#13939 Redshift geometry values edit fix

上级 b8cb569b
...@@ -197,7 +197,7 @@ public class PostgreGeometryValueHandler extends JDBCAbstractValueHandler { ...@@ -197,7 +197,7 @@ public class PostgreGeometryValueHandler extends JDBCAbstractValueHandler {
} }
} }
private DBGeometry makeGeometryFromWKT(DBCSession session, String pgString) throws DBCException { protected DBGeometry makeGeometryFromWKT(DBCSession session, String pgString) throws DBCException {
if (CommonUtils.isEmpty(pgString)) { if (CommonUtils.isEmpty(pgString)) {
return new DBGeometry(); return new DBGeometry();
} }
......
...@@ -54,7 +54,13 @@ public class RedshiftGeometryValueHandler extends PostgreGeometryValueHandler { ...@@ -54,7 +54,13 @@ public class RedshiftGeometryValueHandler extends PostgreGeometryValueHandler {
return makeGeometryFromWKB((byte[]) object); return makeGeometryFromWKB((byte[]) object);
} }
if (object instanceof String) { if (object instanceof String) {
return makeGeometryFromWKB((String) object); try {
// It is WKB when read from server
return makeGeometryFromWKB((String) object);
} catch (Exception e) {
// It may be WKT when edited by user
return makeGeometryFromWKT(session, (String) object);
}
} }
return null; return null;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册