From e16b6d9ac8d902b1c55a109611b2d35ec3fddb2e Mon Sep 17 00:00:00 2001
From: Charis Kyriakou <charisk@users.noreply.github.com>
Date: Fri, 17 Feb 2023 16:28:04 +0000
Subject: [PATCH 1/5] Rename databases.ts to local-databases.ts

---
 extensions/ql-vscode/src/astViewer.ts                       | 2 +-
 extensions/ql-vscode/src/compare/compare-view.ts            | 2 +-
 extensions/ql-vscode/src/contextual/astBuilder.ts           | 2 +-
 extensions/ql-vscode/src/contextual/fileRangeFromURI.ts     | 2 +-
 extensions/ql-vscode/src/contextual/locationFinder.ts       | 2 +-
 extensions/ql-vscode/src/contextual/queryResolver.ts        | 2 +-
 extensions/ql-vscode/src/contextual/templateProvider.ts     | 2 +-
 extensions/ql-vscode/src/databaseFetcher.ts                 | 2 +-
 extensions/ql-vscode/src/databases-ui.ts                    | 2 +-
 extensions/ql-vscode/src/extension.ts                       | 2 +-
 extensions/ql-vscode/src/interface-utils.ts                 | 2 +-
 extensions/ql-vscode/src/interface.ts                       | 6 +++++-
 .../ql-vscode/src/legacy-query-server/legacyRunner.ts       | 2 +-
 extensions/ql-vscode/src/legacy-query-server/run-queries.ts | 2 +-
 extensions/ql-vscode/src/legacy-query-server/upgrades.ts    | 2 +-
 .../ql-vscode/src/{databases.ts => local-databases.ts}      | 0
 .../ql-vscode/src/query-history/query-history-manager.ts    | 2 +-
 extensions/ql-vscode/src/query-server/query-runner.ts       | 2 +-
 extensions/ql-vscode/src/query-server/run-queries.ts        | 2 +-
 extensions/ql-vscode/src/queryRunner.ts                     | 2 +-
 extensions/ql-vscode/src/run-queries-shared.ts              | 2 +-
 extensions/ql-vscode/src/test-adapter.ts                    | 2 +-
 .../vscode-tests/cli-integration/databaseFetcher.test.ts    | 2 +-
 .../test/vscode-tests/cli-integration/queries.test.ts       | 2 +-
 extensions/ql-vscode/test/vscode-tests/global.helper.ts     | 2 +-
 .../test/vscode-tests/minimal-workspace/databases.test.ts   | 2 +-
 .../test/vscode-tests/no-workspace/astViewer.test.ts        | 2 +-
 .../vscode-tests/no-workspace/contextual/astBuilder.test.ts | 2 +-
 .../no-workspace/contextual/fileRangeFromURI.test.ts        | 2 +-
 .../no-workspace/contextual/queryResolver.test.ts           | 2 +-
 .../test/vscode-tests/no-workspace/interface-utils.test.ts  | 2 +-
 .../query-history/history-tree-data-provider.test.ts        | 2 +-
 .../query-history/query-history-manager.test.ts             | 2 +-
 .../query-history/variant-analysis-history.test.ts          | 2 +-
 .../test/vscode-tests/no-workspace/run-queries.test.ts      | 2 +-
 .../test/vscode-tests/no-workspace/test-adapter.test.ts     | 2 +-
 36 files changed, 39 insertions(+), 35 deletions(-)
 rename extensions/ql-vscode/src/{databases.ts => local-databases.ts} (100%)

diff --git a/extensions/ql-vscode/src/astViewer.ts b/extensions/ql-vscode/src/astViewer.ts
index 20ed66145bf..3c5d2bdf833 100644
--- a/extensions/ql-vscode/src/astViewer.ts
+++ b/extensions/ql-vscode/src/astViewer.ts
@@ -15,7 +15,7 @@ import {
 } from "vscode";
 import { basename } from "path";
 
