From f154206b47b893a0e769bfb46bb834a6776a5883 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Fri, 29 Jan 2021 11:13:12 -0800 Subject: [PATCH] Fix invalid property name on message --- extensions/ql-vscode/CHANGELOG.md | 1 + extensions/ql-vscode/src/pure/messages.ts | 2 +- extensions/ql-vscode/src/run-queries.ts | 4 ++-- extensions/ql-vscode/src/upgrades.ts | 12 +++++++----- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 1ffc2817f..b5f6df748 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -3,6 +3,7 @@ ## [UNRELEASED] - Fix bug where databases are not reregistered when the query server restarts. [#734](https://github.com/github/vscode-codeql/pull/734) +- Fix bug where upgrade requests were erroneously being marked as failed. [#734](https://github.com/github/vscode-codeql/pull/734) ## 1.3.10 - 20 January 2021 diff --git a/extensions/ql-vscode/src/pure/messages.ts b/extensions/ql-vscode/src/pure/messages.ts index 1ea93be65..2e75676e1 100644 --- a/extensions/ql-vscode/src/pure/messages.ts +++ b/extensions/ql-vscode/src/pure/messages.ts @@ -479,7 +479,7 @@ export interface CompileUpgradeSequenceResult { /** * The compiled upgrades as a single file. */ - compiledUpgrades?: string; + compiledUpgrade?: string; /** * Any errors that occurred when checking the scripts. */ diff --git a/extensions/ql-vscode/src/run-queries.ts b/extensions/ql-vscode/src/run-queries.ts index 0125d32fc..b89b0331a 100644 --- a/extensions/ql-vscode/src/run-queries.ts +++ b/extensions/ql-vscode/src/run-queries.ts @@ -354,14 +354,14 @@ async function compileNonDestructiveUpgrade( reportNoUpgradePath(query); } const result = await compileDatabaseUpgradeSequence(qs, query.dbItem, scripts, upgradeTemp, progress, token); - if (result.compiledUpgrades === undefined) { + if (result.compiledUpgrade === undefined) { const error = result.error || '[no error message available]'; throw new Error(error); } // We can upgrade to the actual target query.program.dbschemePath = query.queryDbscheme; // We are new enough that we will always support single file upgrades. - return result.compiledUpgrades; + return result.compiledUpgrade; } diff --git a/extensions/ql-vscode/src/upgrades.ts b/extensions/ql-vscode/src/upgrades.ts index 204adb829..3b596296a 100644 --- a/extensions/ql-vscode/src/upgrades.ts +++ b/extensions/ql-vscode/src/upgrades.ts @@ -20,9 +20,9 @@ const MAX_UPGRADE_MESSAGE_LINES = 10; /** * Check that we support non-destructive upgrades. - * - * This requires 3 features. The ability to compile an upgrade sequence; The ability to - * run a non-destructive upgrades as a query; the ability to specify a target when + * + * This requires 3 features. The ability to compile an upgrade sequence; The ability to + * run a non-destructive upgrades as a query; the ability to specify a target when * resolving upgrades. We check for a version of codeql that has all three features. */ export async function hasNondestructiveUpgradeCapabilities(qs: qsClient.QueryServerClient): Promise { @@ -34,12 +34,14 @@ export async function hasNondestructiveUpgradeCapabilities(qs: qsClient.QuerySer * Compile a database upgrade sequence. * Callers must check that this is valid with the current queryserver first. */ -export async function compileDatabaseUpgradeSequence(qs: qsClient.QueryServerClient, +export async function compileDatabaseUpgradeSequence( + qs: qsClient.QueryServerClient, db: DatabaseItem, resolvedSequence: string[], currentUpgradeTmp: tmp.DirectoryResult, progress: ProgressCallback, - token: vscode.CancellationToken): Promise { + token: vscode.CancellationToken +): Promise { if (db.contents === undefined || db.contents.dbSchemeUri === undefined) { throw new Error('Database is invalid, and cannot be upgraded.'); }