diff --git a/apps/desktop/src/components/objects/ObjectBrowser.vue b/apps/desktop/src/components/objects/ObjectBrowser.vue index bdd70e3a57..b4c859bf7c 100644 --- a/apps/desktop/src/components/objects/ObjectBrowser.vue +++ b/apps/desktop/src/components/objects/ObjectBrowser.vue @@ -81,7 +81,7 @@ import { codeMirrorSqlDialect, connectionObjectTreeNodeSchema, connectionTableSq import { getTableMetadataCapabilities, type TableMetadataCapabilities } from "@/lib/table/tableMetadataCapabilities"; import { findTableStatistics } from "@/lib/dataGrid/tableInfoOverview"; import { constraintsForConstraintsTab } from "@/lib/table/constraintPresentation"; -import { buildTableSelectSql } from "@/lib/table/tableSelectSql"; +import { buildTableSelectSql, dropsSchemaQualifier } from "@/lib/table/tableSelectSql"; import { PARTITION_TREE_INDENT_PX } from "@/lib/table/pgPartitionPresentation"; import { buildDropObjectSql, @@ -2460,7 +2460,14 @@ async function exportTableData(row: ObjectBrowserRow, format: "csv" | "xlsx" | " tableName: row.name, filePath, format, - ...(format === "sql" ? { insertMode, insertDialect, splitMaxMb } : {}), + ...(format === "sql" + ? { + insertMode, + insertDialect, + splitMaxMb, + omitDatabaseQualifier: dropsSchemaQualifier(effectiveDatabaseType.value, settingsStore.editorSettings.generateSqlIncludeDatabaseName, props.catalog), + } + : {}), csvQuoteMode: settingsStore.editorSettings.csvQuoteMode, nullLiteral: csvNullLiteralForMode(settingsStore.editorSettings.csvNullMode), columns, diff --git a/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.spec.ts b/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.spec.ts index d3aad0cfee..28c09a304a 100644 --- a/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.spec.ts +++ b/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.spec.ts @@ -68,6 +68,7 @@ function exportSettings() { exportBatchSize: 128, exportRowLimit: 500, exportRowLimitEnabled: true, + generateSqlIncludeDatabaseName: false, dataGridExtractorOptions: DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS, }, }; @@ -607,6 +608,33 @@ describe("useSidebarTreeExportRuntime", () => { expect(apiMock.startTableExport).toHaveBeenCalledWith(expect.objectContaining({ tableName: "users", filePath: "users.csv" }), expect.any(Function)); }); + it("follows the include-database-name setting for SQL INSERT exports", async () => { + const activeNode = shallowRef({ id: "table-1", type: "table", label: "events", connectionId: "conn-1", database: "warehouse", schema: "warehouse", children: [] } as TreeNode); + const settingsStore = exportSettings(); + const connectionStore = { + ensureConnected: vi.fn(), + getConfig: vi.fn(() => ({ db_type: "mysql" })), + connectionIdentifierQuote: vi.fn(() => "`"), + treeNodes: [], + selectedTreeNodeIds: [], + }; + const runtime = useSidebarTreeExportRuntime({ + activeNode, + connectionStore: connectionStore as never, + settingsStore: settingsStore as never, + acceptedSelectionIds: () => null, + }); + + // 设置关闭(默认):INSERT 目标省略库名,恢复脚本不受目标库影响 (#10771)。 + await runtime.exportData("sql"); + expect(apiMock.startTableExport).toHaveBeenLastCalledWith(expect.objectContaining({ format: "sql", omitDatabaseQualifier: true }), expect.any(Function)); + + // 设置开启:保留限定名。 + settingsStore.editorSettings.generateSqlIncludeDatabaseName = true; + await runtime.exportData("sql"); + expect(apiMock.startTableExport).toHaveBeenLastCalledWith(expect.objectContaining({ format: "sql", omitDatabaseQualifier: false }), expect.any(Function)); + }); + it.each([ ["source", undefined], ["standard", "standard"], diff --git a/apps/desktop/src/composables/useDataGridExport.ts b/apps/desktop/src/composables/useDataGridExport.ts index 5a602443ba..2d06dcf68a 100644 --- a/apps/desktop/src/composables/useDataGridExport.ts +++ b/apps/desktop/src/composables/useDataGridExport.ts @@ -3,6 +3,7 @@ import { useI18n } from "vue-i18n"; import { useDataGridExtractor } from "@/composables/useDataGridExtractor"; import { isTauriRuntime } from "@/lib/backend/tauriRuntime"; import { saveTextFile, sanitizeExportBaseName, compactLocalTimestamp } from "@/lib/export/saveTextFile"; +import { dropsSchemaQualifier } from "@/lib/table/tableSelectSql"; import * as api from "@/lib/backend/api"; import { type CellSelectionMatrix, type CellSelectionRange, type SelectionData } from "@/lib/dataGrid/gridSelection"; import { DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS, type DataGridCopyExtractorId, type DataGridExtractRequest, type DataGridExtractorOptions } from "@/lib/dataGrid/dataGridCopyExtractor"; @@ -1381,7 +1382,14 @@ export function useDataGridExport(options: UseDataGridExportOptions) { tableName: meta.tableName, filePath: outputPath, format, - ...(format === "sql" && sqlExportOptions ? { insertMode: sqlExportOptions.insertMode, splitMaxMb: sqlExportOptions.splitMaxMb, selectedColumns: sqlExportOptions.selectedColumns } : {}), + ...(format === "sql" && sqlExportOptions + ? { + insertMode: sqlExportOptions.insertMode, + splitMaxMb: sqlExportOptions.splitMaxMb, + selectedColumns: sqlExportOptions.selectedColumns, + omitDatabaseQualifier: dropsSchemaQualifier(databaseType.value, options.includeDatabaseName?.value, meta.catalog), + } + : {}), csvQuoteMode: editorSettings.csvQuoteMode, nullLiteral: csvNullLiteralForMode(editorSettings.csvNullMode), columns: format === "sql" ? effectiveColumns(sourceColumns.value, columns.value).map((column, index) => column ?? columns.value[index]!) : columns.value, diff --git a/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts b/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts index 253e76434f..7f95f2ae25 100644 --- a/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts +++ b/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts @@ -16,6 +16,7 @@ import { joinExportedDdls } from "@/lib/export/ddlExport"; import { translateBackendError } from "@/i18n/backend-errors"; import { sidebarStructureExportTargets, sidebarTableDataExportTargets } from "@/lib/sidebar/sidebarExportRuntime"; import { fetchTableDataForExport } from "@/lib/table/tableDataExport"; +import { dropsSchemaQualifier } from "@/lib/table/tableSelectSql"; import XlsxHeaderDialog from "@/components/export/XlsxHeaderDialog.vue"; import { buildXlsxHeaderOverrides, hasXlsxHeaderComments, type XlsxExportOptions, type XlsxHeaderMode } from "@/lib/export/xlsxHeader"; import { @@ -504,7 +505,12 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt tableName: target.tableName, filePath: outputPath, format, - ...(format === "sql" ? { insertDialect } : {}), + ...(format === "sql" + ? { + insertDialect, + omitDatabaseQualifier: dropsSchemaQualifier(target.databaseType, settingsStore.editorSettings.generateSqlIncludeDatabaseName, target.catalog), + } + : {}), csvQuoteMode: target.csvQuoteMode, nullLiteral: target.nullLiteral, columns: queryColumns, diff --git a/apps/desktop/src/lib/backend/tauri.ts b/apps/desktop/src/lib/backend/tauri.ts index fb37c6b74a..0301e98e80 100644 --- a/apps/desktop/src/lib/backend/tauri.ts +++ b/apps/desktop/src/lib/backend/tauri.ts @@ -5963,6 +5963,11 @@ export interface TableExportRequest { numericColumnRightAlign?: boolean; autoFilter?: boolean; splitMaxMb?: number; + /** + * SQL 导出时省略 INSERT 目标的库/模式限定(前端按「生成 SQL 时包含数据库名」设置 + + * `dropsSchemaQualifier` 引擎规则解析;仅影响 INSERT 目标,读取 SQL 不变)。 + */ + omitDatabaseQualifier?: boolean; } export interface TableCsvExportOptions { diff --git a/crates/dbx-core/src/data/table_export.rs b/crates/dbx-core/src/data/table_export.rs index 0cfbe8c4c2..d5b75adc20 100644 --- a/crates/dbx-core/src/data/table_export.rs +++ b/crates/dbx-core/src/data/table_export.rs @@ -132,6 +132,11 @@ pub struct TableExportRequest { /// file. Ignored for every other format. #[serde(default, skip_serializing_if = "Option::is_none")] pub split_max_mb: Option, + /// SQL 导出时省略 INSERT 目标的库/模式限定。前端按「生成 SQL 时包含数据库名」设置与 + /// 引擎规则(`dropsSchemaQualifier`:MySQL/PG 等可省略,SQL Server/Presto/Trino 必须 + /// 保留)解析后传入;仅影响生成的 INSERT 目标,读取/游标 SQL 不受影响(issue #10771)。 + #[serde(default, skip_serializing_if = "Option::is_none")] + pub omit_database_qualifier: Option, } #[derive(Debug, Clone, Serialize)] @@ -1123,6 +1128,17 @@ fn write_sql_export_statements( Ok(()) } +/// SQL 导出 INSERT 目标的 schema 参数:`omitDatabaseQualifier`(前端已按「生成 SQL 时 +/// 包含数据库名」设置与引擎规则解析)为 true 时省略库/模式限定,其余情况保持原行为 +/// (issue #10771)。读取/游标 SQL 仍使用完整限定名。 +fn export_insert_target_schema(request: &TableExportRequest) -> Option { + if request.omit_database_qualifier == Some(true) { + None + } else { + request.schema.clone() + } +} + fn create_table_export_sql_writer(request: &TableExportRequest) -> Result { if let Some(max_mb) = request.split_max_mb { let zip_path = std::path::Path::new(&request.file_path); @@ -1439,7 +1455,7 @@ async fn try_export_native_table_stream( projection.project_insert_options(BuildExportInsertStatementsOptions { database_type: Some(*db_type), identifier_quote: request.identifier_quote.clone(), - schema: request.schema.clone(), + schema: export_insert_target_schema(request), table_name: Some(request.table_name.clone()), qualified_table_name: None, columns: col_names.to_vec(), @@ -2298,7 +2314,7 @@ async fn export_table_data_core_inner( projection.project_insert_options(BuildExportInsertStatementsOptions { database_type: Some(db_type), identifier_quote: request.identifier_quote.clone(), - schema: request.schema.clone(), + schema: export_insert_target_schema(request), table_name: Some(request.table_name.clone()), qualified_table_name: None, columns: col_names.clone(), @@ -2556,6 +2572,7 @@ mod tests { column_comments: None, auto_filter: None, split_max_mb: None, + omit_database_qualifier: None, }; ExternalDriverExportFixture { state, request, calls, output, dir } @@ -2724,6 +2741,7 @@ mod tests { column_comments: None, auto_filter: None, split_max_mb: None, + omit_database_qualifier: None, }; export_table_data_core(&state, &request, |_| {}).await.unwrap(); @@ -2895,6 +2913,7 @@ mod tests { column_comments: None, auto_filter: None, split_max_mb: None, + omit_database_qualifier: None, }; let context = table_export_sql_context(DatabaseType::Iotdb, None, request.schema.as_deref()); let columns = vec!["Time".to_string(), "root.test.device2.temperature".to_string()]; @@ -2959,6 +2978,7 @@ mod tests { column_comments: None, auto_filter: None, split_max_mb: None, + omit_database_qualifier: None, }; let context = table_export_sql_context(DatabaseType::Iotdb, None, request.schema.as_deref()); let columns = vec!["tImE".to_string(), "temperature".to_string()]; @@ -3001,6 +3021,7 @@ mod tests { column_comments: None, auto_filter: None, split_max_mb: None, + omit_database_qualifier: None, }; let context = table_export_sql_context(DatabaseType::Iotdb, None, request.schema.as_deref()); let error = table_export_query_columns(&request, &context, &["TIME".to_string()]).unwrap_err(); @@ -3038,6 +3059,7 @@ mod tests { column_comments: None, auto_filter: None, split_max_mb: None, + omit_database_qualifier: None, }; let context = table_export_sql_context(DatabaseType::Iotdb, None, request.schema.as_deref()); let columns = vec![ @@ -3083,6 +3105,7 @@ mod tests { column_comments: None, auto_filter: None, split_max_mb: None, + omit_database_qualifier: None, }; let columns = vec!["Time".to_string(), "value".to_string()]; @@ -3140,6 +3163,7 @@ mod tests { column_comments: None, auto_filter: None, split_max_mb: None, + omit_database_qualifier: None, }; let context = table_export_sql_context(DatabaseType::Oracle, None, request.schema.as_deref()); @@ -3191,6 +3215,7 @@ mod tests { column_comments: None, auto_filter: None, split_max_mb: None, + omit_database_qualifier: None, }; let columns = vec!["id".to_string(), "payload".to_string()]; let primary_keys = vec!["id".to_string()]; @@ -3270,6 +3295,7 @@ mod tests { column_comments: None, auto_filter: None, split_max_mb: None, + omit_database_qualifier: None, }; let columns = vec!["id".to_string(), "DisplayName".to_string()]; let primary_keys = vec!["id".to_string()]; @@ -3331,6 +3357,7 @@ mod tests { column_comments: None, auto_filter: None, split_max_mb: None, + omit_database_qualifier: None, }; let columns = vec!["id".to_string(), "geom".to_string(), "name".to_string()]; let column_types = vec![Some("int".to_string()), Some("geometry".to_string()), Some("varchar".to_string())]; @@ -3394,6 +3421,7 @@ mod tests { column_comments: None, auto_filter: None, split_max_mb: None, + omit_database_qualifier: None, }; let context = table_export_sql_context(DatabaseType::Oracle, None, request.schema.as_deref()); let sql = table_cursor_sql(&request, &context, &columns, &[], &primary_keys); @@ -3417,6 +3445,109 @@ mod tests { assert_eq!(statements, vec!["INSERT INTO \"APP\".\"USERS\" (\"ID\", \"NAME\") VALUES (1, 'Ada');"]); } + #[test] + fn export_insert_target_schema_respects_omit_database_qualifier() { + let mut request = TableExportRequest { + export_id: "export-1".to_string(), + connection_id: "conn-1".to_string(), + database: "warehouse".to_string(), + schema: Some("warehouse".to_string()), + identifier_quote: None, + table_name: "events".to_string(), + file_path: "events.sql".to_string(), + format: "sql".to_string(), + insert_mode: Default::default(), + insert_dialect: Default::default(), + csv_quote_mode: CsvQuoteMode::All, + null_literal: String::new(), + columns: None, + selected_columns: None, + column_types: None, + column_extras: None, + primary_keys: None, + exclude_primary_keys: false, + where_input: None, + order_by: None, + skip_count: true, + batch_size: Some(100), + row_limit: None, + date_time_format: None, + numeric_column_right_align: false, + column_comments: None, + auto_filter: None, + split_max_mb: None, + omit_database_qualifier: None, + }; + + // Default / explicit false: keep the existing qualified target. + assert_eq!(export_insert_target_schema(&request), Some("warehouse".to_string())); + request.omit_database_qualifier = Some(false); + assert_eq!(export_insert_target_schema(&request), Some("warehouse".to_string())); + // Opt-in: the INSERT target drops the database/schema qualifier. + request.omit_database_qualifier = Some(true); + assert_eq!(export_insert_target_schema(&request), None); + } + + #[test] + fn mysql_sql_export_omits_database_qualifier_for_the_insert_target() { + // Mirrors the SQL-writer options build for the "sql" format (issue #10771): the read + // keeps the qualified name while the INSERT target follows omitDatabaseQualifier. + let mut request = TableExportRequest { + export_id: "export-1".to_string(), + connection_id: "conn-1".to_string(), + database: "warehouse".to_string(), + schema: Some("warehouse".to_string()), + identifier_quote: None, + table_name: "events".to_string(), + file_path: "events.sql".to_string(), + format: "sql".to_string(), + insert_mode: Default::default(), + insert_dialect: Default::default(), + csv_quote_mode: CsvQuoteMode::All, + null_literal: String::new(), + columns: None, + selected_columns: None, + column_types: None, + column_extras: None, + primary_keys: None, + exclude_primary_keys: false, + where_input: None, + order_by: None, + skip_count: true, + batch_size: Some(100), + row_limit: None, + date_time_format: None, + numeric_column_right_align: false, + column_comments: None, + auto_filter: None, + split_max_mb: None, + omit_database_qualifier: Some(true), + }; + + let build = |request: &TableExportRequest| { + build_export_insert_statements(BuildExportInsertStatementsOptions { + database_type: Some(DatabaseType::Mysql), + identifier_quote: request.identifier_quote.clone(), + schema: export_insert_target_schema(request), + table_name: Some(request.table_name.clone()), + qualified_table_name: None, + columns: vec!["id".to_string()], + column_types: vec![Some("int".to_string())], + column_extras: Vec::new(), + spatial_columns: Vec::new(), + spatial_values: Vec::new(), + rows: vec![vec![json!(1)]], + batch_size: Some(100), + }) + .unwrap() + }; + + assert_eq!(build(&request), vec!["INSERT INTO `events` (`id`) VALUES (1);"]); + + request.omit_database_qualifier = None; + assert_eq!(build(&request), vec!["INSERT INTO `warehouse`.`events` (`id`) VALUES (1);"]); + } + #[test] fn requested_export_columns_preserve_regular_oracle_and_non_oracle_columns() { let oracle_columns = vec!["ROW_ID".to_string(), "NAME".to_string()];