Skip to content

Commit 8c9c38e

Browse files
chariskcharisk
authored
Merge pull request #2377 from github/charisk/move-databse-files
Move database files
2 parents 57cc965 + 0941417 commit 8c9c38e

51 files changed

Lines changed: 107 additions & 98 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎extensions/ql-vscode/src/common/commands.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { CommandManager } from "../packages/commands";
22
import type { Uri, Range, TextDocumentShowOptions } from "vscode";
33
import type { AstItem } from "../language-support";
44
import type { DbTreeViewItem } from "../databases/ui/db-tree-view-item";
5-
import type { DatabaseItem } from "../local-databases";
5+
import type { DatabaseItem } from "../databases/local-databases";
66
import type { QueryHistoryInfo } from "../query-history/query-history-info";
77
import type { RepositoriesFilterSortStateWithIds } from "../pure/variant-analysis-filter-sort";
88
import type { TestTreeNode } from "../test-tree-node";

‎extensions/ql-vscode/src/compare/compare-view.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
} from "../pure/interface-types";
88
import { Logger } from "../common";
99
import { CodeQLCliServer } from "../cli";
10-
import { DatabaseManager } from "../local-databases";
10+
import { DatabaseManager } from "../databases/local-databases";
1111
import { jumpToLocation } from "../interface-utils";
1212
import {
1313
transformBqrsResultSet,

‎extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { DataExtensionsEditorView } from "./data-extensions-editor-view";
33
import { DataExtensionsEditorCommands } from "../common/commands";
44
import { CliVersionConstraint, CodeQLCliServer } from "../cli";
55
import { QueryRunner } from "../query-server";
6-
import { DatabaseManager } from "../local-databases";
6+
import { DatabaseManager } from "../databases/local-databases";
77
import { ensureDir } from "fs-extra";
88
import { join } from "path";
99
import { App } from "../common/app";

‎extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import {
2121
import { extLogger } from "../common";
2222
import { outputFile, pathExists, readFile } from "fs-extra";
2323
import { load as loadYaml } from "js-yaml";
24-
import { DatabaseItem, DatabaseManager } from "../local-databases";
24+
import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
2525
import { CodeQLCliServer } from "../cli";
2626
import { asError, assertNever, getErrorMessage } from "../pure/helpers-pure";
2727
import { generateFlowModel } from "./generate-flow-model";
28-
import { promptImportGithubDatabase } from "../databaseFetcher";
28+
import { promptImportGithubDatabase } from "../databases/database-fetcher";
2929
import { App } from "../common/app";
3030
import { ResolvableLocationValue } from "../pure/bqrs-cli-types";
3131
import { showResolvableLocation } from "../interface-utils";

‎extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
showAndLogErrorMessage,
1111
} from "../helpers";
1212
import { ProgressCallback } from "../progress";
13-
import { DatabaseItem } from "../local-databases";
13+
import { DatabaseItem } from "../databases/local-databases";
1414
import { getQlPackPath, QLPACK_FILENAMES } from "../pure/ql";
1515
import { getErrorMessage } from "../pure/helpers-pure";
1616
import { ExtensionPack, ExtensionPackModelFile } from "./shared/extension-pack";

‎extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
import { TeeLogger } from "../common";
1010
import { CancellationToken } from "vscode";
1111
import { CodeQLCliServer } from "../cli";
12-
import { DatabaseItem } from "../local-databases";
12+
import { DatabaseItem } from "../databases/local-databases";
1313
import { ProgressCallback } from "../progress";
1414
import { fetchExternalApiQueries } from "./queries";
1515
import { QueryResultType } from "../pure/new-messages";

‎extensions/ql-vscode/src/data-extensions-editor/generate-flow-model.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { CancellationToken } from "vscode";
2-
import { DatabaseItem } from "../local-databases";
2+
import { DatabaseItem } from "../databases/local-databases";
33
import { join } from "path";
44
import { QueryRunner } from "../query-server";
55
import { CodeQLCliServer } from "../cli";

extensions/ql-vscode/src/databaseFetcher.ts renamed to extensions/ql-vscode/src/databases/database-fetcher.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import fetch, { Response } from "node-fetch";
22
import { zip } from "zip-a-folder";
33
import { Open } from "unzipper";
44
import { Uri, CancellationToken, window, InputBoxOptions } from "vscode";
5-
import { CodeQLCliServer } from "./cli";
5+
import { CodeQLCliServer } from "../cli";
66
import {
77
ensureDir,
88
realpath as fs_realpath,
@@ -17,17 +17,17 @@ import * as Octokit from "@octokit/rest";
1717
import { retry } from "@octokit/plugin-retry";
1818

1919
import { DatabaseManager, DatabaseItem } from "./local-databases";
20-
import { showAndLogInformationMessage, tmpDir } from "./helpers";
21-
import { reportStreamProgress, ProgressCallback } from "./progress";
22-
import { extLogger } from "./common";
23-
import { getErrorMessage } from "./pure/helpers-pure";
20+
import { showAndLogInformationMessage, tmpDir } from "../helpers";
21+
import { reportStreamProgress, ProgressCallback } from "../progress";
22+
import { extLogger } from "../common";
23+
import { getErrorMessage } from "../pure/helpers-pure";
2424
import {
2525
getNwoFromGitHubUrl,
2626
isValidGitHubNwo,
27-
} from "./common/github-url-identifier-helper";
28-
import { Credentials } from "./common/authentication";
29-
import { AppCommandManager } from "./common/commands";
30-
import { ALLOW_HTTP_SETTING } from "./config";
27+
} from "../common/github-url-identifier-helper";
28+
import { Credentials } from "../common/authentication";
29+
import { AppCommandManager } from "../common/commands";
30+
import { ALLOW_HTTP_SETTING } from "../config";
3131

3232
/**
3333
* Prompts a user to fetch a database from a remote location. Database is assumed to be an archive file.

extensions/ql-vscode/src/local-databases-ui.ts renamed to extensions/ql-vscode/src/databases/local-databases-ui.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { join, basename, dirname as path_dirname } from "path";
2-
import { DisposableObject } from "./pure/disposable-object";
2+
import { DisposableObject } from "../pure/disposable-object";
33
import {
44
Event,
55
EventEmitter,
@@ -27,25 +27,25 @@ import {
2727
ProgressContext,
2828
withInheritedProgress,
2929
withProgress,
30-
} from "./progress";
30+
} from "../progress";
3131
import {
3232
isLikelyDatabaseRoot,
3333
isLikelyDbLanguageFolder,
3434
showAndLogErrorMessage,
3535
showAndLogExceptionWithTelemetry,
36-
} from "./helpers";
37-
import { extLogger } from "./common";
36+
} from "../helpers";
37+
import { extLogger } from "../common";
3838
import {
3939
importArchiveDatabase,
4040
promptImportGithubDatabase,
4141
promptImportInternetDatabase,
42-
} from "./databaseFetcher";
43-
import { asError, asyncFilter, getErrorMessage } from "./pure/helpers-pure";
44-
import { QueryRunner } from "./query-server";
45-
import { isCanary } from "./config";
46-
import { App } from "./common/app";
47-
import { redactableError } from "./pure/errors";
48-
import { LocalDatabasesCommands } from "./common/commands";
42+
} from "./database-fetcher";
43+
import { asError, asyncFilter, getErrorMessage } from "../pure/helpers-pure";
44+
import { QueryRunner } from "../query-server";
45+
import { isCanary } from "../config";
46+
import { App } from "../common/app";
47+
import { redactableError } from "../pure/errors";
48+
import { LocalDatabasesCommands } from "../common/commands";
4949

5050
enum SortOrder {
5151
NameAsc = "NameAsc",

extensions/ql-vscode/src/local-databases.ts renamed to extensions/ql-vscode/src/databases/local-databases.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { pathExists, stat, remove } from "fs-extra";
22
import { glob } from "glob";
33
import { join, basename, resolve, relative, dirname, extname } from "path";
44
import * as vscode from "vscode";
5-
import * as cli from "./cli";
5+
import * as cli from "../cli";
66
import { ExtensionContext } from "vscode";
77
import {
88
showAndLogWarningMessage,
@@ -12,24 +12,24 @@ import {
1212
isFolderAlreadyInWorkspace,
1313
showBinaryChoiceDialog,
1414
getFirstWorkspaceFolder,
15-
} from "./helpers";
16-
import { ProgressCallback, withProgress } from "./progress";
15+
} from "../helpers";
16+
import { ProgressCallback, withProgress } from "../progress";
1717
import {
1818
zipArchiveScheme,
1919
encodeArchiveBasePath,
2020
decodeSourceArchiveUri,
2121
encodeSourceArchiveUri,
22-
} from "./archive-filesystem-provider";
23-
import { DisposableObject } from "./pure/disposable-object";
24-
import { Logger, extLogger } from "./common";
25-
import { asError, getErrorMessage } from "./pure/helpers-pure";
26-
import { QueryRunner } from "./query-server";
27-
import { pathsEqual } from "./pure/files";
28-
import { redactableError } from "./pure/errors";
29-
import { isCodespacesTemplate } from "./config";
30-
import { QlPackGenerator } from "./qlpack-generator";
31-
import { QueryLanguage } from "./common/query-language";
32-
import { App } from "./common/app";
22+
} from "../archive-filesystem-provider";
23+
import { DisposableObject } from "../pure/disposable-object";
24+
import { Logger, extLogger } from "../common";
25+
import { asError, getErrorMessage } from "../pure/helpers-pure";
26+
import { QueryRunner } from "../query-server";
27+
import { pathsEqual } from "../pure/files";
28+
import { redactableError } from "../pure/errors";
29+
import { isCodespacesTemplate } from "../config";
30+
import { QlPackGenerator } from "../qlpack-generator";
31+
import { QueryLanguage } from "../common/query-language";
32+
import { App } from "../common/app";
3333
import { existsSync } from "fs";
3434

3535
/**

0 commit comments

Comments
 (0)