Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(postgres): qualify cross-schema tables in new-query SQL

弈秋33320c775fbb
diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vue
index de0ac1202b..d963b42c72 100644
--- a/apps/desktop/src/components/layout/ContentArea.vue
+++ b/apps/desktop/src/components/layout/ContentArea.vue
@@ -165,6 +165,7 @@ import { useConnectionStore } from "@/stores/connectionStore";
import { useProductionSafetyStore } from "@/stores/productionSafetyStore";
import type { ContentAreaSurfaceEmits, ContentAreaSurfaceProps } from "@/components/layout/querySurfaces";
import { TABLE_FONT_SIZE_MAX, TABLE_FONT_SIZE_MIN, useSettingsStore, type DataGridRowNumberMode, type DataGridSearchMode, type ResultRunDisplayMode } from "@/stores/settingsStore";
+import { applySqlKeywordCase, loadSqlKeywordSpans } from "@/lib/sql/sqlKeywordCase";
import { useToast } from "@/composables/useToast";
import { isTauriRuntime } from "@/lib/backend/tauriRuntime";
import { canCancelQueryExecution, isActiveResultLoading, queryExecutionLabelKey, shouldShowCancelAction } from "@/lib/sql/queryExecutionState";
@@ -482,11 +483,20 @@ function viewTableSql(preview: DataGridSqlPreview) {
};
}
-function openTableSqlInNewQuery(sql: string) {
+async function openTableSqlInNewQuery(sql: string) {
const snapshot = tableSqlPreview.value;
if (!snapshot?.connectionId || !sql.trim()) return;
tableSqlPreview.value = null;
- queryStore.createTab(snapshot.connectionId, snapshot.database, undefined, "query", snapshot.schema, sql, snapshot.catalog, { forceNew: true, schemaQualifiesSql: true });
+ // The grid's preview SQL is generated uppercase; a query tab opened from it
+ // should still honor the formatter's keyword case setting (issue #13235).
+ const keywordCase = settingsStore.editorSettings.sqlFormatter.keywordCase;
+ let sqlForTab = sql;
+ if (keywordCase === "lower" || keywordCase === "upper") {
+ const dialect = sqlFormatDialectForDbType(activeEffectiveDatabaseType.value);
+ const spans = await loadSqlKeywordSpans(sql, dialect);
+ if (spans) sqlForTab = applySqlKeywordCase(sql, { from: 0, to: sql.length }, keywordCase, spans);
+ }
+ queryStore.createTab(snapshot.connectionId, snapshot.database, undefined, "query", snapshot.schema, sqlForTab, snapshot.catalog, { forceNew: true, schemaQualifiesSql: true });
}
watch(
diff --git a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue
index ce8e8f95bf..f1e83f1af9 100644
--- a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue
+++ b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue
@@ -2232,6 +2232,7 @@ async function newQuery(options: { reuseQueryTabByScope?: boolean } = {}) {
database: node.database,
schema: node.schema,
includeDatabaseName: settingsStore.editorSettings.generateSqlIncludeDatabaseName,
+ defaultSchema: config?.default_schema,
quoteIdentifiers: settingsStore.editorSettings.generateSqlQuoteIdentifiers,
keywordCase: settingsStore.editorSettings.sqlFormatter.keywordCase,
tableName: node.label,
@@ -2299,7 +2300,7 @@ async function loadTemplateContext(allowView = false, node: TreeNode = activeNod
}
const identifierQuote = connectionStore.connectionIdentifierQuote(node.connectionId);
- return { node, dbType, driverProfile: config?.driver_profile, identifierQuote, tableSchema, columns, tableType };
+ return { node, dbType, driverProfile: config?.driver_profile, identifierQuote, tableSchema, columns, tableType, defaultSchema: config?.default_schema };
}
type TableTemplateContext = NonNullable<Awaited<ReturnType<typeof loadTemplateContext>>>;
@@ -2334,6 +2335,7 @@ async function newSelectTemplate() {
database: context.node.database,
schema: context.tableSchema,
includeDatabaseName: settingsStore.editorSettings.generateSqlIncludeDatabaseName,
+ defaultSchema: context.defaultSchema,
quoteIdentifiers: settingsStore.editorSettings.generateSqlQuoteIdentifiers,
keywordCase: settingsStore.editorSettings.sqlFormatter.keywordCase,
tableName: context.node.label,
@@ -2354,6 +2356,7 @@ async function newSelectTemplate() {
database: context.node.database,
schema: context.tableSchema,
includeDatabaseName: settingsStore.editorSettings.generateSqlIncludeDatabaseName,
+ defaultSchema: context.defaultSchema,
quoteIdentifiers: settingsStore.editorSettings.generateSqlQuoteIdentifiers,
keywordCase: settingsStore.editorSettings.sqlFormatter.keywordCase,
tableName: context.node.label,
@@ -2407,6 +2410,7 @@ function insertTemplateOptions(context: TableTemplateContext, rowCount: number)
database: context.node.database,
schema: context.tableSchema,
includeDatabaseName: settingsStore.editorSettings.generateSqlIncludeDatabaseName,
+ defaultSchema: context.defaultSchema,
quoteIdentifiers: settingsStore.editorSettings.generateSqlQuoteIdentifiers,
tableName: context.node.label,
columns: context.columns,
@@ -2452,6 +2456,7 @@ async function newUpdateTemplate() {
database: context.node.database,
schema: context.tableSchema,
includeDatabaseName: settingsStore.editorSettings.generateSqlIncludeDatabaseName,
+ defaultSchema: context.defaultSchema,
quoteIdentifiers: settingsStore.editorSettings.generateSqlQuoteIdentifiers,
tableName: context.node.label,
columns: context.columns,
@@ -2471,6 +2476,7 @@ async function newUpdateTemplate() {
database: context.node.database,
schema: context.tableSchema,
includeDatabaseName: settingsStore.editorSettings.generateSqlIncludeDatabaseName,
+ defaultSchema: context.defaultSchema,
quoteIdentifiers: settingsStore.editorSettings.generateSqlQuoteIdentifiers,
tableName: context.node.label,
columns: context.columns,
@@ -2496,6 +2502,7 @@ async function newDeleteTemplate() {
database: context.node.database,
schema: context.tableSchema,
includeDatabaseName: settingsStore.editorSettings.generateSqlIncludeDatabaseName,
+ defaultSchema: context.defaultSchema,
quoteIdentifiers: settingsStore.editorSettings.generateSqlQuoteIdentifiers,
tableName: context.node.label,
columns: context.columns,
@@ -2515,6 +2522,7 @@ async function newDeleteTemplate() {
database: context.node.database,
schema: context.tableSchema,
includeDatabaseName: settingsStore.editorSettings.generateSqlIncludeDatabaseName,
+ defaultSchema: context.defaultSchema,
quoteIdentifiers: settingsStore.editorSettings.generateSqlQuoteIdentifiers,
tableName: context.node.label,
columns: context.columns,
diff --git a/apps/desktop/src/lib/__tests__/table/tableSelectSql.spec.ts b/apps/desktop/src/lib/__tests__/table/tableSelectSql.spec.ts
index 9649e47338..cf8efc3917 100644
--- a/apps/desktop/src/lib/__tests__/table/tableSelectSql.spec.ts
+++ b/apps/desktop/src/lib/__tests__/table/tableSelectSql.spec.ts
@@ -176,6 +176,20 @@ describe("qualifiedTableName — SQL Server linked servers", () => {
});
});
+describe("qualifiedTableName — PostgreSQL family schema qualifier (#13235)", () => {
+ it("qualifies a table outside the connection's default schema even with includeDatabaseName off", () => {
+ expect(qualifiedTableName({ databaseType: "postgres", identifierQuote: '"', schema: "analytics", tableName: "users", includeDatabaseName: false, defaultSchema: "public" })).toBe("analytics.users");
+ expect(qualifiedTableName({ databaseType: "opengauss", identifierQuote: '"', schema: "public", tableName: "t", includeDatabaseName: false, defaultSchema: "$user" })).toBe("public.t");
+ expect(qualifiedTableName({ databaseType: "kingbase", identifierQuote: '"', schema: "audit", tableName: "events", includeDatabaseName: false, defaultSchema: "public" })).toBe('"audit"."events"');
+ });
+
+ it("keeps the bare name for the default schema and when the default schema is unknown (#9110)", () => {
+ expect(qualifiedTableName({ databaseType: "postgres", identifierQuote: '"', schema: "public", tableName: "users", includeDatabaseName: false, defaultSchema: "public" })).toBe("users");
+ expect(qualifiedTableName({ databaseType: "postgres", identifierQuote: '"', schema: "analytics", tableName: "users", includeDatabaseName: false })).toBe("users");
+ expect(qualifiedTableName({ databaseType: "postgres", identifierQuote: '"', tableName: "users", includeDatabaseName: false, defaultSchema: "public" })).toBe("users");
+ });
+});
+
describe("qualifiedTableName — schema-aware JDBC profiles", () => {
it("qualifies Phoenix tables without forcing identifier quotes", () => {
expect(qualifiedTableName({ databaseType: "jdbc", driverProfile: "phoenix", schema: "DEMO", tableName: "STUDENT" })).toBe("DEMO.STUDENT");
diff --git a/apps/desktop/src/lib/table/tableSelectSql.ts b/apps/desktop/src/lib/table/tableSelectSql.ts
index 6d32eb4819..a345a6bc09 100644
--- a/apps/desktop/src/lib/table/tableSelectSql.ts
+++ b/apps/desktop/src/lib/table/tableSelectSql.ts
@@ -201,8 +201,8 @@ function quoteCypherIdentifier(name: string): string {
return `\`${name.replace(/`/g, "``")}\``;
}
-export function qualifiedTableName(options: Pick<BuildTableSelectSqlOptions, "databaseType" | "driverProfile" | "identifierQuote" | "schema" | "tableName" | "catalog" | "database" | "includeDatabaseName" | "quoteIdentifiers">): string {
- const { databaseType, driverProfile, identifierQuote, schema, tableName, catalog, database, includeDatabaseName, quoteIdentifiers } = options;
+export function qualifiedTableName(options: Pick<BuildTableSelectSqlOptions, "databaseType" | "driverProfile" | "identifierQuote" | "schema" | "tableName" | "catalog" | "database" | "includeDatabaseName" | "quoteIdentifiers"> & { defaultSchema?: string }): string {
+ const { databaseType, driverProfile, identifierQuote, schema, tableName, catalog, database, includeDatabaseName, quoteIdentifiers, defaultSchema } = options;
const quoteTable = (name: string) => (quoteIdentifiers === false ? quoteTableIdentifierIfNeeded(databaseType, name, identifierQuote) : quoteTableIdentifier(databaseType, name));
const quoteTableData = (name: string) => (quoteIdentifiers === false ? quoteTableIdentifierIfNeeded(databaseType, name, identifierQuote) : quoteTableDataIdentifier(databaseType, name, identifierQuote));
if (databaseType === "gbase8s" || (databaseType === "informix" && driverProfile?.trim().toLowerCase() === "gbase8s")) {
@@ -230,8 +230,21 @@ export function qualifiedTableName(options: Pick<BuildTableSelectSqlOptions, "da
return quoteTable(tableName);
}
if ((databaseType === "gaussdb" || databaseType === "opengauss" || databaseType === "postgres" || databaseType === "kingbase") && identifierQuote != null) {
+ // On the PostgreSQL family the schema — not the database, which these
+ // engines cannot cross on one connection — is the addressing dimension.
+ // It stays omitted by default (#9110), but a table outside the
+ // connection's default schema is always qualified (#13235): a bare name
+ // would silently resolve through search_path into the default schema's
+ // table. Callers without a known defaultSchema keep the legacy behavior.
const quotedTable = quoteTableData(tableName);
- if (dropsSchemaQualifier(databaseType, includeDatabaseName)) return quotedTable;
+ if (dropsSchemaQualifier(databaseType, includeDatabaseName)) {
+ const trimmedSchema = schema?.trim();
+ const trimmedDefault = defaultSchema?.trim();
+ if (trimmedSchema && trimmedDefault && trimmedSchema !== trimmedDefault) {
+ return `${quoteTableData(trimmedSchema)}.${quotedTable}`;
+ }
+ return quotedTable;
+ }
const trimmedSchema = schema?.trim();
if (trimmedSchema) {
return `${quoteTableData(trimmedSchema)}.${quotedTable}`;
diff --git a/apps/desktop/src/lib/table/tableSqlTemplates.ts b/apps/desktop/src/lib/table/tableSqlTemplates.ts
index 5deb6f5c79..9b6a7742fb 100644
--- a/apps/desktop/src/lib/table/tableSqlTemplates.ts
+++ b/apps/desktop/src/lib/table/tableSqlTemplates.ts
@@ -10,6 +10,8 @@ export interface TableSqlTemplateOptions {
catalog?: string;
database?: string;
includeDatabaseName?: boolean;
+ /** Connection default schema; the PostgreSQL family qualifies tables outside it (#13235). */
+ defaultSchema?: string;
/** Omit optional identifier quotes while retaining quotes required by the dialect. */
quoteIdentifiers?: boolean;
keywordCase?: SqlFormatterCase;
@@ -158,6 +160,7 @@ function templateTableName(options: TableSqlTemplateOptions): string {
catalog: options.catalog,
database: options.database,
includeDatabaseName: options.includeDatabaseName,
+ defaultSchema: options.defaultSchema,
quoteIdentifiers: options.quoteIdentifiers,
schema: options.schema,
tableName: options.tableName,