提交 4f42093f 编写于 作者: S serge-rider

#5333 PG: GIS data types uspport improvement


Former-commit-id: 0e6c945c
上级 f806d7ed
......@@ -61,7 +61,6 @@
<file type="license" path="drivers/postgresql/LICENSE.txt" bundle="drivers.postgresql"/>
<file type="jar" path="drivers/postgresql/postgresql.jar" bundle="drivers.postgresql"/>
<file type="jar" path="drivers/postgis/postgis-jdbc.jar" bundle="drivers.postgresql"/>
<file type="jar" path="drivers/postgis/postgis-jdbc-jtsparser.jar" bundle="drivers.postgresql"/>
<parameter name="serverType" value="greenplum"/>
<property name="loginTimeout" value="20"/>
<property name="connectTimeout" value="20"/>
......
......@@ -236,13 +236,11 @@
<replace provider="generic" driver="postgresql"/>
<file type="jar" path="maven:/org.postgresql:postgresql:RELEASE[42.2.5]" bundle="!drivers.postgresql"/>
<file type="jar" path="maven:/net.postgis:postgis-jdbc:RELEASE[2.2.1]" ignore-dependencies="true" optional="true" bundle="!drivers.postgresql"/>
<file type="jar" path="maven:/net.postgis:postgis-jdbc-jtsparser:RELEASE[2.2.1]" ignore-dependencies="true" optional="true" bundle="!drivers.postgresql"/>
<file type="license" path="drivers/postgresql/LICENSE.txt" bundle="drivers.postgresql"/>
<file type="jar" path="drivers/postgresql/postgresql.jar" bundle="drivers.postgresql"/>
<!-- Postgis -->
<file type="jar" path="drivers/postgis/postgis-jdbc.jar" bundle="drivers.postgresql"/>
<file type="jar" path="drivers/postgis/postgis-jdbc-jtsparser.jar" bundle="drivers.postgresql"/>
<parameter name="serverType" value="postgresql"/>
<property name="loginTimeout" value="20"/>
......@@ -304,7 +302,6 @@
<file type="license" path="drivers/postgresql/LICENSE.txt" bundle="drivers.postgresql"/>
<file type="jar" path="drivers/postgresql/postgresql.jar" bundle="drivers.postgresql"/>
<file type="jar" path="drivers/postgis/postgis-jdbc.jar" bundle="drivers.postgresql"/>
<file type="jar" path="drivers/postgis/postgis-jdbc-jtsparser.jar" bundle="drivers.postgresql"/>
<parameter name="serverType" value="timescale"/>
<property name="loginTimeout" value="20"/>
<property name="connectTimeout" value="20"/>
......
......@@ -27,7 +27,9 @@ import org.eclipse.swt.events.TraverseListener;
import org.eclipse.swt.widgets.*;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.exec.DBCException;
import org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCResultSetImpl;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.controls.resultset.ResultSetPreferences;
......@@ -44,6 +46,8 @@ public abstract class BaseValueEditor<T extends Control> implements IValueEditor
private static final String RESULTS_EDIT_CONTEXT_ID = "org.jkiss.dbeaver.ui.context.resultset.edit";
private static final Log log = Log.getLog(BaseValueEditor.class);
protected final IValueController valueController;
protected T control;
protected boolean dirty;
......@@ -142,7 +146,7 @@ public abstract class BaseValueEditor<T extends Control> implements IValueEditor
// Check new focus control in async mode
// (because right now focus is still on edit control)
if (!valueController.isReadOnly()) {
saveValue();
saveValue(false);
}
if (valueController instanceof IMultiController) {
((IMultiController) valueController).closeInlineEditor();
......@@ -151,8 +155,11 @@ public abstract class BaseValueEditor<T extends Control> implements IValueEditor
});
}
protected void saveValue()
{
protected void saveValue() {
saveValue(true);
}
protected void saveValue(boolean showError) {
try {
Object newValue = extractEditorValue();
if (dirty || control instanceof Combo || control instanceof CCombo || control instanceof List) {
......@@ -163,7 +170,11 @@ public abstract class BaseValueEditor<T extends Control> implements IValueEditor
if (valueController instanceof IMultiController) {
((IMultiController) valueController).closeInlineEditor();
}
DBWorkbench.getPlatformUI().showError("Value save", "Can't save edited value", e);
if (showError) {
DBWorkbench.getPlatformUI().showError("Value save", "Can't save edited value", e);
} else {
log.debug("Error saving value: " + e.getMessage());
}
}
}
......@@ -195,7 +206,7 @@ public abstract class BaseValueEditor<T extends Control> implements IValueEditor
}
setDirty(true);
if (autoSaveEnabled && DBWorkbench.getPlatform().getPreferenceStore().getBoolean(ResultSetPreferences.RS_EDIT_AUTO_UPDATE_VALUE)) {
saveValue();
saveValue(false);
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册