mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #2377 from github/charisk/move-databse-files

Browse Source 
Move database files
This commit is contained in:
Charis Kyriakou
2023-04-27 09:44:03 +01:00
committed by GitHub
parent 57cc9657ed 0941417caf
commit 8c9c38e1ae
51 changed files with 107 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ql-vscode/src/common/commands.ts
View File

@@ -2,7 +2,7 @@ import type { CommandManager } from "../packages/commands";
import type { Uri, Range, TextDocumentShowOptions } from "vscode"; import type { Uri, Range, TextDocumentShowOptions } from "vscode";
import type { AstItem } from "../language-support"; import type { AstItem } from "../language-support";
import type { DbTreeViewItem } from "../databases/ui/db-tree-view-item"; import type { DbTreeViewItem } from "../databases/ui/db-tree-view-item";
import type { DatabaseItem } from "../local-databases"; import type { DatabaseItem } from "../databases/local-databases";
import type { QueryHistoryInfo } from "../query-history/query-history-info"; import type { QueryHistoryInfo } from "../query-history/query-history-info";
import type { RepositoriesFilterSortStateWithIds } from "../pure/variant-analysis-filter-sort"; import type { RepositoriesFilterSortStateWithIds } from "../pure/variant-analysis-filter-sort";
import type { TestTreeNode } from "../test-tree-node"; import type { TestTreeNode } from "../test-tree-node";

2
extensions/ql-vscode/src/compare/compare-view.ts
View File

