#16219 Add popup suggested to reload metadata if ddl query was executed

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreUtils.java

@@ -808,8 +808,8 @@
  PostgreConstants.TYPE_GEOGRAPHY.equals(typeName);
  }
 
- public static String getRealSchemaName(PostgreDatabase database, String name) {
- return name.replace(PostgreConstants.USER_VARIABLE, database.getMetaContext().getActiveUser());
+ public static String getRealSchemaName(PostgreExecutionContext metaContext, String name) {
+ return name.replace(PostgreConstants.USER_VARIABLE, metaContext.getActiveUser());
  }
 
  /**

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreStructureAssistant.java

@@ -120,7 +120,7 @@
  } else if (!params.isGlobalSearch()) {
  // Limit object search with search path
  for (String sn : executionContext.getSearchPath()) {
- PostgreSchema schema = database.getSchema(monitor, PostgreUtils.getRealSchemaName(database, sn));
+ PostgreSchema schema = database.getSchema(monitor, PostgreUtils.getRealSchemaName(executionContext, sn));
  if (schema != null) {
  nsList.add(schema);
  }
@@ -190,7 +190,6 @@
  }
  queryParams.setMaxResults(params.getMaxResults() - objects.size());
  String sql = buildFindQuery(queryParams);
-
  // Load tables
  try (JDBCPreparedStatement dbStat = session.prepareStatement(sql)) {
  fillParams(dbStat, params, schemas, params.isSearchInDefinitions());
@@ -213,7 +212,7 @@
  public DBSObject resolveObject(DBRProgressMonitor monitor) throws DBException {
  PostgreTableBase table = tableSchema.getTable(monitor, tableId);
  if (table == null) {
- throw new DBException("Table '" + tableName + "' not found in schema '" + tableSchema.getName() + "'");
+ throw new DBException("Table '" + tableName + "' not found in schema '" + tableSchema.getName() + "' by id " + tableId);
  }
  return table;
  }

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCRemoteInstance.java

@@ -180,7 +180,7 @@
  }
  }
 
- @NotNull
+ @Nullable
  @Override
  public JDBCExecutionContext getDefaultContext(DBRProgressMonitor monitor, boolean meta) {
  if (sharedInstance != null) {
@@ -189,7 +189,7 @@
  return getDefaultContext(meta);
  }
 
- @NotNull
+ @Nullable
  public JDBCExecutionContext getDefaultContext(boolean meta) {
  if (sharedInstance != null) {
  return sharedInstance.getDefaultContext(meta);

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNModel.java

@@ -209,7 +209,7 @@ public DBNDatabaseNode getNodeByObject(DBSObject object)
  }
  }
  }
- // Get just first one
+ // Get just the first one
  return nodeList.get(0);
  } else {
  // Never be here

plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java

@@ -81,6 +81,7 @@
 import org.jkiss.dbeaver.model.impl.DefaultServerOutputReader;
 import org.jkiss.dbeaver.model.impl.sql.SQLQueryTransformerCount;
 import org.jkiss.dbeaver.model.messages.ModelMessages;
+import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
 import org.jkiss.dbeaver.model.navigator.DBNUtils;
 import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
 import org.jkiss.dbeaver.model.qm.QMUtils;
@@ -95,6 +96,8 @@
 import org.jkiss.dbeaver.model.struct.DBSInstance;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSObjectState;
+import org.jkiss.dbeaver.model.struct.rdb.DBSCatalog;
+import org.jkiss.dbeaver.model.struct.rdb.DBSSchema;
 import org.jkiss.dbeaver.registry.DataSourceUtils;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.runtime.ui.DBPPlatformUI.UserChoiceResponse;
@@ -128,6 +131,8 @@
 import org.jkiss.dbeaver.ui.editors.sql.variables.SQLVariablesPanel;
 import org.jkiss.dbeaver.ui.editors.text.ScriptPositionColumn;
 import org.jkiss.dbeaver.ui.navigator.INavigatorModelView;
+import org.jkiss.dbeaver.ui.navigator.actions.NavigatorHandlerRefresh;
+import org.jkiss.dbeaver.ui.notifications.NotificationUtils;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.dbeaver.utils.PrefUtils;
 import org.jkiss.dbeaver.utils.ResourceUtils;
@@ -144,6 +149,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * SQL Executor
@@ -184,7 +190,7 @@
 
  public static final String VIEW_PART_PROP_NAME = "org.jkiss.dbeaver.ui.editors.sql.SQLEditor";
 
-
+ private static final String REFRESH_DATA_SOURCE_ON_DDL_QUERY_POPUP_ID_PART = "refreshDataSourceOnDdlQuery";
 
  public static final String DEFAULT_TITLE_PATTERN = "<${" + SQLPreferenceConstants.VAR_CONNECTION_NAME + "}> ${" + SQLPreferenceConstants.VAR_FILE_NAME + "}";
  public static final String DEFAULT_SCRIPT_FILE_NAME = "Script";
@@ -325,7 +331,13 @@
  return executionContextProvider.getExecutionContext();
  }
  if (dataSourceContainer != null && !SQLEditorUtils.isOpenSeparateConnection(dataSourceContainer)) {
- return DBUtils.getDefaultContext(getDataSource(), false);
+ try {
+ return DBUtils.getDefaultContext(getDataSource(), false);
+ } catch (IllegalStateException e) {
+ // Probably we are in the metadata refresh state in the single connection mode
+ log.debug(e);
+ return null;
+ }
  }
  return null;
  }
@@ -4152,6 +4164,7 @@
  private final ITextSelection originalSelection = (ITextSelection) getSelectionProvider().getSelection();
  private int topOffset, visibleLength;
  private boolean closeTabOnError;
+ private boolean ddlQueryMet = false;
  private SQLQueryListener extListener;
 
  private SQLEditorQueryListener(QueryProcessor queryProcessor, boolean closeTabOnError) {
@@ -4227,8 +4240,10 @@
  @Override
  public void onEndQuery(final DBCSession session, final SQLQueryResult result, DBCStatistics statistics) {
  try {
+ SQLQuery query = result.getStatement();
+ ddlQueryMet |= query.getType() == SQLQueryType.DDL;
  synchronized (runningQueries) {
- runningQueries.remove(result.getStatement());
+ runningQueries.remove(query);
  }
  queryProcessor.curJobRunning.decrementAndGet();
  if (getTotalQueryRunning() <= 0) {
@@ -4240,7 +4255,9 @@
  updateDirtyFlag();
  });
  }
-
+ if (ddlQueryMet && query.equals(queryProcessor.curJob.getLastQuery())) {
+ showMetadataChangedNotification();
+ }
  if (isDisposed()) {
  return;
  }
@@ -4260,6 +4277,74 @@
  }
  }
  }
+
+ private void showMetadataChangedNotification() {
+ DBPDataSource dataSource = getDataSource();
+ if (dataSource == null) {
+ return;
+ }
+ UIUtils.runInUI(m -> {
+ NotificationUtils.sendNotification(
+ REFRESH_DATA_SOURCE_ON_DDL_QUERY_POPUP_ID_PART + dataSource.getContainer().getId(),
+ NLS.bind(SQLEditorMessages.sql_editor_refresh_data_source_on_ddl_query_popup_title, dataSource.getName()),
+ SQLEditorMessages.sql_editor_refresh_data_source_on_ddl_query_popup_text,
+ DBPMessageType.WARNING,
+ () -> {
+ UIUtils.runUIJob("Refreshing data source metadata after statement execution", monitor -> {
+ DBSInstance defaultObject = getExecutionContext().getOwnerInstance();
+ DBNDatabaseNode defObjNode = DBNUtils.getNodeByObject(monitor, defaultObject, true);
+ DBSObject oldDefaultObject = null;
+ if (defaultObject != null) {
+ if (defObjNode != null) {
+ oldDefaultObject = defObjNode.getObject();
+ } else {
+ log.warn("Failed to resolve node for default object. Default object wouldn't be refreshed.");
+ }
+ }
+ DBNDatabaseNode dsNode = DBNUtils.getNodeByObject(monitor, dataSource, true);
+
+ if (NavigatorHandlerRefresh.refresh(SQLEditor.this, List.of(dsNode)).join(0, monitor.getNestedMonitor())) {
+ if (oldDefaultObject != null) {
+ List<DBCExecutionContext> executionContexts = Stream.of(
+ getExecutionContext(), 
+ dataSource.getDefaultInstance().getDefaultContext(monitor, true),
+ dataSource.getDefaultInstance().getDefaultContext(monitor, false)
+ ).distinct().collect(Collectors.toList());
+ for (DBCExecutionContext executionContext: executionContexts) {
+ DBCExecutionContextDefaults editorContextDefaults = executionContext.getContextDefaults();
+ if (editorContextDefaults != null) {
+ DBSObject newDefaultObject = defObjNode.getObject();
+ if (defObjNode.getObject() != oldDefaultObject
+ && getExecutionContext().getOwnerInstance() == oldDefaultObject
+ ) {
+ try {
+ if (oldDefaultObject instanceof DBSCatalog
+ && oldDefaultObject == editorContextDefaults.getDefaultCatalog()
+ ) {
+ monitor.subTask("Change default catalog");
+ editorContextDefaults.setDefaultCatalog(monitor, (DBSCatalog) newDefaultObject, null);
+ } else if (oldDefaultObject instanceof DBSSchema
+ && oldDefaultObject == editorContextDefaults.getDefaultSchema()
+ ) {
+ monitor.subTask("Change default schema");
+ editorContextDefaults.setDefaultSchema(monitor, (DBSSchema) newDefaultObject);
+ }
+ } catch (Throwable ex) {
+ log.error("Failed to refresh execution context default object", ex);
+ }
+ }
+ } else {
+ log.trace("Execution context doesn't support explicit default object refresh."
+ + "Data context node object identity is mandatory.");
+ }
+ }
+ }
+ }
+ });
+ }
+ );
+ });
+ }
 
  private void processQueryResult(DBRProgressMonitor monitor, SQLQueryResult result, DBCStatistics statistics) {
  dumpQueryServerOutput(result);

plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/execute/SQLQueryJob.java

@@ -161,7 +161,7 @@ public void setFetchResultSets(boolean fetchResultSets)
 
  public SQLScriptElement getLastQuery()
  {
- return queries.isEmpty() ? null : queries.get(0);
+ return queries.isEmpty() ? null : queries.get(queries.size() - 1);
  }
 
  public SQLScriptElement getLastGoodQuery() {

plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/internal/SQLEditorMessages.java

@@ -370,6 +370,8 @@ public class SQLEditorMessages extends NLS {
 
  public static String sql_editor_panel_output_filter_message;
  public static String sql_editor_panel_output_filter_hint;
+ public static String sql_editor_refresh_data_source_on_ddl_query_popup_title;
+ public static String sql_editor_refresh_data_source_on_ddl_query_popup_text;
 
  static {
  // initialize resource bundle

plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/internal/SQLEditorMessages.properties

@@ -349,6 +349,7 @@ sql_editor_confirm_no_fetch_result_for_big_script_question = Large script execut
 sql_editor_confirm_no_fetch_result_for_big_script_yes = Yes
 sql_editor_confirm_no_fetch_result_for_big_script_no = No
 sql_editor_confirm_no_fetch_result_for_big_script_remember = Don't show again for this editor till the end of the session
-
 sql_editor_panel_output_filter_message = Enter a part of a message to search for here
 sql_editor_panel_output_filter_hint = Filter visible output
+sql_editor_refresh_data_source_on_ddl_query_popup_title = Click to reload metadata for {0}
+sql_editor_refresh_data_source_on_ddl_query_popup_text = Some DDL statements were executed

plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerRefresh.java

@@ -19,7 +19,9 @@
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -30,6 +32,7 @@
 import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.handlers.HandlerUtil;
+import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.navigator.*;
@@ -64,7 +67,7 @@
 
  // If navigator refresh is possible then do not refresh active part directly
  // Because active part should be refresh in navigator event handler
- if (refreshInNavigator(event, workbenchPart)) {
+ if (refreshInNavigator(event, workbenchPart).initiated) {
  return null;
  }
 
@@ -83,18 +86,17 @@
  if (((IRefreshablePart) workbenchPart).refreshPart(this, true) == IRefreshablePart.RefreshResult.CANCELED) {
  return null;
  }
- //return null;
  }
 
  return null;
  }
 
- private boolean refreshInNavigator(ExecutionEvent event, IWorkbenchPart workbenchPart) {
+ private RefreshStatus refreshInNavigator(ExecutionEvent event, IWorkbenchPart workbenchPart) {
  // Try to get navigator view and refresh node
  INavigatorModelView navigatorView = GeneralUtils.adapt(workbenchPart, INavigatorModelView.class);
  if (navigatorView == null) {
  // Nothing to refresh
- return false;
+ return RefreshStatus.skipped();
  }
  final List<DBNNode> refreshObjects = new ArrayList<>();
  final ISelection selection = HandlerUtil.getCurrentSelection(event);
@@ -118,18 +120,28 @@
  }
  }
  }
-
+
+ return prepareRefresh(this, refreshObjects);
+ }
+
+ @NotNull
+ public static RefreshStatus refresh(@NotNull Object source, @NotNull List<? extends DBNNode> refreshObjects) {
+ return prepareRefresh(source, refreshObjects);
+ }
+
+ @NotNull
+ private static RefreshStatus prepareRefresh(@NotNull Object source, @NotNull List<? extends DBNNode> refreshObjects) {
  // Check for open editors with selected objects
  if (!refreshObjects.isEmpty()) {
  for (IEditorReference er : UIUtils.getActiveWorkbenchWindow().getActivePage().getEditorReferences()) {
  IEditorPart editorPart = er.getEditor(false);
  if (editorPart instanceof IRefreshablePart && editorPart.getEditorInput() instanceof DatabaseEditorInput && editorPart.isDirty()) {
  DBNDatabaseNode editorNode = ((DatabaseEditorInput<?>) editorPart.getEditorInput()).getNavigatorNode();
- for (Iterator<DBNNode> iter = refreshObjects.iterator(); iter.hasNext(); ) {
+ for (Iterator<? extends DBNNode> iter = refreshObjects.iterator(); iter.hasNext();) {
  DBNNode nextNode = iter.next();
  if (nextNode == editorNode || editorNode.isChildOf(nextNode) || nextNode.isChildOf(editorNode)) {
- if (((IRefreshablePart) editorPart).refreshPart(this, true) == IRefreshablePart.RefreshResult.CANCELED) {
- return true;
+ if (((IRefreshablePart) editorPart).refreshPart(source, true) == IRefreshablePart.RefreshResult.CANCELED) {
+ return RefreshStatus.completed();
  }
  if (nextNode == editorNode) {
  iter.remove();
@@ -142,12 +154,12 @@
 
  // Refresh objects
  if (!refreshObjects.isEmpty()) {
- return refreshNavigator(refreshObjects);
+ return RefreshStatus.initiated(refreshNavigator(refreshObjects));
  }
- return false;
+ return RefreshStatus.skipped();
  }
 
- public static boolean refreshNavigator(final Collection<? extends DBNNode> refreshObjects)
+ public static Job refreshNavigator(final Collection<? extends DBNNode> refreshObjects)
  {
  Job refreshJob = new AbstractJob("Refresh navigator object(s)") {
  @Override
@@ -215,7 +227,7 @@
  refreshJob.setUser(true);
  refreshJob.schedule();
 
- return true;
+ return refreshJob;
  }
 
  private static boolean showConfirmation(DBNNode node) {