feat(sql-library): support batch connection and database changes

Closes #9471
This commit is contained in:
t8y2 committed 2026-09-27 22:37:48 +00:00
1 parent 32f60e1fd3
commit 43ddfce93d
19 files changed
+850 -14

No files matched your search

@@ -0,0 +1,61 @@
import { describe, expect, it } from "vitest";
import { savedSqlBatchReassignment } from "@/lib/savedSql/savedSqlBatchTarget";
import { savedSqlBatchErrorMessage } from "@/lib/savedSql/savedSqlErrors";
import type { SavedSqlFile, SavedSqlFolder } from "@/types/database";
const file: SavedSqlFile = {
id: "file-1",
connectionId: "source",
folderId: "folder-1",
name: "report.sql",
database: "sales",
catalog: "hive",
schema: "reporting",
sql: "SELECT 1;",
orderIndex: 2,
createdAt: "2026-09-01T00:00:00.000Z",
updatedAt: "2026-09-01T00:00:00.000Z",
};
const folder: SavedSqlFolder = {
id: "folder-1",
connectionId: "source",
name: "Reports",
createdAt: "2026-09-01T00:00:00.000Z",
updatedAt: "2026-09-01T00:00:00.000Z",
};
describe("savedSqlBatchReassignment", () => {
it("keeps the schema and folder when the execution namespace is unchanged", () => {
expect(savedSqlBatchReassignment(file, folder, { connectionId: "source", database: "sales", catalog: "hive" })).toEqual({
target: { connectionId: "source", database: "sales", catalog: "hive", schema: "reporting" },
folderId: "folder-1",
});
});
it("clears the old catalog and schema while preserving the library folder across connections", () => {
expect(savedSqlBatchReassignment(file, folder, { connectionId: "target", database: "analytics" })).toEqual({
target: { connectionId: "target", database: "analytics", catalog: undefined, schema: undefined },
folderId: "folder-1",
});
});
it("clears the schema when only the database changes and drops an orphaned folder", () => {
expect(savedSqlBatchReassignment(file, undefined, { connectionId: "source", database: "analytics", catalog: "hive" })).toEqual({
target: { connectionId: "source", database: "analytics", catalog: "hive", schema: undefined },
folderId: undefined,
});
});
});
describe("savedSqlBatchErrorMessage", () => {
it("keeps file identities in a bounded aggregate failure message", () => {
const failures = [
{ fileName: "one.sql", error: { code: "SAVED_SQL_NAME_CONFLICT", fileName: "one.sql" } },
{ fileName: "two.sql", error: new Error("write failed") },
{ fileName: "three.sql", error: new Error("offline") },
];
expect(savedSqlBatchErrorMessage(failures, (key, params) => (key === "savedSql.nameConflict" ? `${params?.name} exists` : key), 2)).toBe("one.sql: one.sql exists; two.sql: write failed; … (+1)");
});
});
@@ -0,0 +1,31 @@
import type { SavedSqlFile, SavedSqlFolder } from "@/types/database";
import type { SavedSqlExecutionTarget } from "@/lib/savedSql/savedSqlExecutionTarget";
export interface SavedSqlBatchTargetSelection {
connectionId: string;
database: string;
catalog?: string;
}
export interface SavedSqlBatchReassignment {
target: SavedSqlExecutionTarget;
folderId?: string;
}
function normalizedCatalog(catalog: string | null | undefined): string | undefined {
return catalog || undefined;
}
export function savedSqlBatchReassignment(file: SavedSqlFile, folder: SavedSqlFolder | undefined, selection: SavedSqlBatchTargetSelection): SavedSqlBatchReassignment {
const catalog = normalizedCatalog(selection.catalog);
const keepsNamespace = file.connectionId === selection.connectionId && normalizedCatalog(file.catalog) === catalog && file.database === selection.database;
return {
target: {
connectionId: selection.connectionId,
database: selection.database,
catalog,
schema: keepsNamespace ? file.schema : undefined,
},
folderId: folder?.id === file.folderId ? file.folderId : undefined,
};
}
@@ -8,6 +8,11 @@ interface SavedSqlNameConflictLike {
message?: unknown;
}
export interface SavedSqlBatchFailureLike {
fileName: string;
error: unknown;
}
export function savedSqlErrorMessage(error: unknown, translate: SavedSqlErrorTranslator): string {
const candidate = error as SavedSqlNameConflictLike | null;
if (candidate?.code === "SAVED_SQL_NAME_CONFLICT" && typeof candidate.fileName === "string") {
@@ -16,3 +21,10 @@ export function savedSqlErrorMessage(error: unknown, translate: SavedSqlErrorTra
if (typeof candidate?.message === "string") return candidate.message;
return String(error);
}
export function savedSqlBatchErrorMessage(failures: readonly SavedSqlBatchFailureLike[], translate: SavedSqlErrorTranslator, limit = 3): string {
const visible = failures.slice(0, limit).map((failure) => `${failure.fileName}: ${savedSqlErrorMessage(failure.error, translate)}`);
const remaining = failures.length - visible.length;
if (remaining > 0) visible.push(`… (+${remaining})`);
return visible.join("; ");
}