diff --git a/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/templates/SQLEntityResolver.java b/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/templates/SQLEntityResolver.java index cd0689d661c02fa4f048296264c0f1c95832bee3..cab9ac00e8203357feecf7888f147a2b3c8ae54e 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/templates/SQLEntityResolver.java +++ b/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/templates/SQLEntityResolver.java @@ -71,6 +71,10 @@ class SQLEntityResolver extends SQLObjectResolver { } else { objectContainer = DBUtils.getSelectedObject(executionContext, DBSObjectContainer.class); } + if (objectContainer == null) { + // Possibly neither catalogs nor schemas are supported + objectContainer = DBUtils.getAdapter(DBSObjectContainer.class, executionContext.getDataSource()); + } if (objectContainer != null) { makeProposalsFromChildren(monitor, objectContainer, entities); }