提交 5785e7c3 编写于 作者: S serge-rider

Geometry SQL representation fix.

上级 27fad3d8
......@@ -17,6 +17,7 @@
package org.jkiss.dbeaver.data.gis.handlers;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.model.data.DBDDisplayFormat;
import org.jkiss.dbeaver.model.exec.DBCException;
import org.jkiss.dbeaver.model.exec.DBCSession;
import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement;
......@@ -119,6 +120,15 @@ public class GISGeometryValueHandler extends JDBCAbstractValueHandler {
return geometry;
}
@NotNull
@Override
public String getValueDisplayString(@NotNull DBSTypedObject column, Object value, @NotNull DBDDisplayFormat format) {
if (value instanceof DBGeometry && format == DBDDisplayFormat.NATIVE) {
return "'" + value.toString() + "'";
}
return super.getValueDisplayString(column, value, format);
}
protected byte[] fetchBytes(JDBCResultSet resultSet, int index) throws SQLException {
return resultSet.getBytes(index);
}
......
......@@ -20,6 +20,7 @@ import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.data.gis.handlers.WKGUtils;
import org.jkiss.dbeaver.ext.postgresql.PostgreConstants;
import org.jkiss.dbeaver.ext.postgresql.PostgreUtils;
import org.jkiss.dbeaver.model.data.DBDDisplayFormat;
import org.jkiss.dbeaver.model.exec.DBCException;
import org.jkiss.dbeaver.model.exec.DBCSession;
import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement;
......@@ -28,6 +29,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession;
import org.jkiss.dbeaver.model.gis.DBGeometry;
import org.jkiss.dbeaver.model.gis.GisAttribute;
import org.jkiss.dbeaver.model.impl.jdbc.data.handlers.JDBCAbstractValueHandler;
import org.jkiss.dbeaver.model.sql.SQLUtils;
import org.jkiss.dbeaver.model.struct.DBSTypedObject;
import org.jkiss.utils.CommonUtils;
import org.locationtech.jts.geom.Geometry;
......@@ -117,6 +119,15 @@ public class PostgreGeometryValueHandler extends JDBCAbstractValueHandler {
}
}
@NotNull
@Override
public String getValueDisplayString(@NotNull DBSTypedObject column, Object value, @NotNull DBDDisplayFormat format) {
if (value instanceof DBGeometry && format == DBDDisplayFormat.NATIVE) {
return "'" + value.toString() + "'";
}
return super.getValueDisplayString(column, value, format);
}
private DBGeometry makeGeometryFromWKB(DBCSession session, String hexString) throws DBCException {
byte[] binaryData = WKBReader.hexToBytes(hexString);
try {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册