From 4dfec7014cdb39a88f06ee6bb0c2bc7a55ec88e2 Mon Sep 17 00:00:00 2001
From: alexet <alexet@semmle.com>
Date: Wed, 27 Jan 2021 18:18:34 +0000
Subject: [PATCH] Adress comments

---
 extensions/ql-vscode/src/pure/messages.ts | 4 ++--
 extensions/ql-vscode/src/run-queries.ts   | 7 +++----
 extensions/ql-vscode/src/upgrades.ts      | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/extensions/ql-vscode/src/pure/messages.ts b/extensions/ql-vscode/src/pure/messages.ts
index eb7d0099c..1ea93be65 100644
--- a/extensions/ql-vscode/src/pure/messages.ts
+++ b/extensions/ql-vscode/src/pure/messages.ts
@@ -475,7 +475,7 @@ export interface CompileUpgradeResult {
   error?: string;
 }
 
-export interface CompiledUpgradeSequence {
+export interface CompileUpgradeSequenceResult {
   /**
    * The compiled upgrades as a single file.
    */
@@ -1006,7 +1006,7 @@ export const compileUpgrade = new rpc.RequestType<WithProgressId<CompileUpgradeP
 /**
  * Compile an upgrade script to upgrade a dataset.
  */
-export const compileUpgradeSequence = new rpc.RequestType<WithProgressId<CompileUpgradeSequenceParams>, CompiledUpgradeSequence, void, void>('compilation/compileUpgradeSequence');
+export const compileUpgradeSequence = new rpc.RequestType<WithProgressId<CompileUpgradeSequenceParams>, CompileUpgradeSequenceResult, void, void>('compilation/compileUpgradeSequence');
 
 /**
  * Clear the cache of a dataset
diff --git a/extensions/ql-vscode/src/run-queries.ts b/extensions/ql-vscode/src/run-queries.ts
index 1440a8703..0afb03d2f 100644
--- a/extensions/ql-vscode/src/run-queries.ts
+++ b/extensions/ql-vscode/src/run-queries.ts
@@ -17,7 +17,6 @@ import * as config from './config';
 import { DatabaseItem } from './databases';
 import { getOnDiskWorkspaceFolders, showAndLogErrorMessage } from './helpers';
 import { ProgressCallback, UserCancellationException } from './commandRunner';
-import * as helpers from './helpers';
 import { DatabaseInfo, QueryMetadata, ResultsPaths } from './pure/interface-types';
 import { logger } from './logging';
 import * as messages from './pure/messages';
@@ -331,7 +330,7 @@ async function checkDbschemeCompatibility(
 }
 
 function reportNoUpgradePath(query: QueryInfo) {
-  throw new Error(`Query ${query.program.queryPath} expects database scheme ${query.queryDbscheme}, but the current database has a different scheme, and no database upgrades are available. The current database scheme may be newer than the CodeQL query libraries in your workspace. Please try using a newer version of the query libraries.`);
+  throw new Error(`Query ${query.program.queryPath} expects database scheme ${query.queryDbscheme}, but the current database has a different scheme, and no database upgrades are available. The current database scheme may be newer than the CodeQL query libraries in your workspace.\n\nPlease try using a newer version of the query libraries.`);
 }
 
 /**
@@ -344,7 +343,7 @@ async function compileNonDestructiveUpgrade(
   progress: ProgressCallback,
   token: CancellationToken,
 ): Promise<string> {
-  const searchPath = helpers.getOnDiskWorkspaceFolders();
+  const searchPath = getOnDiskWorkspaceFolders();
 
   if (!query.dbItem?.contents?.dbSchemeUri) {
     throw new Error('Database is invalid, and cannot be upgraded.');
@@ -577,7 +576,7 @@ export async function compileAndRunQueryAgainstDatabase(
       if (result.resultType !== messages.QueryResultType.SUCCESS) {
         const message = result.message || 'Failed to run query';
         logger.log(message);
-        helpers.showAndLogErrorMessage(message);
+        showAndLogErrorMessage(message);
       }
       return {
         query,
diff --git a/extensions/ql-vscode/src/upgrades.ts b/extensions/ql-vscode/src/upgrades.ts
index 8dd7f6fb9..be7852241 100644
--- a/extensions/ql-vscode/src/upgrades.ts
+++ b/extensions/ql-vscode/src/upgrades.ts
@@ -39,12 +39,12 @@ export async function compileDatabaseUpgradeSequence(qs: qsClient.QueryServerCli
   resolvedSequence: string[],
   currentUpgradeTmp: tmp.DirResult,
   progress: ProgressCallback,
-  token: vscode.CancellationToken): Promise<messages.CompiledUpgradeSequence> {
+  token: vscode.CancellationToken): Promise<messages.CompileUpgradeSequenceResult> {
   if (db.contents === undefined || db.contents.dbSchemeUri === undefined) {
     throw new Error('Database is invalid, and cannot be upgraded.');
   }
-  if (!hasNondestructiveUpgradeCapabilities(qs)) {
-    throw new Error('The version of codeql is to old to run non-destructive upgrades.');
+  if (!await hasNondestructiveUpgradeCapabilities(qs)) {
+    throw new Error('The version of codeql is too old to run non-destructive upgrades.');
   }
   // If possible just compile the upgrade sequence
   return await qs.sendRequest(messages.compileUpgradeSequence, {