#2201 Auto-recover after ERD caching

plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorEmbedded.java

@@ -26,8 +26,10 @@ import org.jkiss.dbeaver.ext.erd.ERDConstants;
 import org.jkiss.dbeaver.ext.erd.model.EntityDiagram;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.DBPRefreshableObject;
+import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
 import org.jkiss.dbeaver.model.runtime.load.DatabaseLoadService;
 import org.jkiss.dbeaver.model.struct.*;
 import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
@@ -200,7 +202,13 @@ public class ERDEditorEmbedded extends ERDEditorPart implements IDatabaseEditor,
             monitor.beginTask("Load '" + root.getName() + "' content", 3);
             DBSObjectContainer objectContainer = (DBSObjectContainer) root;
             try {
-                objectContainer.cacheStructure(monitor, DBSObjectContainer.STRUCT_ENTITIES | DBSObjectContainer.STRUCT_ASSOCIATIONS | DBSObjectContainer.STRUCT_ATTRIBUTES);
+                DBUtils.tryExecuteRecover(monitor, objectContainer.getDataSource(), (DBRRunnableWithProgress) param -> {
+                    try {
+                        objectContainer.cacheStructure(monitor, DBSObjectContainer.STRUCT_ENTITIES | DBSObjectContainer.STRUCT_ASSOCIATIONS | DBSObjectContainer.STRUCT_ATTRIBUTES);
+                    } catch (DBException e) {
+                        throw new InvocationTargetException(e);
+                    }
+                });
             } catch (DBException e) {
                 DBUserInterface.getInstance().showError("Cache database model", "Error caching database model", e);
             }