fix(sql): honor include-database-name setting for schema-aware engines

This commit is contained in:
U1 authored and GitHub committed 2026-09-15 13:28:40 +08:00
1 parent 1464d33677
commit 14bcde806f
4 files changed
+131 -20

No files matched your search

+29 -11
View File
@@ -204,16 +204,21 @@ describe("buildSelectAllSql", () => {
expect(buildSelectAllSql("mysql", { database: "mydb", tableName: "users" }, undefined, undefined, true)).toBe("SELECT * FROM `mydb`.`users`");
});
it("qualifies and quotes a PostgreSQL table with its schema", () => {
expect(buildSelectAllSql("postgres", { schema: "public", tableName: "users" })).toBe('SELECT * FROM "public"."users"');
it("omits the PostgreSQL schema qualifier by default; including it is opt-in (#9110)", () => {
expect(buildSelectAllSql("postgres", { schema: "public", tableName: "users" })).toBe('SELECT * FROM "users"');
expect(buildSelectAllSql("postgres", { schema: "public", tableName: "users" }, undefined, undefined, true)).toBe('SELECT * FROM "public"."users"');
});
it("can omit identifier quotes while preserving schema qualification", () => {
expect(buildSelectAllSql("postgres", { schema: "public", tableName: "users" }, undefined, undefined, false, false)).toBe("SELECT * FROM public.users");
it("can omit identifier quotes for a PostgreSQL table", () => {
expect(buildSelectAllSql("postgres", { schema: "public", tableName: "users" }, undefined, undefined, true, false)).toBe("SELECT * FROM public.users");
});
it("preserves the Phoenix schema for new-query prefill", () => {
expect(buildSelectAllSql("jdbc", { schema: "APP", tableName: "USERS" }, '"', "phoenix")).toBe('SELECT * FROM "APP"."USERS"');
it("preserves the Phoenix schema for new-query prefill when qualification is on", () => {
expect(buildSelectAllSql("jdbc", { schema: "APP", tableName: "USERS" }, '"', "phoenix", true)).toBe('SELECT * FROM "APP"."USERS"');
});
it("prefills Phoenix tables unqualified by default (#9110)", () => {
expect(buildSelectAllSql("jdbc", { schema: "APP", tableName: "USERS" }, '"', "phoenix")).toBe('SELECT * FROM "USERS"');
});
it("scopes InfluxDB 1.x / 2.x prefill to a rolling InfluxQL window", () => {
@@ -243,13 +248,15 @@ describe("buildSelectAllSql", () => {
expect(buildSelectAllSql("starrocks", { catalog: "paimon_catalog", database: "bi", tableName: "events" })).toBe("SELECT * FROM `paimon_catalog`.`bi`.`events`");
});
it("uses the driver-reported identifier quote for Kingbase MySQL compat mode", () => {
expect(buildSelectAllSql("kingbase", { schema: "audit_schema", tableName: "events" }, "`")).toBe("SELECT * FROM `audit_schema`.`events`");
expect(buildSelectAllSql("kingbase", { schema: "audit_schema", tableName: "events" }, "`", undefined, true)).toBe("SELECT * FROM `audit_schema`.`events`");
expect(buildSelectAllSql("kingbase", { schema: "audit_schema", tableName: "events" }, "`")).toBe("SELECT * FROM `events`");
});
it("uses the driver-reported identifier quote for Kingbase PostgreSQL mode", () => {
expect(buildSelectAllSql("kingbase", { schema: "audit_schema", tableName: "events" }, '"')).toBe('SELECT * FROM "audit_schema"."events"');
expect(buildSelectAllSql("kingbase", { schema: "audit_schema", tableName: "events" }, '"', undefined, true)).toBe('SELECT * FROM "audit_schema"."events"');
expect(buildSelectAllSql("kingbase", { schema: "audit_schema", tableName: "events" }, '"')).toBe('SELECT * FROM "events"');
});
it("falls back to double quotes for Kingbase when no identifier quote is reported", () => {
expect(buildSelectAllSql("kingbase", { schema: "audit_schema", tableName: "events" })).toBe('SELECT * FROM "audit_schema"."events"');
expect(buildSelectAllSql("kingbase", { schema: "audit_schema", tableName: "events" }, undefined, undefined, true)).toBe('SELECT * FROM "audit_schema"."events"');
});
});
@@ -272,7 +279,7 @@ describe("isNewQueryPrefillSupported", () => {
});
describe("resolveNewQueryInitialSql", () => {
it("prefills SQL from the active table when enabled", () => {
it("prefills bare table SQL from the active table by default; the database name is opt-in", () => {
expect(
resolveNewQueryInitialSql({
activeTab: dataTab(),
@@ -281,6 +288,16 @@ describe("resolveNewQueryInitialSql", () => {
targetDatabase: "app_db",
databaseType: "postgres",
}),
).toBe('SELECT * FROM "users"');
expect(
resolveNewQueryInitialSql({
activeTab: dataTab(),
prefillEnabled: true,
targetConnectionId: "conn-1",
targetDatabase: "app_db",
databaseType: "postgres",
includeDatabaseName: true,
}),
).toBe('SELECT * FROM "public"."users"');
});
@@ -292,6 +309,7 @@ describe("resolveNewQueryInitialSql", () => {
targetConnectionId: "conn-1",
targetDatabase: "app_db",
databaseType: "postgres",
includeDatabaseName: true,
quoteIdentifiers: false,
}),
).toBe("SELECT * FROM public.users");
@@ -308,7 +326,7 @@ describe("resolveNewQueryInitialSql", () => {
driverProfile: "phoenix",
identifierQuote: '"',
}),
).toBe('SELECT * FROM "APP"."USERS"');
).toBe('SELECT * FROM "USERS"');
});
it("leaves new queries empty when the setting is disabled", () => {