feat(sql-library): auto-associate database and retarget folders
This commit is contained in:
1 parent
e5b1a93359
commit
d9594db3fa
9 files changed
+266
-14
No files matched your search
@@ -56,4 +56,45 @@ describe("saved SQL execution targets", () => {
|
||||
catalog: "runtime_catalog",
|
||||
});
|
||||
});
|
||||
|
||||
it("inherits currentTarget database when saved file database is empty", () => {
|
||||
const unassociatedTarget = { connectionId: "saved-connection", database: "", schema: undefined, catalog: undefined };
|
||||
expect(
|
||||
resolveSavedSqlExecutionTarget(unassociatedTarget, "saved", {
|
||||
connectionId: "saved-connection",
|
||||
database: "active_db",
|
||||
schema: "active_schema",
|
||||
catalog: "active_catalog",
|
||||
}),
|
||||
).toEqual({
|
||||
connectionId: "saved-connection",
|
||||
database: "active_db",
|
||||
schema: "active_schema",
|
||||
catalog: "active_catalog",
|
||||
});
|
||||
});
|
||||
|
||||
it("extracts candidate database from file name when saved database is empty", () => {
|
||||
const fileWithPrefix = {
|
||||
connectionId: "saved-connection",
|
||||
database: "",
|
||||
name: "aisp_aikf - 全量呼入数据.sql",
|
||||
};
|
||||
expect(resolveSavedSqlExecutionTarget(fileWithPrefix, "saved")).toEqual({
|
||||
connectionId: "saved-connection",
|
||||
database: "aisp_aikf",
|
||||
schema: undefined,
|
||||
catalog: undefined,
|
||||
});
|
||||
});
|
||||
|
||||
it("uses fallbackDatabase when saved file database is empty and no candidate exists", () => {
|
||||
const emptyTarget = { connectionId: "saved-connection", database: "", name: "plain_query.sql" };
|
||||
expect(resolveSavedSqlExecutionTarget(emptyTarget, "saved", undefined, "default_db")).toEqual({
|
||||
connectionId: "saved-connection",
|
||||
database: "default_db",
|
||||
schema: undefined,
|
||||
catalog: undefined,
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,5 +1,5 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { ensureSqlExtension, nextAvailableSqlName, stripSqlExtension } from "@/lib/savedSql/savedSqlFileName";
|
||||
import { ensureSqlExtension, extractCandidateDatabaseFromName, nextAvailableSqlName, stripSqlExtension } from "@/lib/savedSql/savedSqlFileName";
|
||||
|
||||
describe("savedSqlFileName", () => {
|
||||
it("appends .sql when missing", () => {
|
||||
@@ -17,6 +17,19 @@ describe("savedSqlFileName", () => {
|
||||
it("strips .sql extension case-insensitively", () => {
|
||||
expect(stripSqlExtension("report.SQL")).toBe("report");
|
||||
});
|
||||
|
||||
it("extracts candidate database from prefix with hyphen separator", () => {
|
||||
expect(extractCandidateDatabaseFromName("aisp_aikf - 全量呼入数据.sql")).toBe("aisp_aikf");
|
||||
expect(extractCandidateDatabaseFromName("prod_db - test_query.sql")).toBe("prod_db");
|
||||
expect(extractCandidateDatabaseFromName("my_db-report.sql")).toBe("my_db");
|
||||
expect(extractCandidateDatabaseFromName("F56 - ai稽核.sql")).toBe("F56");
|
||||
});
|
||||
|
||||
it("returns undefined when no candidate database prefix exists", () => {
|
||||
expect(extractCandidateDatabaseFromName("query.sql")).toBeUndefined();
|
||||
expect(extractCandidateDatabaseFromName("plain_name")).toBeUndefined();
|
||||
expect(extractCandidateDatabaseFromName("最近10天转写.sql")).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe("nextAvailableSqlName", () => {
|
||||
|
||||
@@ -37,4 +37,19 @@ describe("savedSqlImportTarget", () => {
|
||||
catalog: undefined,
|
||||
});
|
||||
});
|
||||
|
||||
it("applies fallback database when source has no database", () => {
|
||||
expect(savedSqlImportTarget({ connectionId: "", database: "" }, { connectionId: "conn-1" }, "fallback_db")).toEqual({
|
||||
connectionId: "conn-1",
|
||||
database: "fallback_db",
|
||||
catalog: undefined,
|
||||
schema: undefined,
|
||||
});
|
||||
expect(savedSqlImportTarget({ connectionId: "", database: "" }, undefined, "fallback_db")).toEqual({
|
||||
connectionId: "",
|
||||
database: "fallback_db",
|
||||
catalog: undefined,
|
||||
schema: undefined,
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,4 +1,5 @@
|
||||
import type { QueryTab, SavedSqlFile } from "@/types/database";
|
||||
import { extractCandidateDatabaseFromName } from "@/lib/savedSql/savedSqlFileName";
|
||||
|
||||
export type SavedSqlOpenTargetMode = "saved" | "current";
|
||||
|
||||
@@ -31,9 +32,24 @@ export function savedSqlExecutionTargetFromTab(tab: QueryTabTarget | undefined):
|
||||
};
|
||||
}
|
||||
|
||||
export function resolveSavedSqlExecutionTarget(file: SavedSqlFileTarget, mode: SavedSqlOpenTargetMode, currentTarget?: SavedSqlExecutionTarget): SavedSqlExecutionTarget {
|
||||
export function resolveSavedSqlExecutionTarget(file: SavedSqlFileTarget & { name?: string }, mode: SavedSqlOpenTargetMode, currentTarget?: SavedSqlExecutionTarget, fallbackDatabase?: string): SavedSqlExecutionTarget {
|
||||
if (mode === "current" && currentTarget) return { ...currentTarget };
|
||||
return savedSqlExecutionTargetFromFile(file);
|
||||
const target = savedSqlExecutionTargetFromFile(file);
|
||||
if (!target.database) {
|
||||
if (currentTarget?.database && (!target.connectionId || target.connectionId === currentTarget.connectionId)) {
|
||||
target.database = currentTarget.database;
|
||||
if (!target.connectionId) target.connectionId = currentTarget.connectionId;
|
||||
target.catalog ??= currentTarget.catalog;
|
||||
target.schema ??= currentTarget.schema;
|
||||
} else if (file.name) {
|
||||
const candidate = extractCandidateDatabaseFromName(file.name);
|
||||
if (candidate) target.database = candidate;
|
||||
}
|
||||
if (!target.database && fallbackDatabase) {
|
||||
target.database = fallbackDatabase;
|
||||
}
|
||||
}
|
||||
return target;
|
||||
}
|
||||
|
||||
export function savedSqlDefaultTargetForWrite(currentTarget: SavedSqlExecutionTarget): SavedSqlFileTarget {
|
||||
|
||||
@@ -51,3 +51,14 @@ export function nextAvailableSqlName(baseName: string, takenNames: ReadonlySet<s
|
||||
while (normalizedTakenNames.has(format(index).toLocaleLowerCase())) index++;
|
||||
return format(index);
|
||||
}
|
||||
|
||||
/**
|
||||
* Extracts a candidate database name from a filename or folder name when users name
|
||||
* files like `dbname - query.sql` or organize queries with database prefixes.
|
||||
*/
|
||||
export function extractCandidateDatabaseFromName(name: string): string | undefined {
|
||||
const stripped = stripSqlExtension(name).trim();
|
||||
const match = /^([a-zA-Z0-9_]+)\s*[-–—]\s*.+/.exec(stripped);
|
||||
if (match && match[1]) return match[1];
|
||||
return undefined;
|
||||
}
|
||||
@@ -1,11 +1,18 @@
|
||||
import type { SavedSqlFolder } from "@/types/database";
|
||||
import type { ExternalSqlFileTarget } from "@/lib/sql/externalSqlFileTarget";
|
||||
|
||||
export function savedSqlImportTarget(sourceTarget: ExternalSqlFileTarget, folder?: Pick<SavedSqlFolder, "connectionId">): ExternalSqlFileTarget {
|
||||
if (!folder) return sourceTarget;
|
||||
export function savedSqlImportTarget(sourceTarget: ExternalSqlFileTarget, folder?: Pick<SavedSqlFolder, "connectionId">, fallbackDatabase?: string): ExternalSqlFileTarget {
|
||||
if (!folder) {
|
||||
return {
|
||||
connectionId: sourceTarget.connectionId,
|
||||
database: sourceTarget.database || fallbackDatabase || "",
|
||||
catalog: sourceTarget.catalog,
|
||||
schema: sourceTarget.schema,
|
||||
};
|
||||
}
|
||||
return {
|
||||
connectionId: folder.connectionId,
|
||||
database: sourceTarget.connectionId === folder.connectionId ? sourceTarget.database : "",
|
||||
database: (sourceTarget.connectionId === folder.connectionId ? sourceTarget.database : "") || fallbackDatabase || "",
|
||||
catalog: sourceTarget.connectionId === folder.connectionId ? sourceTarget.catalog : undefined,
|
||||
schema: sourceTarget.connectionId === folder.connectionId ? sourceTarget.schema : undefined,
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user