From 27ca9b13f873b10cfe45de7bcbfeb6189012cbdb Mon Sep 17 00:00:00 2001 From: Kevin Cunnane Date: Thu, 12 Jul 2018 17:21:57 -0700 Subject: [PATCH] Fix #1916 Object explorer context object doesn't include database name (#1917) --- src/sql/parts/dashboard/widgets/explorer/explorerTree.ts | 1 - src/sql/parts/objectExplorer/viewlet/serverTreeController.ts | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts b/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts index 9f03352c19..7d999d6f77 100644 --- a/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts +++ b/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts @@ -15,7 +15,6 @@ import { import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; import * as Constants from 'sql/parts/connection/common/constants'; -import { OEAction } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import { IScriptingService } from 'sql/services/scripting/scriptingService'; diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeController.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeController.ts index 5ba769d34d..8901d1ec14 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeController.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeController.ts @@ -18,6 +18,7 @@ import { ServerTreeActionProvider } from 'sql/parts/objectExplorer/viewlet/serve import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; import { OpenMode } from 'vs/base/parts/tree/browser/treeDefaults'; +import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; /** * Extends the tree controller to handle clicks on the tree elements @@ -78,7 +79,10 @@ export class ServerTreeController extends treedefaults.DefaultController { if (element instanceof TreeNode) { let context = new ObjectExplorerActionsContext(); context.nodeInfo = element.toNodeInfo(); + // Note: getting DB name before, but intentionally not using treeUpdateUtils.getConnectionProfile as it replaces + // the connection ID with a new one. This breaks a number of internal tasks context.connectionProfile = element.getConnectionProfile().toIConnectionProfile(); + context.connectionProfile.databaseName = element.getDatabaseName(); actionContext = context; } else if (element instanceof ConnectionProfile) { let context = new ObjectExplorerActionsContext();