@@ -7,7 +7,7 @@ import {
} from "../pure/interface-types"; } from "../pure/interface-types";
import { Logger } from "../common"; import { Logger } from "../common";
import { CodeQLCliServer } from "../cli"; import { CodeQLCliServer } from "../cli";
import { DatabaseManager } from "../local-databases"; import { DatabaseManager } from "../databases/local-databases";
import { jumpToLocation } from "../interface-utils"; import { jumpToLocation } from "../interface-utils";
import { import {
transformBqrsResultSet, transformBqrsResultSet,

2
extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts
View File

@@ -3,7 +3,7 @@ import { DataExtensionsEditorView } from "./data-extensions-editor-view";
import { DataExtensionsEditorCommands } from "../common/commands"; import { DataExtensionsEditorCommands } from "../common/commands";
import { CliVersionConstraint, CodeQLCliServer } from "../cli"; import { CliVersionConstraint, CodeQLCliServer } from "../cli";
import { QueryRunner } from "../query-server"; import { QueryRunner } from "../query-server";
import { DatabaseManager } from "../local-databases"; import { DatabaseManager } from "../databases/local-databases";
import { ensureDir } from "fs-extra"; import { ensureDir } from "fs-extra";
import { join } from "path"; import { join } from "path";
import { App } from "../common/app"; import { App } from "../common/app";

4
extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts
View File

@@ -21,11 +21,11 @@ import {
import { extLogger } from "../common"; import { extLogger } from "../common";
import { outputFile, pathExists, readFile } from "fs-extra"; import { outputFile, pathExists, readFile } from "fs-extra";
import { load as loadYaml } from "js-yaml"; import { load as loadYaml } from "js-yaml";
import { DatabaseItem, DatabaseManager } from "../local-databases"; import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
import { CodeQLCliServer } from "../cli"; import { CodeQLCliServer } from "../cli";
import { asError, assertNever, getErrorMessage } from "../pure/helpers-pure"; import { asError, assertNever, getErrorMessage } from "../pure/helpers-pure";
import { generateFlowModel } from "./generate-flow-model"; import { generateFlowModel } from "./generate-flow-model";
import { promptImportGithubDatabase } from "../databaseFetcher"; import { promptImportGithubDatabase } from "../databases/database-fetcher";
import { App } from "../common/app"; import { App } from "../common/app";
import { ResolvableLocationValue } from "../pure/bqrs-cli-types"; import { ResolvableLocationValue } from "../pure/bqrs-cli-types";
import { showResolvableLocation } from "../interface-utils"; import { showResolvableLocation } from "../interface-utils";

2
extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts
View File

@@ -10,7 +10,7 @@ import {
showAndLogErrorMessage, showAndLogErrorMessage,
} from "../helpers"; } from "../helpers";
import { ProgressCallback } from "../progress"; import { ProgressCallback } from "../progress";
import { DatabaseItem } from "../local-databases"; import { DatabaseItem } from "../databases/local-databases";
import { getQlPackPath, QLPACK_FILENAMES } from "../pure/ql"; import { getQlPackPath, QLPACK_FILENAMES } from "../pure/ql";
import { getErrorMessage } from "../pure/helpers-pure"; import { getErrorMessage } from "../pure/helpers-pure";
import { ExtensionPack, ExtensionPackModelFile } from "./shared/extension-pack"; import { ExtensionPack, ExtensionPackModelFile } from "./shared/extension-pack";

2
extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts
View File

@@ -9,7 +9,7 @@ import {
import { TeeLogger } from "../common"; import { TeeLogger } from "../common";
import { CancellationToken } from "vscode"; import { CancellationToken } from "vscode";
import { CodeQLCliServer } from "../cli"; import { CodeQLCliServer } from "../cli";
import { DatabaseItem } from "../local-databases"; import { DatabaseItem } from "../databases/local-databases";
import { ProgressCallback } from "../progress"; import { ProgressCallback } from "../progress";
import { fetchExternalApiQueries } from "./queries"; import { fetchExternalApiQueries } from "./queries";
import { QueryResultType } from "../pure/new-messages"; import { QueryResultType } from "../pure/new-messages";

2
extensions/ql-vscode/src/data-extensions-editor/generate-flow-model.ts
View File

@@ -1,5 +1,5 @@
import { CancellationToken } from "vscode"; import { CancellationToken } from "vscode";
import { DatabaseItem } from "../local-databases"; import { DatabaseItem } from "../databases/local-databases";
import { join } from "path"; import { join } from "path";
import { QueryRunner } from "../query-server"; import { QueryRunner } from "../query-server";
import { CodeQLCliServer } from "../cli"; import { CodeQLCliServer } from "../cli";

18
extensions/ql-vscode/src/databaseFetcher.ts → extensions/ql-vscode/src/databases/database-fetcher.ts
View File

@@ -2,7 +2,7 @@ import fetch, { Response } from "node-fetch";
import { zip } from "zip-a-folder"; import { zip } from "zip-a-folder";
import { Open } from "unzipper"; import { Open } from "unzipper";
import { Uri, CancellationToken, window, InputBoxOptions } from "vscode"; import { Uri, CancellationToken, window, InputBoxOptions } from "vscode";
import { CodeQLCliServer } from "./cli"; import { CodeQLCliServer } from "../cli";
import { import {
ensureDir, ensureDir,
realpath as fs_realpath, realpath as fs_realpath,
@@ -17,17 +17,17 @@ import * as Octokit from "@octokit/rest";
import { retry } from "@octokit/plugin-retry"; import { retry } from "@octokit/plugin-retry";
import { DatabaseManager, DatabaseItem } from "./local-databases"; import { DatabaseManager, DatabaseItem } from "./local-databases";
import { showAndLogInformationMessage, tmpDir } from "./helpers"; import { showAndLogInformationMessage, tmpDir } from "../helpers";
import { reportStreamProgress, ProgressCallback } from "./progress"; import { reportStreamProgress, ProgressCallback } from "../progress";
import { extLogger } from "./common"; import { extLogger } from "../common";
import { getErrorMessage } from "./pure/helpers-pure"; import { getErrorMessage } from "../pure/helpers-pure";
import { import {
getNwoFromGitHubUrl, getNwoFromGitHubUrl,
isValidGitHubNwo, isValidGitHubNwo,
} from "./common/github-url-identifier-helper"; } from "../common/github-url-identifier-helper";
import { Credentials } from "./common/authentication"; import { Credentials } from "../common/authentication";
import { AppCommandManager } from "./common/commands"; import { AppCommandManager } from "../common/commands";
import { ALLOW_HTTP_SETTING } from "./config"; import { ALLOW_HTTP_SETTING } from "../config";
/** /**
* Prompts a user to fetch a database from a remote location. Database is assumed to be an archive file. * Prompts a user to fetch a database from a remote location. Database is assumed to be an archive file.

22
extensions/ql-vscode/src/local-databases-ui.ts → extensions/ql-vscode/src/databases/local-databases-ui.ts
View File

@@ -1,5 +1,5 @@
import { join, basename, dirname as path_dirname } from "path"; import { join, basename, dirname as path_dirname } from "path";
import { DisposableObject } from "./pure/disposable-object"; import { DisposableObject } from "../pure/disposable-object";
import { import {
Event, Event,
EventEmitter, EventEmitter,
@@ -27,25 +27,25 @@ import {
ProgressContext, ProgressContext,
withInheritedProgress, withInheritedProgress,
withProgress, withProgress,
} from "./progress"; } from "../progress";
import { import {
isLikelyDatabaseRoot, isLikelyDatabaseRoot,
isLikelyDbLanguageFolder, isLikelyDbLanguageFolder,
showAndLogErrorMessage, showAndLogErrorMessage,
showAndLogExceptionWithTelemetry, showAndLogExceptionWithTelemetry,
} from "./helpers"; } from "../helpers";
import { extLogger } from "./common"; import { extLogger } from "../common";
import { import {
importArchiveDatabase, importArchiveDatabase,
promptImportGithubDatabase, promptImportGithubDatabase,
promptImportInternetDatabase, promptImportInternetDatabase,
} from "./databaseFetcher"; } from "./database-fetcher";
import { asError, asyncFilter, getErrorMessage } from "./pure/helpers-pure"; import { asError, asyncFilter, getErrorMessage } from "../pure/helpers-pure";
import { QueryRunner } from "./query-server"; import { QueryRunner } from "../query-server";
import { isCanary } from "./config"; import { isCanary } from "../config";
import { App } from "./common/app"; import { App } from "../common/app";
import { redactableError } from "./pure/errors"; import { redactableError } from "../pure/errors";
import { LocalDatabasesCommands } from "./common/commands"; import { LocalDatabasesCommands } from "../common/commands";
enum SortOrder { enum SortOrder {
NameAsc = "NameAsc", NameAsc = "NameAsc",

28
extensions/ql-vscode/src/local-databases.ts → extensions/ql-vscode/src/databases/local-databases.ts
View File

@@ -2,7 +2,7 @@ import { pathExists, stat, remove } from "fs-extra";
import { glob } from "glob"; import { glob } from "glob";
import { join, basename, resolve, relative, dirname, extname } from "path"; import { join, basename, resolve, relative, dirname, extname } from "path";
import * as vscode from "vscode"; import * as vscode from "vscode";
import * as cli from "./cli"; import * as cli from "../cli";
import { ExtensionContext } from "vscode"; import { ExtensionContext } from "vscode";
import { import {
showAndLogWarningMessage, showAndLogWarningMessage,
@@ -12,24 +12,24 @@ import {
isFolderAlreadyInWorkspace, isFolderAlreadyInWorkspace,
showBinaryChoiceDialog, showBinaryChoiceDialog,
getFirstWorkspaceFolder, getFirstWorkspaceFolder,
} from "./helpers"; } from "../helpers";
import { ProgressCallback, withProgress } from "./progress"; import { ProgressCallback, withProgress } from "../progress";
import { import {
zipArchiveScheme, zipArchiveScheme,
encodeArchiveBasePath, encodeArchiveBasePath,
decodeSourceArchiveUri, decodeSourceArchiveUri,
encodeSourceArchiveUri, encodeSourceArchiveUri,
} from "./archive-filesystem-provider"; } from "../archive-filesystem-provider";
import { DisposableObject } from "./pure/disposable-object"; import { DisposableObject } from "../pure/disposable-object";
import { Logger, extLogger } from "./common"; import { Logger, extLogger } from "../common";
import { asError, getErrorMessage } from "./pure/helpers-pure"; import { asError, getErrorMessage } from "../pure/helpers-pure";
import { QueryRunner } from "./query-server"; import { QueryRunner } from "../query-server";
import { pathsEqual } from "./pure/files"; import { pathsEqual } from "../pure/files";
import { redactableError } from "./pure/errors"; import { redactableError } from "../pure/errors";
import { isCodespacesTemplate } from "./config"; import { isCodespacesTemplate } from "../config";
import { QlPackGenerator } from "./qlpack-generator"; import { QlPackGenerator } from "../qlpack-generator";
import { QueryLanguage } from "./common/query-language"; import { QueryLanguage } from "../common/query-language";
import { App } from "./common/app"; import { App } from "../common/app";
import { existsSync } from "fs"; import { existsSync } from "fs";
/** /**

2
extensions/ql-vscode/src/debugger/debugger-ui.ts
View File

@@ -8,7 +8,7 @@ import {
CancellationTokenSource, CancellationTokenSource,
} from "vscode"; } from "vscode";
import { DebuggerCommands } from "../common/commands"; import { DebuggerCommands } from "../common/commands";
import { DatabaseManager } from "../local-databases"; import { DatabaseManager } from "../databases/local-databases";
import { DisposableObject } from "../pure/disposable-object"; import { DisposableObject } from "../pure/disposable-object";
import { CoreQueryResults } from "../query-server"; import { CoreQueryResults } from "../query-server";
import { import {

4
extensions/ql-vscode/src/extension.ts
View File

@@ -43,8 +43,8 @@ import {
TemplateQueryDefinitionProvider, TemplateQueryDefinitionProvider,
TemplateQueryReferenceProvider, TemplateQueryReferenceProvider,
} from "./language-support"; } from "./language-support";
import { DatabaseManager } from "./local-databases"; import { DatabaseManager } from "./databases/local-databases";
import { DatabaseUI } from "./local-databases-ui"; import { DatabaseUI } from "./databases/local-databases-ui";
import { import {
DEFAULT_DISTRIBUTION_VERSION_RANGE, DEFAULT_DISTRIBUTION_VERSION_RANGE,
DistributionKind, DistributionKind,

2
extensions/ql-vscode/src/interface-utils.ts
View File

@@ -15,7 +15,7 @@ import {
ThemeColor, ThemeColor,
} from "vscode"; } from "vscode";
import { tryGetResolvableLocation, isLineColumnLoc } from "./pure/bqrs-utils"; import { tryGetResolvableLocation, isLineColumnLoc } from "./pure/bqrs-utils";
import { DatabaseItem, DatabaseManager } from "./local-databases"; import { DatabaseItem, DatabaseManager } from "./databases/local-databases";
import { ViewSourceFileMsg } from "./pure/interface-types"; import { ViewSourceFileMsg } from "./pure/interface-types";
import { Logger } from "./common"; import { Logger } from "./common";
import { import {

2
extensions/ql-vscode/src/interface.ts
View File

@@ -16,7 +16,7 @@ import {
DatabaseEventKind, DatabaseEventKind,
DatabaseItem, DatabaseItem,
DatabaseManager, DatabaseManager,
} from "./local-databases"; } from "./databases/local-databases";
import { showAndLogExceptionWithTelemetry } from "./helpers"; import { showAndLogExceptionWithTelemetry } from "./helpers";
import { import {
asError, asError,

2
extensions/ql-vscode/src/language-support/ast-viewer/ast-builder.ts
View File

@@ -4,7 +4,7 @@ import {
BqrsId, BqrsId,
EntityValue, EntityValue,
} from "../../pure/bqrs-cli-types"; } from "../../pure/bqrs-cli-types";
import { DatabaseItem } from "../../local-databases"; import { DatabaseItem } from "../../databases/local-databases";
import { ChildAstItem, AstItem } from "./ast-viewer"; import { ChildAstItem, AstItem } from "./ast-viewer";
import { Uri } from "vscode"; import { Uri } from "vscode";
import { QueryOutputDir } from "../../run-queries-shared"; import { QueryOutputDir } from "../../run-queries-shared";

2
extensions/ql-vscode/src/language-support/ast-viewer/ast-viewer.ts
View File

@@ -15,7 +15,7 @@ import {
} from "vscode"; } from "vscode";
import { basename } from "path"; import { basename } from "path";
import { DatabaseItem } from "../../local-databases"; import { DatabaseItem } from "../../databases/local-databases";
import { UrlValue, BqrsId } from "../../pure/bqrs-cli-types"; import { UrlValue, BqrsId } from "../../pure/bqrs-cli-types";
import { showLocation } from "../../interface-utils"; import { showLocation } from "../../interface-utils";
import { import {

2
extensions/ql-vscode/src/language-support/contextual/file-range-from-uri.ts
View File

@@ -2,7 +2,7 @@ import * as vscode from "vscode";
import { UrlValue, LineColumnLocation } from "../../pure/bqrs-cli-types"; import { UrlValue, LineColumnLocation } from "../../pure/bqrs-cli-types";
import { isEmptyPath } from "../../pure/bqrs-utils"; import { isEmptyPath } from "../../pure/bqrs-utils";
import { DatabaseItem } from "../../local-databases"; import { DatabaseItem } from "../../databases/local-databases";
export function fileRangeFromURI( export function fileRangeFromURI(
uri: UrlValue | undefined, uri: UrlValue | undefined,

2
extensions/ql-vscode/src/language-support/contextual/location-finder.ts
View File

@@ -9,7 +9,7 @@ import {
ResultSetSchema, ResultSetSchema,
} from "../../pure/bqrs-cli-types"; } from "../../pure/bqrs-cli-types";
import { CodeQLCliServer } from "../../cli"; import { CodeQLCliServer } from "../../cli";
import { DatabaseManager, DatabaseItem } from "../../local-databases"; import { DatabaseManager, DatabaseItem } from "../../databases/local-databases";
import { ProgressCallback } from "../../progress"; import { ProgressCallback } from "../../progress";
import { KeyType } from "./key-type"; import { KeyType } from "./key-type";
import { import {

2
extensions/ql-vscode/src/language-support/contextual/query-resolver.ts
View File

@@ -17,7 +17,7 @@ import {
tagOfKeyType, tagOfKeyType,
} from "./key-type"; } from "./key-type";
import { CodeQLCliServer } from "../../cli"; import { CodeQLCliServer } from "../../cli";
import { DatabaseItem } from "../../local-databases"; import { DatabaseItem } from "../../databases/local-databases";
import { extLogger, TeeLogger } from "../../common"; import { extLogger, TeeLogger } from "../../common";
import { CancellationToken } from "vscode"; import { CancellationToken } from "vscode";
import { ProgressCallback } from "../../progress"; import { ProgressCallback } from "../../progress";

2
extensions/ql-vscode/src/language-support/contextual/template-provider.ts
View File

@@ -16,7 +16,7 @@ import {
zipArchiveScheme, zipArchiveScheme,
} from "../../archive-filesystem-provider"; } from "../../archive-filesystem-provider";
import { CodeQLCliServer } from "../../cli"; import { CodeQLCliServer } from "../../cli";
import { DatabaseManager } from "../../local-databases"; import { DatabaseManager } from "../../databases/local-databases";
import { CachedOperation } from "../../helpers"; import { CachedOperation } from "../../helpers";
import { ProgressCallback, withProgress } from "../../progress"; import { ProgressCallback, withProgress } from "../../progress";
import { KeyType } from "./key-type"; import { KeyType } from "./key-type";

4
extensions/ql-vscode/src/local-queries/local-queries.ts
View File

@@ -23,9 +23,9 @@ import {
import { displayQuickQuery } from "./quick-query"; import { displayQuickQuery } from "./quick-query";
import { CoreCompletedQuery, QueryRunner } from "../query-server"; import { CoreCompletedQuery, QueryRunner } from "../query-server";
import { QueryHistoryManager } from "../query-history/query-history-manager"; import { QueryHistoryManager } from "../query-history/query-history-manager";
import { DatabaseUI } from "../local-databases-ui"; import { DatabaseUI } from "../databases/local-databases-ui";
import { ResultsView } from "../interface"; import { ResultsView } from "../interface";
import { DatabaseItem, DatabaseManager } from "../local-databases"; import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
import { import {
createInitialQueryInfo, createInitialQueryInfo,
getQuickEvalContext, getQuickEvalContext,

2
extensions/ql-vscode/src/local-queries/local-query-run.ts
View File

@@ -6,7 +6,7 @@ import {
} from "../helpers"; } from "../helpers";
import { CoreQueryResults } from "../query-server"; import { CoreQueryResults } from "../query-server";
import { QueryHistoryManager } from "../query-history/query-history-manager"; import { QueryHistoryManager } from "../query-history/query-history-manager";
import { DatabaseItem } from "../local-databases"; import { DatabaseItem } from "../databases/local-databases";
import { import {
EvaluatorLogPaths, EvaluatorLogPaths,
generateEvalLogSummaries, generateEvalLogSummaries,

2
extensions/ql-vscode/src/local-queries/quick-query.ts
View File

@@ -4,7 +4,7 @@ import { basename, join } from "path";
import { CancellationToken, window as Window, workspace, Uri } from "vscode"; import { CancellationToken, window as Window, workspace, Uri } from "vscode";
import { LSPErrorCodes, ResponseError } from "vscode-languageclient"; import { LSPErrorCodes, ResponseError } from "vscode-languageclient";
import { CodeQLCliServer } from "../cli"; import { CodeQLCliServer } from "../cli";
import { DatabaseUI } from "../local-databases-ui"; import { DatabaseUI } from "../databases/local-databases-ui";
import { import {
getInitialQueryContents, getInitialQueryContents,
getPrimaryDbscheme, getPrimaryDbscheme,

2
extensions/ql-vscode/src/query-history/query-history-manager.ts
View File

@@ -32,7 +32,7 @@ import {
getQueryText, getQueryText,
QueryHistoryInfo, QueryHistoryInfo,
} from "./query-history-info"; } from "./query-history-info";
import { DatabaseManager } from "../local-databases"; import { DatabaseManager } from "../databases/local-databases";
import { registerQueryHistoryScrubber } from "./query-history-scrubber"; import { registerQueryHistoryScrubber } from "./query-history-scrubber";
import { import {
QueryStatus, QueryStatus,

2
extensions/ql-vscode/src/query-server/legacy/legacy-query-runner.ts
View File

@@ -2,7 +2,7 @@ import { CancellationToken } from "vscode";
import { CodeQLCliServer } from "../../cli"; import { CodeQLCliServer } from "../../cli";
import { ProgressCallback } from "../../progress"; import { ProgressCallback } from "../../progress";
import { Logger } from "../../common"; import { Logger } from "../../common";
import { DatabaseItem } from "../../local-databases"; import { DatabaseItem } from "../../databases/local-databases";
import { import {
Dataset, Dataset,
deregisterDatabases, deregisterDatabases,

2
extensions/ql-vscode/src/query-server/legacy/run-queries.ts
View File

@@ -8,7 +8,7 @@ import {
DatabaseContentsWithDbScheme, DatabaseContentsWithDbScheme,
DatabaseItem, DatabaseItem,
DatabaseResolver, DatabaseResolver,
} from "../../local-databases"; } from "../../databases/local-databases";
import { import {
showAndLogExceptionWithTelemetry, showAndLogExceptionWithTelemetry,
showAndLogWarningMessage, showAndLogWarningMessage,

2
extensions/ql-vscode/src/query-server/legacy/upgrades.ts
View File

@@ -10,7 +10,7 @@ import * as messages from "../../pure/legacy-messages";
import * as qsClient from "./query-server-client"; import * as qsClient from "./query-server-client";
import * as tmp from "tmp-promise"; import * as tmp from "tmp-promise";
import { dirname } from "path"; import { dirname } from "path";
import { DatabaseItem } from "../../local-databases"; import { DatabaseItem } from "../../databases/local-databases";
import { asError, getErrorMessage } from "../../pure/helpers-pure"; import { asError, getErrorMessage } from "../../pure/helpers-pure";
import { redactableError } from "../../pure/errors"; import { redactableError } from "../../pure/errors";

2
extensions/ql-vscode/src/query-server/new-query-runner.ts
View File

@@ -1,6 +1,6 @@
import { CancellationToken } from "vscode"; import { CancellationToken } from "vscode";
import { ProgressCallback, UserCancellationException } from "../progress"; import { ProgressCallback, UserCancellationException } from "../progress";
import { DatabaseItem } from "../local-databases"; import { DatabaseItem } from "../databases/local-databases";
import { import {
clearCache, clearCache,
ClearCacheParams, ClearCacheParams,

2
extensions/ql-vscode/src/query-server/query-runner.ts
View File

@@ -1,7 +1,7 @@
import { CancellationToken } from "vscode"; import { CancellationToken } from "vscode";
import { CodeQLCliServer } from "../cli"; import { CodeQLCliServer } from "../cli";
import { ProgressCallback } from "../progress"; import { ProgressCallback } from "../progress";
import { DatabaseItem } from "../local-databases"; import { DatabaseItem } from "../databases/local-databases";
import { QueryOutputDir } from "../run-queries-shared"; import { QueryOutputDir } from "../run-queries-shared";
import { Position, QueryResultType } from "../pure/new-messages"; import { Position, QueryResultType } from "../pure/new-messages";
import { BaseLogger, Logger } from "../common"; import { BaseLogger, Logger } from "../common";

2
extensions/ql-vscode/src/run-queries-shared.ts
View File

@@ -25,7 +25,7 @@ import { isQuickQueryPath } from "./local-queries";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { CodeQLCliServer } from "./cli"; import { CodeQLCliServer } from "./cli";
import { SELECT_QUERY_NAME } from "./language-support"; import { SELECT_QUERY_NAME } from "./language-support";
import { DatabaseManager } from "./local-databases"; import { DatabaseManager } from "./databases/local-databases";
import { DecodedBqrsChunk, EntityValue } from "./pure/bqrs-cli-types"; import { DecodedBqrsChunk, EntityValue } from "./pure/bqrs-cli-types";
import { BaseLogger, extLogger } from "./common"; import { BaseLogger, extLogger } from "./common";
import { generateSummarySymbolsFile } from "./log-insights/summary-parser"; import { generateSummarySymbolsFile } from "./log-insights/summary-parser";

7
extensions/ql-vscode/src/skeleton-query-wizard.ts
View File

@@ -11,9 +11,12 @@ import {
} from "./helpers"; } from "./helpers";
import { getErrorMessage } from "./pure/helpers-pure"; import { getErrorMessage } from "./pure/helpers-pure";
import { QlPackGenerator } from "./qlpack-generator"; import { QlPackGenerator } from "./qlpack-generator";
import { DatabaseItem, DatabaseManager } from "./local-databases"; import { DatabaseItem, DatabaseManager } from "./databases/local-databases";
import { ProgressCallback, UserCancellationException } from "./progress"; import { ProgressCallback, UserCancellationException } from "./progress";
import { askForGitHubRepo, downloadGitHubDatabase } from "./databaseFetcher"; import {
askForGitHubRepo,
downloadGitHubDatabase,
} from "./databases/database-fetcher";
import { import {
getSkeletonWizardFolder, getSkeletonWizardFolder,
isCodespacesTemplate, isCodespacesTemplate,

2
extensions/ql-vscode/src/test-runner.ts
View File

@@ -1,6 +1,6 @@
import { CancellationToken, Uri } from "vscode"; import { CancellationToken, Uri } from "vscode";
import { CodeQLCliServer, TestCompleted } from "./cli"; import { CodeQLCliServer, TestCompleted } from "./cli";
import { DatabaseItem, DatabaseManager } from "./local-databases"; import { DatabaseItem, DatabaseManager } from "./databases/local-databases";
import { import {
getOnDiskWorkspaceFolders, getOnDiskWorkspaceFolders,
showAndLogExceptionWithTelemetry, showAndLogExceptionWithTelemetry,

2
extensions/ql-vscode/test/factories/databases/databases.ts
View File

@@ -4,7 +4,7 @@ import {
DatabaseContents, DatabaseContents,
DatabaseItemImpl, DatabaseItemImpl,
FullDatabaseOptions, FullDatabaseOptions,
} from "../../../src/local-databases"; } from "../../../src/databases/local-databases";
import { DirResult } from "tmp"; import { DirResult } from "tmp";
export function mockDbOptions(): FullDatabaseOptions { export function mockDbOptions(): FullDatabaseOptions {

12
extensions/ql-vscode/test/vscode-tests/cli-integration/databaseFetcher.test.ts → extensions/ql-vscode/test/vscode-tests/cli-integration/databases/database-fetcher.test.ts
View File

@@ -1,25 +1,25 @@
import { join } from "path"; import { join } from "path";
import { CancellationToken, Uri, window } from "vscode"; import { CancellationToken, Uri, window } from "vscode";
import { CodeQLCliServer } from "../../../src/cli"; import { CodeQLCliServer } from "../../../../src/cli";
import { DatabaseManager } from "../../../src/local-databases"; import { DatabaseManager } from "../../../../src/databases/local-databases";
import { import {
importArchiveDatabase, importArchiveDatabase,
promptImportInternetDatabase, promptImportInternetDatabase,
} from "../../../src/databaseFetcher"; } from "../../../../src/databases/database-fetcher";
import { import {
cleanDatabases, cleanDatabases,
dbLoc, dbLoc,
DB_URL, DB_URL,
getActivatedExtension, getActivatedExtension,
storagePath, storagePath,
} from "../global.helper"; } from "../../global.helper";
import { createMockCommandManager } from "../../__mocks__/commandsMock"; import { createMockCommandManager } from "../../../__mocks__/commandsMock";
/** /**
* Run various integration tests for databases * Run various integration tests for databases
*/ */
describe("DatabaseFetcher", () => { describe("database-fetcher", () => {
let databaseManager: DatabaseManager; let databaseManager: DatabaseManager;
let inputBoxStub: jest.SpiedFunction<typeof window.showInputBox>; let inputBoxStub: jest.SpiedFunction<typeof window.showInputBox>;
let cli: CodeQLCliServer; let cli: CodeQLCliServer;

2
extensions/ql-vscode/test/vscode-tests/cli-integration/debugger/debugger.test.ts
View File

@@ -1,7 +1,7 @@
import { Selection, Uri, window, workspace } from "vscode"; import { Selection, Uri, window, workspace } from "vscode";
import { join } from "path"; import { join } from "path";
import { DatabaseManager } from "../../../../src/local-databases"; import { DatabaseManager } from "../../../../src/databases/local-databases";
import { import {
cleanDatabases, cleanDatabases,
ensureTestDatabase, ensureTestDatabase,

5
extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts
View File

@@ -9,7 +9,10 @@ import {
} from "fs-extra"; } from "fs-extra";
import { load, dump } from "js-yaml"; import { load, dump } from "js-yaml";
import { DatabaseItem, DatabaseManager } from "../../../src/local-databases"; import {
DatabaseItem,
DatabaseManager,
} from "../../../src/databases/local-databases";
import { import {
cleanDatabases, cleanDatabases,
ensureTestDatabase, ensureTestDatabase,

4
extensions/ql-vscode/test/vscode-tests/cli-integration/skeleton-query-wizard.test.ts
View File

@@ -17,8 +17,8 @@ import {
DatabaseItem, DatabaseItem,
DatabaseManager, DatabaseManager,
FullDatabaseOptions, FullDatabaseOptions,
} from "../../../src/local-databases"; } from "../../../src/databases/local-databases";
import * as databaseFetcher from "../../../src/databaseFetcher"; import * as databaseFetcher from "../../../src/databases/database-fetcher";
import { createMockDB } from "../../factories/databases/databases"; import { createMockDB } from "../../factories/databases/databases";
import { asError } from "../../../src/pure/helpers-pure"; import { asError } from "../../../src/pure/helpers-pure";
import { Setting } from "../../../src/config"; import { Setting } from "../../../src/config";

7
extensions/ql-vscode/test/vscode-tests/global.helper.ts
View File

@@ -7,12 +7,15 @@ import {
Uri, Uri,
extensions, extensions,
} from "vscode"; } from "vscode";
import { DatabaseItem, DatabaseManager } from "../../src/local-databases"; import {
DatabaseItem,
DatabaseManager,
} from "../../src/databases/local-databases";
import { CodeQLCliServer } from "../../src/cli"; import { CodeQLCliServer } from "../../src/cli";
import { removeWorkspaceRefs } from "../../src/variant-analysis/run-remote-query"; import { removeWorkspaceRefs } from "../../src/variant-analysis/run-remote-query";
import { CodeQLExtensionInterface } from "../../src/extension"; import { CodeQLExtensionInterface } from "../../src/extension";
import { ProgressCallback } from "../../src/progress"; import { ProgressCallback } from "../../src/progress";
import { importArchiveDatabase } from "../../src/databaseFetcher"; import { importArchiveDatabase } from "../../src/databases/database-fetcher";
import { createMockCommandManager } from "../__mocks__/commandsMock"; import { createMockCommandManager } from "../__mocks__/commandsMock";
// This file contains helpers shared between tests that work with an activated extension. // This file contains helpers shared between tests that work with an activated extension.

2
extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts
View File

@@ -11,7 +11,7 @@ import {
DatabaseResolver, DatabaseResolver,
findSourceArchive, findSourceArchive,
FullDatabaseOptions, FullDatabaseOptions,
} from "../../../src/local-databases"; } from "../../../src/databases/local-databases";
import { Logger } from "../../../src/common"; import { Logger } from "../../../src/common";
import { ProgressCallback } from "../../../src/progress"; import { ProgressCallback } from "../../../src/progress";
import { CodeQLCliServer, DbInfo } from "../../../src/cli"; import { CodeQLCliServer, DbInfo } from "../../../src/cli";

2
extensions/ql-vscode/test/vscode-tests/no-workspace/data-extensions-editor/external-api-usage-query.test.ts
View File

@@ -4,7 +4,7 @@ import {
} from "../../../../src/data-extensions-editor/external-api-usage-query"; } from "../../../../src/data-extensions-editor/external-api-usage-query";
import { createMockLogger } from "../../../__mocks__/loggerMock"; import { createMockLogger } from "../../../__mocks__/loggerMock";
import type { Uri } from "vscode"; import type { Uri } from "vscode";
import { DatabaseKind } from "../../../../src/local-databases"; import { DatabaseKind } from "../../../../src/databases/local-databases";
import { file } from "tmp-promise"; import { file } from "tmp-promise";
import { QueryResultType } from "../../../../src/pure/new-messages"; import { QueryResultType } from "../../../../src/pure/new-messages";
import { readdir, readFile } from "fs-extra"; import { readdir, readFile } from "fs-extra";

6
extensions/ql-vscode/test/vscode-tests/no-workspace/databaseFetcher.test.ts → extensions/ql-vscode/test/vscode-tests/no-workspace/databases/database-fetcher.test.ts
View File

@@ -6,14 +6,14 @@ import { window } from "vscode";
import { import {
convertGithubNwoToDatabaseUrl, convertGithubNwoToDatabaseUrl,
findDirWithFile, findDirWithFile,
} from "../../../src/databaseFetcher"; } from "../../../../src/databases/database-fetcher";
import * as Octokit from "@octokit/rest"; import * as Octokit from "@octokit/rest";
import { mockedQuickPickItem } from "../utils/mocking.helpers"; import { mockedQuickPickItem } from "../../utils/mocking.helpers";
// These tests make API calls and may need extra time to complete. // These tests make API calls and may need extra time to complete.
jest.setTimeout(10000); jest.setTimeout(10000);
describe("databaseFetcher", () => { describe("database-fetcher", () => {
describe("convertGithubNwoToDatabaseUrl", () => { describe("convertGithubNwoToDatabaseUrl", () => {
let quickPickSpy: jest.SpiedFunction<typeof window.showQuickPick>; let quickPickSpy: jest.SpiedFunction<typeof window.showQuickPick>;

8
extensions/ql-vscode/test/vscode-tests/no-workspace/local-databases-ui.test.ts → extensions/ql-vscode/test/vscode-tests/no-workspace/databases/local-databases-ui.test.ts
View File

@@ -9,10 +9,10 @@ import {
} from "fs-extra"; } from "fs-extra";
import { Uri } from "vscode"; import { Uri } from "vscode";
import { DatabaseUI } from "../../../src/local-databases-ui"; import { DatabaseUI } from "../../../../src/databases/local-databases-ui";
import { testDisposeHandler } from "../test-dispose-handler"; import { testDisposeHandler } from "../../test-dispose-handler";
import { createMockApp } from "../../__mocks__/appMock"; import { createMockApp } from "../../../__mocks__/appMock";
import { QueryLanguage } from "../../../src/common/query-language"; import { QueryLanguage } from "../../../../src/common/query-language";
describe("local-databases-ui", () => { describe("local-databases-ui", () => {
describe("fixDbUri", () => { describe("fixDbUri", () => {

2
extensions/ql-vscode/test/vscode-tests/no-workspace/language-support/contextual/file-range-from-uri.test.ts
View File

@@ -1,6 +1,6 @@
import { Uri, Range } from "vscode"; import { Uri, Range } from "vscode";
import { DatabaseItem } from "../../../../../src/local-databases"; import { DatabaseItem } from "../../../../../src/databases/local-databases";
import { import {
WholeFileLocation, WholeFileLocation,
LineColumnLocation, LineColumnLocation,

2
extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/history-tree-data-provider.test.ts
View File

@@ -4,7 +4,7 @@ import * as vscode from "vscode";
import { extLogger } from "../../../../src/common"; import { extLogger } from "../../../../src/common";
import { QueryHistoryConfigListener } from "../../../../src/config"; import { QueryHistoryConfigListener } from "../../../../src/config";
import { LocalQueryInfo } from "../../../../src/query-results"; import { LocalQueryInfo } from "../../../../src/query-results";
import { DatabaseManager } from "../../../../src/local-databases"; import { DatabaseManager } from "../../../../src/databases/local-databases";
import { tmpDir } from "../../../../src/helpers"; import { tmpDir } from "../../../../src/helpers";
import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider"; import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
import { ResultsView } from "../../../../src/interface"; import { ResultsView } from "../../../../src/interface";

2
extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts
View File

@@ -5,7 +5,7 @@ import { extLogger } from "../../../../src/common";
import { QueryHistoryManager } from "../../../../src/query-history/query-history-manager"; import { QueryHistoryManager } from "../../../../src/query-history/query-history-manager";
import { QueryHistoryConfigListener } from "../../../../src/config"; import { QueryHistoryConfigListener } from "../../../../src/config";
import { LocalQueryInfo } from "../../../../src/query-results"; import { LocalQueryInfo } from "../../../../src/query-results";
import { DatabaseManager } from "../../../../src/local-databases"; import { DatabaseManager } from "../../../../src/databases/local-databases";
import { tmpDir } from "../../../../src/helpers"; import { tmpDir } from "../../../../src/helpers";
import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider"; import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
import { ResultsView } from "../../../../src/interface"; import { ResultsView } from "../../../../src/interface";

2
extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts
View File

@@ -9,7 +9,7 @@ import {
import { join } from "path"; import { join } from "path";
import { ExtensionContext, Uri } from "vscode"; import { ExtensionContext, Uri } from "vscode";
import { DatabaseManager } from "../../../../src/local-databases"; import { DatabaseManager } from "../../../../src/databases/local-databases";
import { tmpDir, walkDirectory } from "../../../../src/helpers"; import { tmpDir, walkDirectory } from "../../../../src/helpers";
import { DisposableBucket } from "../../disposable-bucket"; import { DisposableBucket } from "../../disposable-bucket";
import { testDisposeHandler } from "../../test-dispose-handler"; import { testDisposeHandler } from "../../test-dispose-handler";

2
extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts
View File

@@ -20,7 +20,7 @@ import {
LegacyQueryRunner, LegacyQueryRunner,
QueryServerClient, QueryServerClient,
} from "../../../src/query-server/legacy"; } from "../../../src/query-server/legacy";
import { DatabaseItem } from "../../../src/local-databases"; import { DatabaseItem } from "../../../src/databases/local-databases";
import { DeepPartial, mockedObject } from "../utils/mocking.helpers"; import { DeepPartial, mockedObject } from "../utils/mocking.helpers";
import { BqrsKind } from "../../../src/pure/bqrs-cli-types"; import { BqrsKind } from "../../../src/pure/bqrs-cli-types";

2
extensions/ql-vscode/test/vscode-tests/no-workspace/test-adapter.test.ts
View File

@@ -12,7 +12,7 @@ import {
import { QLTestAdapter } from "../../../src/test-adapter"; import { QLTestAdapter } from "../../../src/test-adapter";
import { CodeQLCliServer } from "../../../src/cli"; import { CodeQLCliServer } from "../../../src/cli";
import { DatabaseManager } from "../../../src/local-databases"; import { DatabaseManager } from "../../../src/databases/local-databases";
import { mockedObject } from "../utils/mocking.helpers"; import { mockedObject } from "../utils/mocking.helpers";
import { TestRunner } from "../../../src/test-runner"; import { TestRunner } from "../../../src/test-runner";
import { import {

2
extensions/ql-vscode/test/vscode-tests/no-workspace/test-runner-helpers.ts
View File

@@ -1,7 +1,7 @@
import { Uri } from "vscode"; import { Uri } from "vscode";
import { mockedObject } from "../utils/mocking.helpers"; import { mockedObject } from "../utils/mocking.helpers";
import { CodeQLCliServer } from "../../../src/cli"; import { CodeQLCliServer } from "../../../src/cli";
import { DatabaseManager } from "../../../src/local-databases"; import { DatabaseManager } from "../../../src/databases/local-databases";
/** /**
* Fake QL tests used by various tests. * Fake QL tests used by various tests.

2
extensions/ql-vscode/test/vscode-tests/no-workspace/test-runner.test.ts
View File

@@ -5,7 +5,7 @@ import {
DatabaseItemImpl, DatabaseItemImpl,
DatabaseManager, DatabaseManager,
FullDatabaseOptions, FullDatabaseOptions,
} from "../../../src/local-databases"; } from "../../../src/databases/local-databases";
import { mockedObject } from "../utils/mocking.helpers"; import { mockedObject } from "../utils/mocking.helpers";
import { TestRunner } from "../../../src/test-runner"; import { TestRunner } from "../../../src/test-runner";
import { createMockLogger } from "../../__mocks__/loggerMock"; import { createMockLogger } from "../../__mocks__/loggerMock";

2
extensions/ql-vscode/test/vscode-tests/utils/mocking.helpers.ts
View File

@@ -1,5 +1,5 @@
import { QuickPickItem, window, Uri } from "vscode"; import { QuickPickItem, window, Uri } from "vscode";
import { DatabaseItem } from "../../../src/local-databases"; import { DatabaseItem } from "../../../src/databases/local-databases";
export type DeepPartial<T> = T extends object export type DeepPartial<T> = T extends object
? { ? {