-import { DatabaseItem } from "./databases";
+import { DatabaseItem } from "./local-databases";
 import { UrlValue, BqrsId } from "./pure/bqrs-cli-types";
 import { showLocation } from "./interface-utils";
 import {
diff --git a/extensions/ql-vscode/src/compare/compare-view.ts b/extensions/ql-vscode/src/compare/compare-view.ts
index 1d31ccb29bf..46c35562a51 100644
--- a/extensions/ql-vscode/src/compare/compare-view.ts
+++ b/extensions/ql-vscode/src/compare/compare-view.ts
@@ -7,7 +7,7 @@ import {
 } from "../pure/interface-types";
 import { Logger } from "../common";
 import { CodeQLCliServer } from "../cli";
-import { DatabaseManager } from "../databases";
+import { DatabaseManager } from "../local-databases";
 import { jumpToLocation } from "../interface-utils";
 import {
   transformBqrsResultSet,
diff --git a/extensions/ql-vscode/src/contextual/astBuilder.ts b/extensions/ql-vscode/src/contextual/astBuilder.ts
index 88cd873f742..16416f07aba 100644
--- a/extensions/ql-vscode/src/contextual/astBuilder.ts
+++ b/extensions/ql-vscode/src/contextual/astBuilder.ts
@@ -1,6 +1,6 @@
 import { CodeQLCliServer } from "../cli";
 import { DecodedBqrsChunk, BqrsId, EntityValue } from "../pure/bqrs-cli-types";
-import { DatabaseItem } from "../databases";
+import { DatabaseItem } from "../local-databases";
 import { ChildAstItem, AstItem } from "../astViewer";
 import fileRangeFromURI from "./fileRangeFromURI";
 import { Uri } from "vscode";
diff --git a/extensions/ql-vscode/src/contextual/fileRangeFromURI.ts b/extensions/ql-vscode/src/contextual/fileRangeFromURI.ts
index e242d0344a2..47f0452063e 100644
--- a/extensions/ql-vscode/src/contextual/fileRangeFromURI.ts
+++ b/extensions/ql-vscode/src/contextual/fileRangeFromURI.ts
@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 
 import { UrlValue, LineColumnLocation } from "../pure/bqrs-cli-types";
 import { isEmptyPath } from "../pure/bqrs-utils";
-import { DatabaseItem } from "../databases";
+import { DatabaseItem } from "../local-databases";
 
 export default function fileRangeFromURI(
   uri: UrlValue | undefined,
diff --git a/extensions/ql-vscode/src/contextual/locationFinder.ts b/extensions/ql-vscode/src/contextual/locationFinder.ts
index 8809945bc8d..86af8621169 100644
--- a/extensions/ql-vscode/src/contextual/locationFinder.ts
+++ b/extensions/ql-vscode/src/contextual/locationFinder.ts
@@ -9,7 +9,7 @@ import {
   ResultSetSchema,
 } from "../pure/bqrs-cli-types";
 import { CodeQLCliServer } from "../cli";
-import { DatabaseManager, DatabaseItem } from "../databases";
+import { DatabaseManager, DatabaseItem } from "../local-databases";
 import fileRangeFromURI from "./fileRangeFromURI";
 import { ProgressCallback } from "../commandRunner";
 import { KeyType } from "./keyType";
diff --git a/extensions/ql-vscode/src/contextual/queryResolver.ts b/extensions/ql-vscode/src/contextual/queryResolver.ts
index ca7b3ab61da..550d1b6b4a7 100644
--- a/extensions/ql-vscode/src/contextual/queryResolver.ts
+++ b/extensions/ql-vscode/src/contextual/queryResolver.ts
@@ -12,7 +12,7 @@ import {
 } from "../helpers";
 import { KeyType, kindOfKeyType, nameOfKeyType, tagOfKeyType } from "./keyType";
 import { CodeQLCliServer } from "../cli";
-import { DatabaseItem } from "../databases";
+import { DatabaseItem } from "../local-databases";
 import { extLogger } from "../common";
 import { createInitialQueryInfo } from "../run-queries-shared";
 import { CancellationToken, Uri } from "vscode";
diff --git a/extensions/ql-vscode/src/contextual/templateProvider.ts b/extensions/ql-vscode/src/contextual/templateProvider.ts
index 6ec766513e7..448d3673285 100644
--- a/extensions/ql-vscode/src/contextual/templateProvider.ts
+++ b/extensions/ql-vscode/src/contextual/templateProvider.ts
@@ -17,7 +17,7 @@ import {
   zipArchiveScheme,
 } from "../archive-filesystem-provider";
 import { CodeQLCliServer } from "../cli";
-import { DatabaseManager } from "../databases";
+import { DatabaseManager } from "../local-databases";
 import { CachedOperation } from "../helpers";
 import { ProgressCallback, withProgress } from "../commandRunner";
 import AstBuilder from "./astBuilder";
diff --git a/extensions/ql-vscode/src/databaseFetcher.ts b/extensions/ql-vscode/src/databaseFetcher.ts
index dd944ba8155..1e31e7857a2 100644
--- a/extensions/ql-vscode/src/databaseFetcher.ts
+++ b/extensions/ql-vscode/src/databaseFetcher.ts
@@ -16,7 +16,7 @@ import { basename, join } from "path";
 import * as Octokit from "@octokit/rest";
 import { retry } from "@octokit/plugin-retry";
 
-import { DatabaseManager, DatabaseItem } from "./databases";
+import { DatabaseManager, DatabaseItem } from "./local-databases";
 import { showAndLogInformationMessage, tmpDir } from "./helpers";
 import { reportStreamProgress, ProgressCallback } from "./commandRunner";
 import { extLogger } from "./common";
diff --git a/extensions/ql-vscode/src/databases-ui.ts b/extensions/ql-vscode/src/databases-ui.ts
index 8bd388edb97..f80b0f8394a 100644
--- a/extensions/ql-vscode/src/databases-ui.ts
+++ b/extensions/ql-vscode/src/databases-ui.ts
@@ -20,7 +20,7 @@ import {
   DatabaseChangedEvent,
   DatabaseItem,
   DatabaseManager,
-} from "./databases";
+} from "./local-databases";
 import {
   commandRunner,
   commandRunnerWithProgress,
diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
index 9956d786d12..4dc905b9ddd 100644
--- a/extensions/ql-vscode/src/extension.ts
+++ b/extensions/ql-vscode/src/extension.ts
@@ -43,7 +43,7 @@ import {
   QueryServerConfigListener,
 } from "./config";
 import { install } from "./languageSupport";
-import { DatabaseItem, DatabaseManager } from "./databases";
+import { DatabaseItem, DatabaseManager } from "./local-databases";
 import { DatabaseUI } from "./databases-ui";
 import {
   TemplatePrintAstProvider,
diff --git a/extensions/ql-vscode/src/interface-utils.ts b/extensions/ql-vscode/src/interface-utils.ts
index 9855edfe7c2..effd7e0c60e 100644
--- a/extensions/ql-vscode/src/interface-utils.ts
+++ b/extensions/ql-vscode/src/interface-utils.ts
@@ -15,7 +15,7 @@ import {
   ThemeColor,
 } from "vscode";
 import { tryGetResolvableLocation, isLineColumnLoc } from "./pure/bqrs-utils";
-import { DatabaseItem, DatabaseManager } from "./databases";
+import { DatabaseItem, DatabaseManager } from "./local-databases";
 import { ViewSourceFileMsg } from "./pure/interface-types";
 import { Logger } from "./common";
 import {
diff --git a/extensions/ql-vscode/src/interface.ts b/extensions/ql-vscode/src/interface.ts
index cf27f52db75..411dc12e481 100644
--- a/extensions/ql-vscode/src/interface.ts
+++ b/extensions/ql-vscode/src/interface.ts
@@ -12,7 +12,11 @@ import {
 } from "vscode";
 import * as cli from "./cli";
 import { CodeQLCliServer } from "./cli";
-import { DatabaseEventKind, DatabaseItem, DatabaseManager } from "./databases";
+import {
+  DatabaseEventKind,
+  DatabaseItem,
+  DatabaseManager,
+} from "./local-databases";
 import { showAndLogExceptionWithTelemetry } from "./helpers";
 import {
   asError,
diff --git a/extensions/ql-vscode/src/legacy-query-server/legacyRunner.ts b/extensions/ql-vscode/src/legacy-query-server/legacyRunner.ts
index 933d346cfc1..44eba17d9ed 100644
--- a/extensions/ql-vscode/src/legacy-query-server/legacyRunner.ts
+++ b/extensions/ql-vscode/src/legacy-query-server/legacyRunner.ts
@@ -1,6 +1,6 @@
 import { CancellationToken } from "vscode";
 import { ProgressCallback } from "../commandRunner";
-import { DatabaseItem } from "../databases";
+import { DatabaseItem } from "../local-databases";
 import {
   Dataset,
   deregisterDatabases,
diff --git a/extensions/ql-vscode/src/legacy-query-server/run-queries.ts b/extensions/ql-vscode/src/legacy-query-server/run-queries.ts
index b7ba2dc668f..11253f72921 100644
--- a/extensions/ql-vscode/src/legacy-query-server/run-queries.ts
+++ b/extensions/ql-vscode/src/legacy-query-server/run-queries.ts
@@ -4,7 +4,7 @@ import { CancellationToken, Uri } from "vscode";
 import { LSPErrorCodes, ResponseError } from "vscode-languageclient";
 
 import * as cli from "../cli";
-import { DatabaseItem } from "../databases";
+import { DatabaseItem } from "../local-databases";
 import {
   getOnDiskWorkspaceFolders,
   showAndLogErrorMessage,
diff --git a/extensions/ql-vscode/src/legacy-query-server/upgrades.ts b/extensions/ql-vscode/src/legacy-query-server/upgrades.ts
index 0a5ca5b55bf..0ec182766c8 100644
--- a/extensions/ql-vscode/src/legacy-query-server/upgrades.ts
+++ b/extensions/ql-vscode/src/legacy-query-server/upgrades.ts
@@ -10,7 +10,7 @@ import * as messages from "../pure/legacy-messages";
 import * as qsClient from "./queryserver-client";
 import * as tmp from "tmp-promise";
 import { dirname } from "path";
-import { DatabaseItem } from "../databases";
+import { DatabaseItem } from "../local-databases";
 import { asError, getErrorMessage } from "../pure/helpers-pure";
 import { redactableError } from "../pure/errors";
 
diff --git a/extensions/ql-vscode/src/databases.ts b/extensions/ql-vscode/src/local-databases.ts
similarity index 100%
rename from extensions/ql-vscode/src/databases.ts
rename to extensions/ql-vscode/src/local-databases.ts
diff --git a/extensions/ql-vscode/src/query-history/query-history-manager.ts b/extensions/ql-vscode/src/query-history/query-history-manager.ts
index 647bb425ce5..dda9ad1b22a 100644
--- a/extensions/ql-vscode/src/query-history/query-history-manager.ts
+++ b/extensions/ql-vscode/src/query-history/query-history-manager.ts
@@ -40,7 +40,7 @@ import {
   getQueryText,
   QueryHistoryInfo,
 } from "./query-history-info";
-import { DatabaseManager } from "../databases";
+import { DatabaseManager } from "../local-databases";
 import { registerQueryHistoryScrubber } from "./query-history-scrubber";
 import {
   QueryStatus,
diff --git a/extensions/ql-vscode/src/query-server/query-runner.ts b/extensions/ql-vscode/src/query-server/query-runner.ts
index 755d1d04fef..d80a07cbc80 100644
--- a/extensions/ql-vscode/src/query-server/query-runner.ts
+++ b/extensions/ql-vscode/src/query-server/query-runner.ts
@@ -1,6 +1,6 @@
 import { CancellationToken } from "vscode";
 import { ProgressCallback, UserCancellationException } from "../commandRunner";
-import { DatabaseItem } from "../databases";
+import { DatabaseItem } from "../local-databases";
 import {
   clearCache,
   ClearCacheParams,
diff --git a/extensions/ql-vscode/src/query-server/run-queries.ts b/extensions/ql-vscode/src/query-server/run-queries.ts
index 34e27bbb53d..3cc32f7687b 100644
--- a/extensions/ql-vscode/src/query-server/run-queries.ts
+++ b/extensions/ql-vscode/src/query-server/run-queries.ts
@@ -2,7 +2,7 @@ import { join } from "path";
 import { CancellationToken } from "vscode";
 import * as cli from "../cli";
 import { ProgressCallback } from "../commandRunner";
-import { DatabaseItem } from "../databases";
+import { DatabaseItem } from "../local-databases";
 import {
   getOnDiskWorkspaceFolders,
   showAndLogExceptionWithTelemetry,
diff --git a/extensions/ql-vscode/src/queryRunner.ts b/extensions/ql-vscode/src/queryRunner.ts
index 7c931ab9150..a2e92ee6678 100644
--- a/extensions/ql-vscode/src/queryRunner.ts
+++ b/extensions/ql-vscode/src/queryRunner.ts
@@ -1,7 +1,7 @@
 import { CancellationToken } from "vscode";
 import { CodeQLCliServer } from "./cli";
 import { ProgressCallback } from "./commandRunner";
-import { DatabaseItem } from "./databases";
+import { DatabaseItem } from "./local-databases";
 import { InitialQueryInfo, LocalQueryInfo } from "./query-results";
 import { QueryWithResults } from "./run-queries-shared";
 
diff --git a/extensions/ql-vscode/src/run-queries-shared.ts b/extensions/ql-vscode/src/run-queries-shared.ts
index 6385b9f78de..66f85e7e158 100644
--- a/extensions/ql-vscode/src/run-queries-shared.ts
+++ b/extensions/ql-vscode/src/run-queries-shared.ts
@@ -29,7 +29,7 @@ import { isQuickQueryPath } from "./quick-query";
 import { nanoid } from "nanoid";
 import { CodeQLCliServer } from "./cli";
 import { SELECT_QUERY_NAME } from "./contextual/locationFinder";
-import { DatabaseManager } from "./databases";
+import { DatabaseManager } from "./local-databases";
 import { DecodedBqrsChunk } from "./pure/bqrs-cli-types";
 import { extLogger, Logger } from "./common";
 import { generateSummarySymbolsFile } from "./log-insights/summary-parser";
diff --git a/extensions/ql-vscode/src/test-adapter.ts b/extensions/ql-vscode/src/test-adapter.ts
index c8b0f620c44..326f93456e6 100644
--- a/extensions/ql-vscode/src/test-adapter.ts
+++ b/extensions/ql-vscode/src/test-adapter.ts
@@ -34,7 +34,7 @@ import {
   showAndLogWarningMessage,
 } from "./helpers";
 import { testLogger } from "./common";
-import { DatabaseItem, DatabaseManager } from "./databases";
+import { DatabaseItem, DatabaseManager } from "./local-databases";
 import { asError, getErrorMessage } from "./pure/helpers-pure";
 import { redactableError } from "./pure/errors";
 
diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/databaseFetcher.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/databaseFetcher.test.ts
index 6296fced53b..407c2217653 100644
--- a/extensions/ql-vscode/test/vscode-tests/cli-integration/databaseFetcher.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/databaseFetcher.test.ts
@@ -3,7 +3,7 @@ import { extensions, CancellationToken, Uri, window } from "vscode";
 
 import { CodeQLExtensionInterface } from "../../../src/extension";
 import { CodeQLCliServer } from "../../../src/cli";
-import { DatabaseManager } from "../../../src/databases";
+import { DatabaseManager } from "../../../src/local-databases";
 import {
   importArchiveDatabase,
   promptImportInternetDatabase,
diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts
index d4f328c75db..f4d445efcb8 100644
--- a/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts
@@ -15,7 +15,7 @@ import {
 } from "fs-extra";
 import { load, dump } from "js-yaml";
 
-import { DatabaseItem, DatabaseManager } from "../../../src/databases";
+import { DatabaseItem, DatabaseManager } from "../../../src/local-databases";
 import { CodeQLExtensionInterface } from "../../../src/extension";
 import { cleanDatabases, dbLoc, storagePath } from "../global.helper";
 import { importArchiveDatabase } from "../../../src/databaseFetcher";
diff --git a/extensions/ql-vscode/test/vscode-tests/global.helper.ts b/extensions/ql-vscode/test/vscode-tests/global.helper.ts
index e77eefe62c9..c67fcf0a01c 100644
--- a/extensions/ql-vscode/test/vscode-tests/global.helper.ts
+++ b/extensions/ql-vscode/test/vscode-tests/global.helper.ts
@@ -2,7 +2,7 @@ import { join } from "path";
 import { load, dump } from "js-yaml";
 import { realpathSync, readFileSync, writeFileSync } from "fs-extra";
 import { commands } from "vscode";
-import { DatabaseManager } from "../../src/databases";
+import { DatabaseManager } from "../../src/local-databases";
 import { CodeQLCliServer } from "../../src/cli";
 import { removeWorkspaceRefs } from "../../src/variant-analysis/run-remote-query";
 
diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases.test.ts
index dd202d996f6..2f7e3ce468c 100644
--- a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases.test.ts
@@ -11,7 +11,7 @@ import {
   FullDatabaseOptions,
   findSourceArchive,
   DatabaseResolver,
-} from "../../../src/databases";
+} from "../../../src/local-databases";
 import { Logger } from "../../../src/common";
 import { ProgressCallback } from "../../../src/commandRunner";
 import { CodeQLCliServer, DbInfo } from "../../../src/cli";
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/astViewer.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/astViewer.test.ts
index 12c4f86063b..f5593b216f6 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/astViewer.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/astViewer.test.ts
@@ -3,7 +3,7 @@ import { load } from "js-yaml";
 
 import { AstViewer, AstItem } from "../../../src/astViewer";
 import { commands, Range, Uri } from "vscode";
-import { DatabaseItem } from "../../../src/databases";
+import { DatabaseItem } from "../../../src/local-databases";
 import { testDisposeHandler } from "../test-dispose-handler";
 
 describe("AstViewer", () => {
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/astBuilder.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/astBuilder.test.ts
index 669bf611fad..4fd5af7398b 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/astBuilder.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/astBuilder.test.ts
@@ -2,7 +2,7 @@ import { readFileSync } from "fs-extra";
 
 import AstBuilder from "../../../../src/contextual/astBuilder";
 import { CodeQLCliServer } from "../../../../src/cli";
-import { DatabaseItem } from "../../../../src/databases";
+import { DatabaseItem } from "../../../../src/local-databases";
 import { Uri } from "vscode";
 import { QueryWithResults } from "../../../../src/run-queries-shared";
 
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts
index d6a5d1148dc..afa1adfbd38 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts
@@ -1,7 +1,7 @@
 import { Uri, Range } from "vscode";
 
 import fileRangeFromURI from "../../../../src/contextual/fileRangeFromURI";
-import { DatabaseItem } from "../../../../src/databases";
+import { DatabaseItem } from "../../../../src/local-databases";
 import {
   WholeFileLocation,
   LineColumnLocation,
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/queryResolver.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/queryResolver.test.ts
index 7cf593aabb7..9bcb08576dd 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/queryResolver.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/queryResolver.test.ts
@@ -10,7 +10,7 @@ import {
   resolveQueries,
 } from "../../../../src/contextual/queryResolver";
 import { CodeQLCliServer } from "../../../../src/cli";
-import { DatabaseItem } from "../../../../src/databases";
+import { DatabaseItem } from "../../../../src/local-databases";
 
 describe("queryResolver", () => {
   let getQlPackForDbschemeSpy: jest.SpiedFunction<
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/interface-utils.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/interface-utils.test.ts
index 753e71845de..6abee13c423 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/interface-utils.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/interface-utils.test.ts
@@ -14,7 +14,7 @@ import {
   tryResolveLocation,
 } from "../../../src/interface-utils";
 import { getDefaultResultSetName } from "../../../src/pure/interface-types";
-import { DatabaseItem } from "../../../src/databases";
+import { DatabaseItem } from "../../../src/local-databases";
 
 describe("interface-utils", () => {
   describe("webview uri conversion", () => {
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-tree-data-provider.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-tree-data-provider.test.ts
index c1eadc03e63..7bb293707f1 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-tree-data-provider.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-tree-data-provider.test.ts
@@ -7,7 +7,7 @@ import {
   QueryHistoryConfigListener,
 } from "../../../../src/config";
 import { LocalQueryInfo } from "../../../../src/query-results";
-import { DatabaseManager } from "../../../../src/databases";
+import { DatabaseManager } from "../../../../src/local-databases";
 import { tmpDir } from "../../../../src/helpers";
 import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
 import { ResultsView } from "../../../../src/interface";
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts
index 46106615154..5e7deeb68e9 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts
@@ -8,7 +8,7 @@ import {
   QueryHistoryConfigListener,
 } from "../../../../src/config";
 import { LocalQueryInfo } from "../../../../src/query-results";
-import { DatabaseManager } from "../../../../src/databases";
+import { DatabaseManager } from "../../../../src/local-databases";
 import { tmpDir } from "../../../../src/helpers";
 import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
 import { ResultsView } from "../../../../src/interface";
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts
index 1270c02c322..f48e1277464 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts
@@ -10,7 +10,7 @@ import { join } from "path";
 
 import { commands, ExtensionContext, Uri } from "vscode";
 import { QueryHistoryConfig } from "../../../../src/config";
-import { DatabaseManager } from "../../../../src/databases";
+import { DatabaseManager } from "../../../../src/local-databases";
 import { tmpDir, walkDirectory } from "../../../../src/helpers";
 import { DisposableBucket } from "../../disposable-bucket";
 import { testDisposeHandler } from "../../test-dispose-handler";
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts
index ead279e1603..044af9e8190 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts
@@ -15,7 +15,7 @@ import { CodeQLCliServer } from "../../../src/cli";
 import { SELECT_QUERY_NAME } from "../../../src/contextual/locationFinder";
 import { QueryInProgress } from "../../../src/legacy-query-server/run-queries";
 import { LegacyQueryRunner } from "../../../src/legacy-query-server/legacyRunner";
-import { DatabaseItem } from "../../../src/databases";
+import { DatabaseItem } from "../../../src/local-databases";
 
 describe("run-queries", () => {
   let isCanarySpy: jest.SpiedFunction<typeof config.isCanary>;
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/test-adapter.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/test-adapter.test.ts
index 202f26a4578..da5e50cf38b 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/test-adapter.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/test-adapter.test.ts
@@ -8,7 +8,7 @@ import {
   DatabaseItemImpl,
   DatabaseManager,
   FullDatabaseOptions,
-} from "../../../src/databases";
+} from "../../../src/local-databases";
 
 jest.mock("fs-extra", () => {
   const original = jest.requireActual("fs-extra");

From 360c9dbfddcf85f2297430041312fd76090bf207 Mon Sep 17 00:00:00 2001
From: Charis Kyriakou <charisk@users.noreply.github.com>
Date: Fri, 17 Feb 2023 16:44:25 +0000
Subject: [PATCH 2/5] Rename databases.test.ts to local-databases.test.ts

---
 .../{databases.test.ts => local-databases.test.ts}                | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename extensions/ql-vscode/test/vscode-tests/minimal-workspace/{databases.test.ts => local-databases.test.ts} (100%)

diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts
similarity index 100%
rename from extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases.test.ts
rename to extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts

From 5c4057f280e1cdd523d2d17893d0b3f1e30d0399 Mon Sep 17 00:00:00 2001
From: Charis Kyriakou <charisk@users.noreply.github.com>
Date: Fri, 17 Feb 2023 16:45:42 +0000
Subject: [PATCH 3/5] Rename test case title

---
 .../test/vscode-tests/minimal-workspace/local-databases.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts
index 2f7e3ce468c..df020a5b910 100644
--- a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts
@@ -25,7 +25,7 @@ import * as helpers from "../../../src/helpers";
 import { Setting } from "../../../src/config";
 import { QlPackGenerator } from "../../../src/qlpack-generator";
 
-describe("databases", () => {
+describe("local databases", () => {
   const MOCK_DB_OPTIONS: FullDatabaseOptions = {
     dateAdded: 123,
     ignoreSourceArchive: false,

From b0efc66173ba690a5a7b77271b840d370df21056 Mon Sep 17 00:00:00 2001
From: Charis Kyriakou <charisk@users.noreply.github.com>
Date: Fri, 17 Feb 2023 16:53:39 +0000
Subject: [PATCH 4/5] Rename databases-ui.ts to local-databases-ui.ts

---
 extensions/ql-vscode/src/extension.ts                         | 2 +-
 .../ql-vscode/src/{databases-ui.ts => local-databases-ui.ts}  | 0
 extensions/ql-vscode/src/quick-query.ts                       | 2 +-
 .../test/vscode-tests/no-workspace/databases-ui.test.ts       | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename extensions/ql-vscode/src/{databases-ui.ts => local-databases-ui.ts} (100%)

diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
index 4dc905b9ddd..d668a9055b0 100644
--- a/extensions/ql-vscode/src/extension.ts
+++ b/extensions/ql-vscode/src/extension.ts
@@ -44,7 +44,7 @@ import {
 } from "./config";
 import { install } from "./languageSupport";
 import { DatabaseItem, DatabaseManager } from "./local-databases";
-import { DatabaseUI } from "./databases-ui";
+import { DatabaseUI } from "./local-databases-ui";
 import {
   TemplatePrintAstProvider,
   TemplatePrintCfgProvider,
diff --git a/extensions/ql-vscode/src/databases-ui.ts b/extensions/ql-vscode/src/local-databases-ui.ts
similarity index 100%
rename from extensions/ql-vscode/src/databases-ui.ts
rename to extensions/ql-vscode/src/local-databases-ui.ts
diff --git a/extensions/ql-vscode/src/quick-query.ts b/extensions/ql-vscode/src/quick-query.ts
index b1564774e71..7829896d798 100644
--- a/extensions/ql-vscode/src/quick-query.ts
+++ b/extensions/ql-vscode/src/quick-query.ts
@@ -10,7 +10,7 @@ import {
 } from "vscode";
 import { LSPErrorCodes, ResponseError } from "vscode-languageclient";
 import { CodeQLCliServer } from "./cli";
-import { DatabaseUI } from "./databases-ui";
+import { DatabaseUI } from "./local-databases-ui";
 import {
   getInitialQueryContents,
   getPrimaryDbscheme,
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/databases-ui.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/databases-ui.test.ts
index 76246c48fa6..b45257b5935 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/databases-ui.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/databases-ui.test.ts
@@ -9,11 +9,11 @@ import {
 } from "fs-extra";
 import { Uri } from "vscode";
 
-import { DatabaseUI } from "../../../src/databases-ui";
+import { DatabaseUI } from "../../../src/local-databases-ui";
 import { testDisposeHandler } from "../test-dispose-handler";
 import { createMockApp } from "../../__mocks__/appMock";
 
-describe("databases-ui", () => {
+describe("local-databases-ui", () => {
   describe("fixDbUri", () => {
     const fixDbUri = (DatabaseUI.prototype as any).fixDbUri;
     it("should choose current directory direcory normally", async () => {

From 95cbc31c6d5e79064b35245fe04b7f0fd459e37e Mon Sep 17 00:00:00 2001
From: Charis Kyriakou <charisk@users.noreply.github.com>
Date: Fri, 17 Feb 2023 16:55:02 +0000
Subject: [PATCH 5/5] Rename databases-ui.test.ts to local-databases-ui.test.ts

---
 .../{databases-ui.test.ts => local-databases-ui.test.ts}          | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename extensions/ql-vscode/test/vscode-tests/no-workspace/{databases-ui.test.ts => local-databases-ui.test.ts} (100%)

diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/databases-ui.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/local-databases-ui.test.ts
similarity index 100%
rename from extensions/ql-vscode/test/vscode-tests/no-workspace/databases-ui.test.ts
rename to extensions/ql-vscode/test/vscode-tests/no-workspace/local-databases-ui.test.ts