ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #4384 add await on disconnect (#4389)

Browse Source 
* Fixed #4384 add await on disconnect

* Resolve PR comment
This commit is contained in:
Yurong He
2019-03-12 13:06:02 -07:00
committed by GitHub
parent d555dcb6d7
commit 08c7cc0918
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/parts/notebook/models/notebookModel.ts
View File

@@ -712,11 +712,11 @@ export class NotebookModel extends Disposable implements INotebookModel {
if (this.notebookOptions && this.notebookOptions.connectionService) { if (this.notebookOptions && this.notebookOptions.connectionService) {
let connectionService = this.notebookOptions.connectionService; let connectionService = this.notebookOptions.connectionService;
if (this._otherConnections) { if (this._otherConnections) {
this._otherConnections.forEach(conn => connectionService.disconnect(conn).catch(e => console.log(e))); notebookUtils.asyncForEach(this._otherConnections, async (conn) => await connectionService.disconnect(conn).catch(e => console.log(e)));
this._otherConnections = []; this._otherConnections = [];
} }
if (this._activeConnection) { if (this._activeConnection) {
this.notebookOptions.connectionService.disconnect(this._activeConnection).catch(e => console.log(e)); await this.notebookOptions.connectionService.disconnect(this._activeConnection).catch(e => console.log(e));
this._activeConnection = undefined; this._activeConnection = undefined;
} }
} }

6
src/sql/parts/notebook/notebookUtils.ts
View File

@@ -117,3 +117,9 @@ export function tryMatchCellMagic(input: string): string {
let magicName = match && match[1]; let magicName = match && match[1];
return magicName; return magicName;
} }
export async function asyncForEach(array: any, callback: any): Promise<any> {
for (let index = 0; index < array.length; index++) {
await callback(array[index], index, array);
}
}