From d2d1a0972302be8a77717b817933ef9f2e232316 Mon Sep 17 00:00:00 2001 From: shati-patel <42641846+shati-patel@users.noreply.github.com> Date: Thu, 15 Jul 2021 20:28:04 +0100 Subject: [PATCH] Update changelog --- extensions/ql-vscode/CHANGELOG.md | 2 ++ extensions/ql-vscode/src/extension.ts | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 74a3f7873..e420de7a1 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -2,6 +2,8 @@ ## [UNRELEASED] +- Add a command _CodeQL: Run Query on Multiple Databases_, which lets users select multiple databases to run a query on. [#898](https://github.com/github/vscode-codeql/pull/898) + ## 1.5.2 - 13 July 2021 - Add the _Add Database Source to Workspace_ command to the right-click context menu in the databases view. This lets users re-add a database's source folder to the workspace and browse the source code. [#891](https://github.com/github/vscode-codeql/pull/891) diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts index d737b1282..0f2f2f47b 100644 --- a/extensions/ql-vscode/src/extension.ts +++ b/extensions/ql-vscode/src/extension.ts @@ -472,14 +472,14 @@ async function activateWithInstalledDistribution( ): Promise { if (qs !== undefined) { // If no databaseItem is specified, use the database currently selected in the Databases UI - const dbItem = databaseItem || await databaseUI.getDatabaseItem(progress, token); - if (dbItem === undefined) { + databaseItem = databaseItem || await databaseUI.getDatabaseItem(progress, token); + if (databaseItem === undefined) { throw new Error('Can\'t run query without a selected database'); } const info = await compileAndRunQueryAgainstDatabase( cliServer, qs, - dbItem, + databaseItem, quickEval, selectedQuery, progress,