ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when disconnecting database (#15146)

Browse Source 
* Fix error when disconnecting database

* correctly print error
This commit is contained in:
Charles Gagnon
2021-04-16 09:24:22 -07:00
committed by GitHub
parent f60d0fa9e5
commit dcd952b903
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/workbench/contrib/query/browser/queryActions.ts
View File

@@ -44,7 +44,7 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf
import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement';
import { ILogService } from 'vs/platform/log/common/log'; import { ILogService } from 'vs/platform/log/common/log';
import { IRange } from 'vs/editor/common/core/range'; import { IRange } from 'vs/editor/common/core/range';
import { onUnexpectedError } from 'vs/base/common/errors'; import { getErrorMessage, onUnexpectedError } from 'vs/base/common/errors';
/** /**
* Action class that query-based Actions will extend. This base class automatically handles activating and * Action class that query-based Actions will extend. This base class automatically handles activating and
@@ -684,6 +684,11 @@ export class ListDatabasesActionItem extends Disposable implements IActionViewIt
// PRIVATE HELPERS ///////////////////////////////////////////////////// // PRIVATE HELPERS /////////////////////////////////////////////////////
private databaseSelected(dbName: string): void { private databaseSelected(dbName: string): void {
// If dbName is blank (this can happen for example when setting the box value to empty when disconnecting)
// then just no-op, there's nothing we can do.
if (!dbName) {
return;
}
if (!this._editor.input) { if (!this._editor.input) {
this.logService.error('editor input was null'); this.logService.error('editor input was null');
return; return;
@@ -714,7 +719,7 @@ export class ListDatabasesActionItem extends Disposable implements IActionViewIt
this.resetDatabaseName(); this.resetDatabaseName();
this.notificationService.notify({ this.notificationService.notify({
severity: Severity.Error, severity: Severity.Error,
message: nls.localize('changeDatabase.failedWithError', "Failed to change database {0}", error) message: nls.localize('changeDatabase.failedWithError', "Failed to change database: {0}", getErrorMessage(error))
}); });
}); });
} }