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。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
feat(grid): give TSV the CSV copy options and two-row headers
弈秋eb18864c52af
diff --git a/apps/desktop/src/components/grid/DataGridExtractorDialog.vue b/apps/desktop/src/components/grid/DataGridExtractorDialog.vueindex 5504ec6dc2..b4a7f0cafe 100644--- a/apps/desktop/src/components/grid/DataGridExtractorDialog.vue+++ b/apps/desktop/src/components/grid/DataGridExtractorDialog.vue@@ -62,7 +62,7 @@ let previewTimer: ReturnType<typeof setTimeout> | undefined;const draftExtractor = computed<DataGridCopyExtractorId | null>(() => (selectedFormat.value === "smart" ? null : selectedFormat.value));const extractorCategory = computed(() => (draftExtractor.value ? DATA_GRID_COPY_EXTRACTOR_DESCRIPTORS[draftExtractor.value].category : null));const isDsv = computed(() => extractorCategory.value === "delimited");-const supportsCsvOptions = computed(() => draftExtractor.value === "csv" || draftExtractor.value === "csv-with-headers" || draftExtractor.value === "dsv");+const supportsCsvOptions = computed(() => draftExtractor.value === "csv" || draftExtractor.value === "csv-with-headers" || draftExtractor.value === "dsv" || draftExtractor.value === "tsv" || draftExtractor.value === "tsv-with-headers");const isSql = computed(() => draftExtractor.value === "sql-inserts" || draftExtractor.value === "sql-deletes-inserts" || draftExtractor.value === "sql-updates");const isJson = computed(() => extractorCategory.value === "json");const isDbunit = computed(() => draftExtractor.value === "dbunit");@@ -392,7 +392,8 @@ function handleFormatKeydown(event: KeyboardEvent, itemIndex: number) {><SelectContent><SelectItem value="name">{{ t("grid.copyExtractorHeaderName") }}</SelectItem><SelectItem value="description">{{ t("grid.copyExtractorHeaderDescription") }}</SelectItem- ><SelectItem value="both">{{ t("grid.copyExtractorHeaderBoth") }}</SelectItem></SelectContent+ ><SelectItem value="both">{{ t("grid.copyExtractorHeaderBoth") }}</SelectItem+ ><SelectItem value="name-and-description-two-rows">{{ t("grid.copyExtractorHeaderTwoRows") }}</SelectItem></SelectContent></Select></div>diff --git a/apps/desktop/src/components/grid/__tests__/DataGridExtractorDialog.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridExtractorDialog.spec.tsindex 85bbfa9062..63e2675f58 100644--- a/apps/desktop/src/components/grid/__tests__/DataGridExtractorDialog.spec.ts+++ b/apps/desktop/src/components/grid/__tests__/DataGridExtractorDialog.spec.ts@@ -119,9 +119,13 @@ afterEach(() => {describe("extractor draft preview", () => {it("shows CSV-specific settings only for CSV and DSV extractors", async () => {+ // TSV shares the CSV option set since #13305.const { host } = mountDialog(undefined, true, "tsv");- expect(host.textContent).not.toContain("grid.copyExtractorEscapeFormulas");- expect(host.textContent).not.toContain("grid.copyExtractorHeaderPosition");+ expect(host.textContent).toContain("grid.copyExtractorEscapeFormulas");+ expect(host.textContent).toContain("grid.copyExtractorHeaderPosition");+ const pipe = mountDialog(undefined, true, "pipe-separated");+ expect(pipe.host.textContent).not.toContain("grid.copyExtractorEscapeFormulas");+ expect(pipe.host.textContent).not.toContain("grid.copyExtractorHeaderPosition");const csv = mountDialog(undefined, true, "csv");expect(csv.host.textContent).toContain("grid.copyExtractorEscapeFormulas");expect(csv.host.textContent).toContain("grid.copyExtractorHeaderPosition");diff --git a/apps/desktop/src/composables/useDataGridExtractor.ts b/apps/desktop/src/composables/useDataGridExtractor.tsindex 7f8f4df37e..02c9dedcf1 100644--- a/apps/desktop/src/composables/useDataGridExtractor.ts+++ b/apps/desktop/src/composables/useDataGridExtractor.ts@@ -295,7 +295,7 @@ export function useDataGridExtractor(options: UseDataGridExtractorOptions) {const effectiveValueFormat = descriptor.category === "sql" ? "native" : extractorOptions.valueFormat === "default" ? (extractor === "dbunit" || extractor === "php" ? "native" : "legacy") : extractorOptions.valueFormat;const rows = rawRows.map((row) =>row.map((value, index) => {- const formatNumbers = ["csv", "csv-with-headers", "dsv"].includes(extractor) ? extractorOptions.dsv.formatNumbers : "inherit";+ const formatNumbers = ["csv", "csv-with-headers", "dsv", "tsv", "tsv-with-headers"].includes(extractor) ? extractorOptions.dsv.formatNumbers : "inherit";const cellFormat = formatNumbers !== "inherit" && isNumericColumnType(columnTypes[index]) ? formatNumbers : effectiveValueFormat;return extractorCellValue(value, columnTypes[index], normalizeValues, keepUnsafeJsonText, presentBinaryText, index, requiredSourceIndexes[index], cellFormat);}),@@ -347,7 +347,7 @@ export function useDataGridExtractor(options: UseDataGridExtractorOptions) {keepUnsafeJsonText,presentBinaryText,valueFormat: effectiveValueFormat,- formatNumbers: ["csv", "csv-with-headers", "dsv"].includes(extractor) ? extractorOptions.dsv.formatNumbers : "inherit",+ formatNumbers: ["csv", "csv-with-headers", "dsv", "tsv", "tsv-with-headers"].includes(extractor) ? extractorOptions.dsv.formatNumbers : "inherit",rawRows,});return request;diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.tsindex b069805d14..a97a274c9c 100644--- a/apps/desktop/src/i18n/locales/en.ts+++ b/apps/desktop/src/i18n/locales/en.ts@@ -2784,6 +2784,7 @@ export default {copyExtractorHeaderName: "Name",copyExtractorHeaderDescription: "Description",copyExtractorHeaderBoth: "Name and description",+ copyExtractorHeaderTwoRows: "Name and description (two rows)",copyExtractorHeaderCase: "Header case",copyExtractorHeaderPreserve: "Preserve",copyExtractorHeaderUpper: "Uppercase",diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.tsindex 4e0dd931d4..11dfc69230 100644--- a/apps/desktop/src/i18n/locales/es.ts+++ b/apps/desktop/src/i18n/locales/es.ts@@ -3293,6 +3293,7 @@ export default withEnglishFallback({copyExtractorHeaderName: "Nombre",copyExtractorHeaderDescription: "Descripción",copyExtractorHeaderBoth: "Nombre y descripción",+ copyExtractorHeaderTwoRows: "Nombre y descripción (dos filas)",copyExtractorHeaderCase: "Mayúsculas del encabezado",copyExtractorHeaderPreserve: "Mantener",copyExtractorHeaderUpper: "Mayúsculas",diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.tsindex 8967c9c6e0..81c1e7cdc6 100644--- a/apps/desktop/src/i18n/locales/it.ts+++ b/apps/desktop/src/i18n/locales/it.ts@@ -3166,6 +3166,7 @@ export default withEnglishFallback({copyExtractorHeaderName: "Nome",copyExtractorHeaderDescription: "Descrizione",copyExtractorHeaderBoth: "Nome e descrizione",+ copyExtractorHeaderTwoRows: "Nome e descrizione (due righe)",copyExtractorHeaderCase: "Maiuscole dell'intestazione",copyExtractorHeaderPreserve: "Mantieni",copyExtractorHeaderUpper: "Maiuscolo",diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.tsindex cf5d7bfd1c..167fa501e2 100644--- a/apps/desktop/src/i18n/locales/ja.ts+++ b/apps/desktop/src/i18n/locales/ja.ts@@ -3185,6 +3185,7 @@ export default withEnglishFallback({copyExtractorHeaderName: "名前",copyExtractorHeaderDescription: "説明",copyExtractorHeaderBoth: "名前と説明",+ copyExtractorHeaderTwoRows: "名前と説明(2行)",copyExtractorHeaderCase: "ヘッダーの大文字・小文字",copyExtractorHeaderPreserve: "そのまま",copyExtractorHeaderUpper: "大文字",diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.tsindex 8cb3278c11..fa2b8d4275 100644--- a/apps/desktop/src/i18n/locales/ko.ts+++ b/apps/desktop/src/i18n/locales/ko.ts@@ -2455,6 +2455,7 @@ export default withEnglishFallback({copyExtractorHeaderName: "이름",copyExtractorHeaderDescription: "설명",copyExtractorHeaderBoth: "이름 및 설명",+ copyExtractorHeaderTwoRows: "이름과 설명 (두 줄)",copyExtractorHeaderCase: "머리글 대소문자",copyExtractorHeaderPreserve: "유지",copyExtractorHeaderUpper: "대문자",diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.tsindex 938d276782..f7f3c0335c 100644--- a/apps/desktop/src/i18n/locales/pt-BR.ts+++ b/apps/desktop/src/i18n/locales/pt-BR.ts@@ -3166,6 +3166,7 @@ export default withEnglishFallback({copyExtractorHeaderName: "Nome",copyExtractorHeaderDescription: "Descrição",copyExtractorHeaderBoth: "Nome e descrição",+ copyExtractorHeaderTwoRows: "Nome e descrição (duas linhas)",copyExtractorHeaderCase: "Maiúsculas do cabeçalho",copyExtractorHeaderPreserve: "Manter",copyExtractorHeaderUpper: "Maiúsculas",diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.tsindex f3162bd8ad..5b5794c3d0 100644--- a/apps/desktop/src/i18n/locales/ru.ts+++ b/apps/desktop/src/i18n/locales/ru.ts@@ -2540,6 +2540,7 @@ export default withEnglishFallback({copyExtractorHeaderName: "Имя",copyExtractorHeaderDescription: "Описание",copyExtractorHeaderBoth: "Имя и описание",+ copyExtractorHeaderTwoRows: "Имя и описание (две строки)",copyExtractorHeaderCase: "Регистр заголовка",copyExtractorHeaderPreserve: "Сохранить",copyExtractorHeaderUpper: "Верхний регистр",diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.tsindex 3a84aedcf1..1349f7564d 100644--- a/apps/desktop/src/i18n/locales/th.ts+++ b/apps/desktop/src/i18n/locales/th.ts@@ -3550,6 +3550,7 @@ export default withEnglishFallback({copyCurrentPageSql: "คัดลอก SQL ของหน้าปัจจุบัน",copyActualExecutionSql: "คัดลอก SQL ที่ดำเนินการจริง",pageProbeDescription: "หน้านี้แสดงได้สูงสุด {count} แถว และอ่านเพิ่มได้สูงสุด 1 แถวเพื่อตรวจสอบว่ามีหน้าถัดไปหรือไม่",+ copyExtractorHeaderTwoRows: "ชื่อและคำอธิบาย (แบ่งเป็นสองบรรทัด)",},exportProgress: {streamingUnsupported: "ไม่รองรับการส่งออกแบบ Streaming สำหรับ Query นี้ ทำให้เรียบง่ายขึ้นหรือใช้ Driver ที่รองรับ",diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.tsindex 1b18311bee..e097f88066 100644--- a/apps/desktop/src/i18n/locales/zh-CN.ts+++ b/apps/desktop/src/i18n/locales/zh-CN.ts@@ -2714,6 +2714,7 @@ export default withEnglishFallback({copyExtractorHeaderName: "名称",copyExtractorHeaderDescription: "说明",copyExtractorHeaderBoth: "名称和说明",+ copyExtractorHeaderTwoRows: "名称和说明(分两行)",copyExtractorHeaderCase: "表头大小写",copyExtractorHeaderPreserve: "保持",copyExtractorHeaderUpper: "大写",diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.tsindex 6921dd9d6d..9c4beadbdb 100644--- a/apps/desktop/src/i18n/locales/zh-TW.ts+++ b/apps/desktop/src/i18n/locales/zh-TW.ts@@ -3168,6 +3168,7 @@ export default withEnglishFallback({copyExtractorHeaderName: "名稱",copyExtractorHeaderDescription: "描述",copyExtractorHeaderBoth: "名稱與描述",+ copyExtractorHeaderTwoRows: "名稱和說明(分兩行)",copyExtractorHeaderCase: "標頭大小寫",copyExtractorHeaderPreserve: "保留原樣",copyExtractorHeaderUpper: "大寫",diff --git a/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts b/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.tsindex 08f62aba61..b0ccd8c480 100644--- a/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts+++ b/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts@@ -168,4 +168,10 @@ describe("data-grid extractor options", () => {expect(normalizeVisibleDataGridCopyExtractors(["php", "php", "unknown", "csv"])).toEqual(["csv", "php"]);expect(normalizeVisibleDataGridCopyExtractors([])).toEqual([]);});+ it("keeps the two-row header format through normalization (#13305)", () => {+ const normalized = normalizeDataGridExtractorOptions({ extractor: "tsv-with-headers", dsv: { headerFormat: "name-and-description-two-rows" } });+ expect(normalized.dsv.headerFormat).toBe("name-and-description-two-rows");+ const rejected = normalizeDataGridExtractorOptions({ extractor: "tsv", dsv: { headerFormat: "made-up" } });+ expect(rejected.dsv.headerFormat).toBe("name");+ });});diff --git a/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts b/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.tsindex 388affe5a0..6068867c25 100644--- a/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts+++ b/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts@@ -117,7 +117,7 @@ export interface DataGridDsvOptions {includeColumnHeader: boolean;includeRowHeader: boolean;headerPosition: "legacy" | "none" | "top" | "bottom";- headerFormat: "name" | "description" | "both";+ headerFormat: "name" | "description" | "both" | "name-and-description-two-rows";headerCase: "preserve" | "upper" | "lower";escapeFormulas: boolean;lineFeedEscapeString: string;@@ -248,7 +248,7 @@ export function normalizeDataGridExtractorOptions(value: unknown): DataGridExtraincludeColumnHeader: dsv.includeColumnHeader === true,includeRowHeader: dsv.includeRowHeader === true,headerPosition: dsv.headerPosition === "none" || dsv.headerPosition === "top" || dsv.headerPosition === "bottom" ? dsv.headerPosition : "legacy",- headerFormat: dsv.headerFormat === "description" || dsv.headerFormat === "both" ? dsv.headerFormat : "name",+ headerFormat: dsv.headerFormat === "description" || dsv.headerFormat === "both" || dsv.headerFormat === "name-and-description-two-rows" ? dsv.headerFormat : "name",headerCase: dsv.headerCase === "upper" || dsv.headerCase === "lower" ? dsv.headerCase : "preserve",escapeFormulas: dsv.escapeFormulas === true,lineFeedEscapeString: typeof dsv.lineFeedEscapeString === "string" && dsv.lineFeedEscapeString.length <= 32 ? dsv.lineFeedEscapeString : "",diff --git a/crates/dbx-core/src/data/grid_clipboard_guard.rs b/crates/dbx-core/src/data/grid_clipboard_guard.rsindex f443f0e681..f8a5903a11 100644--- a/crates/dbx-core/src/data/grid_clipboard_guard.rs+++ b/crates/dbx-core/src/data/grid_clipboard_guard.rs@@ -101,7 +101,9 @@ pub fn neutralize_spreadsheet_formulas(mut request: DataGridExtractRequest) -> Dif needs_formula_guard(&column.display_name) {column.display_name.insert(0, '\'');}- if request.options.dsv.header_format == DataGridHeaderFormat::Description {+ if request.options.dsv.header_format == DataGridHeaderFormat::Description+ || request.options.dsv.header_format == DataGridHeaderFormat::NameAndDescriptionTwoRows+ {if let Some(description) = &mut column.description {if needs_formula_guard(description) {description.insert(0, '\'');diff --git a/crates/dbx-sql-data/src/data_grid_extractors/contract.rs b/crates/dbx-sql-data/src/data_grid_extractors/contract.rsindex c21df52771..28a3cc3f12 100644--- a/crates/dbx-sql-data/src/data_grid_extractors/contract.rs+++ b/crates/dbx-sql-data/src/data_grid_extractors/contract.rs@@ -84,6 +84,11 @@ pub enum DataGridHeaderFormat {Name,Description,Both,+ /// `Both` on two stacked header rows: the description row first, then the+ /// name row, so a two-line header pastes into documents with one row per+ /// line (#13305). Columns without a description leave their description+ /// cell empty.+ NameAndDescriptionTwoRows,}#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]diff --git a/crates/dbx-sql-data/src/data_grid_extractors/delimited.rs b/crates/dbx-sql-data/src/data_grid_extractors/delimited.rsindex d8a9cca394..80202ed2f3 100644--- a/crates/dbx-sql-data/src/data_grid_extractors/delimited.rs+++ b/crates/dbx-sql-data/src/data_grid_extractors/delimited.rs@@ -30,14 +30,8 @@ pub(super) fn write_dsv(};let mut first_row = true;if header_position == Some(DataGridHeaderPosition::Top) {- write_dsv_row(- output,- context.selected_columns.iter().map(|column| Cow::Owned(header_label(column, options))),- options,- options.include_row_header.then(|| "#".to_string()),- quote_char_triggers_quoting,- )?;first_row = false;+ write_dsv_header_rows(context, output, options, quote_char_triggers_quoting)?;}for (row_index, row) in context.request.rows.iter().enumerate() {if !first_row {@@ -78,19 +72,72 @@ pub(super) fn write_dsv(if !first_row {write_bytes(output, options.row_separator.as_bytes())?;}+ write_dsv_header_rows(context, output, options, quote_char_triggers_quoting)?;+ }+ Ok(())+}++/// Writes the configured header rows at the current output position: one row+/// for every format except `NameAndDescriptionTwoRows`, which stacks the+/// description row above the name row (#13305).+fn write_dsv_header_rows(+ context: &ExtractContext<'_>,+ output: &mut dyn Write,+ options: &DataGridDsvOptions,+ quote_char_triggers_quoting: bool,+) -> Result<(), DataGridExtractError> {+ if options.header_format == DataGridHeaderFormat::NameAndDescriptionTwoRows {write_dsv_row(output,- context.selected_columns.iter().map(|column| Cow::Owned(header_label(column, options))),+ context.selected_columns.iter().map(|column| {+ Cow::Owned(two_row_header_cell(column.description.as_deref().unwrap_or_default(), options))+ }),+ options,+ options.include_row_header.then(|| "#".to_string()),+ quote_char_triggers_quoting,+ )?;+ write_bytes(output, options.row_separator.as_bytes())?;+ write_dsv_row(+ output,+ context+ .selected_columns+ .iter()+ .map(|column| Cow::Owned(two_row_header_cell(&column.display_name, options))),options,options.include_row_header.then(|| "#".to_string()),quote_char_triggers_quoting,)?;+ return Ok(());}- Ok(())+ write_dsv_row(+ output,+ context.selected_columns.iter().map(|column| Cow::Owned(header_label(column, options))),+ options,+ options.include_row_header.then(|| "#".to_string()),+ quote_char_triggers_quoting,+ )+}++/// A `NameAndDescriptionTwoRows` header cell: the same case, line-feed and+/// formula transforms `header_label` applies, without the one-line fallback.+fn two_row_header_cell(label: &str, options: &DataGridDsvOptions) -> String {+ let mut cell = match options.header_case {+ DataGridHeaderCase::Preserve => label.to_owned(),+ DataGridHeaderCase::Upper => label.to_uppercase(),+ DataGridHeaderCase::Lower => label.to_lowercase(),+ };+ cell = replace_line_feeds(cell, &options.line_feed_escape_string);+ if options.escape_formulas && starts_formula(&cell) {+ cell.insert(0, '\'');+ }+ cell}fn header_label(column: &super::DataGridExtractColumn, options: &DataGridDsvOptions) -> String {let label = match options.header_format {+ // The two-row format never renders a single combined label; its cells+ // come from two_row_header_cell instead.+ DataGridHeaderFormat::NameAndDescriptionTwoRows => column.display_name.clone(),DataGridHeaderFormat::Name => column.display_name.clone(),DataGridHeaderFormat::Description => {column.description.as_deref().filter(|text| !text.is_empty()).unwrap_or(&column.display_name).to_owned()diff --git a/crates/dbx-sql-data/src/data_grid_extractors/mod.rs b/crates/dbx-sql-data/src/data_grid_extractors/mod.rsindex 79773a4445..7de8db1b03 100644--- a/crates/dbx-sql-data/src/data_grid_extractors/mod.rs+++ b/crates/dbx-sql-data/src/data_grid_extractors/mod.rs@@ -270,16 +270,26 @@ fn write_extraction(DataGridExtractorId::Tsv | DataGridExtractorId::TsvWithHeaders => {let mut options = context.request.options.dsv.clone();options.column_separator = "\t".to_string();- options.include_column_header = extractor == DataGridExtractorId::TsvWithHeaders;+ // TSV shares the CSV/DSV header, NULL-text and advanced options+ // (#13305): only the separator is pinned and quoting stays off,+ // because TSV is split on the tab separator with no quote state+ // machine, so a value that merely contains a double quote must+ // not be escaped. The plain Tsv id is also the implicit default of+ // smart copy/cut, so it stays on the legacy shape (no header rows,+ // no formula escaping, no number formatting) instead of inheriting+ // options a user saved while configuring CSV/DSV; only the explicit+ // TsvWithHeaders id honors them.+ if extractor == DataGridExtractorId::Tsv {+ options.header_position = DataGridHeaderPosition::Legacy;+ options.header_format = DataGridHeaderFormat::Name;+ options.header_case = DataGridHeaderCase::Preserve;+ options.escape_formulas = false;+ options.format_numbers = DataGridNumberFormat::Inherit;+ options.line_feed_escape_string.clear();+ }+ options.include_column_header = extractor == DataGridExtractorId::TsvWithHeaders+ && options.header_position == DataGridHeaderPosition::Legacy;options.quote_numeric_strings = false;- options.header_position = DataGridHeaderPosition::Legacy;- options.header_format = DataGridHeaderFormat::Name;- options.header_case = DataGridHeaderCase::Preserve;- options.escape_formulas = false;- options.line_feed_escape_string.clear();- options.array_format = DataGridArrayFormat::Preserve;- // TSV is split on the tab separator with no quote state machine, so a- // value that merely contains a double quote must not be escaped.write_dsv(context, output, &options, false)?;Ok(text_metadata("text/tab-separated-values", "tsv"))}diff --git a/crates/dbx-sql-data/src/data_grid_extractors/tests.rs b/crates/dbx-sql-data/src/data_grid_extractors/tests.rsindex 60e64b0c2e..2479d5d6e8 100644--- a/crates/dbx-sql-data/src/data_grid_extractors/tests.rs+++ b/crates/dbx-sql-data/src/data_grid_extractors/tests.rs@@ -613,7 +613,9 @@ fn csv_formula_protection_covers_fullwidth_prefixes_but_not_typed_negative_numbe}#[test]-fn tsv_keeps_legacy_headers_and_does_not_apply_csv_only_options() {+fn tsv_honors_header_null_and_advanced_options_like_csv() {+ // #13305: TSV shares the CSV/DSV option set; only the separator is pinned+ // and quoting stays off, so embedded double quotes stay verbatim.let mut request = request(DataGridExtractorId::TsvWithHeaders);request.columns = vec![column("=header", 0), column("value", 1)];request.selected_column_indexes = vec![0, 1];@@ -623,7 +625,7 @@ fn tsv_keeps_legacy_headers_and_does_not_apply_csv_only_options() {request.options.dsv.line_feed_escape_string = "\\n".into();let result = extract_data_grid_selection(request).expect("TSV extraction");- assert_eq!(result.text, "=header\tvalue\n=SUM(A1)\t\"line1\nline2\"");+ assert_eq!(result.text, "'=SUM(A1)\tline1\\nline2\n'=header\tvalue");}#[test]@@ -652,6 +654,78 @@ fn extracts_raw_values_without_escaping_quotes() {assert_eq!(result.mime_type, "text/plain");}+#[test]+fn name_and_description_two_rows_header_stacks_description_above_name() {+ let mut request = request(DataGridExtractorId::CsvWithHeaders);+ request.columns = vec![column("amount", 0), column("name", 1)];+ request.columns[0].description = Some("Amount in EUR".into());+ request.selected_column_indexes = vec![0, 1];+ request.rows = vec![vec![json!(1), json!("a")]];+ request.options.dsv.header_format = DataGridHeaderFormat::NameAndDescriptionTwoRows;+ request.options.dsv.header_position = DataGridHeaderPosition::Top;++ let result = extract_data_grid_selection(request).expect("CSV extraction");+ // A missing description leaves that cell empty on the description row.+ assert_eq!(result.text, "Amount in EUR,\namount,name\n1,a");+}++#[test]+fn name_and_description_two_rows_header_applies_case_and_bottom_position() {+ let mut request = request(DataGridExtractorId::TsvWithHeaders);+ request.columns = vec![column("amount", 0)];+ request.columns[0].description = Some("Amount".into());+ request.selected_column_indexes = vec![0];+ request.rows = vec![vec![json!(1)]];+ request.options.dsv.header_format = DataGridHeaderFormat::NameAndDescriptionTwoRows;+ request.options.dsv.header_position = DataGridHeaderPosition::Bottom;+ request.options.dsv.header_case = DataGridHeaderCase::Upper;++ let result = extract_data_grid_selection(request).expect("TSV extraction");+ assert_eq!(result.text, "1\nAMOUNT\nAMOUNT");+}++#[test]+fn tsv_default_still_writes_the_legacy_single_name_header() {+ let mut request = request(DataGridExtractorId::TsvWithHeaders);+ request.columns = vec![column("amount", 0)];+ request.selected_column_indexes = vec![0];+ request.rows = vec![vec![json!(1)]];++ let result = extract_data_grid_selection(request).expect("TSV extraction");+ assert_eq!(result.text, "amount\n1");+}++#[test]+fn tsv_honors_the_null_text_option() {+ let mut request = request(DataGridExtractorId::Tsv);+ request.columns = vec![column("amount", 0)];+ request.selected_column_indexes = vec![0];+ request.rows = vec![vec![Value::Null]];+ request.options.dsv.null_text = "NULL".into();++ let result = extract_data_grid_selection(request).expect("TSV extraction");+ assert_eq!(result.text, "NULL");+}++#[test]+fn plain_tsv_ignores_persisted_dsv_options_unlike_tsv_with_headers() {+ // The plain Tsv id is the implicit default of smart copy/cut; a user who+ // saved non-legacy options while configuring CSV must not get header rows+ // or formula escaping in plain Ctrl+C output (#13305 review).+ let mut request = request(DataGridExtractorId::Tsv);+ request.columns = vec![column("amount", 0)];+ request.selected_column_indexes = vec![0];+ request.rows = vec![vec![Value::Number(serde_json::Number::from(1))]];+ request.options.dsv.header_position = DataGridHeaderPosition::Top;+ request.options.dsv.header_format = DataGridHeaderFormat::NameAndDescriptionTwoRows;+ request.options.dsv.escape_formulas = true;++ let result = extract_data_grid_selection(request).expect("TSV extraction");+ // Legacy plain Tsv carries no header row and applies no formula escaping,+ // even though persisted options ask for a two-row top header.+ assert_eq!(result.text, "1");+}+#[test]fn tsv_and_pipe_emit_embedded_quotes_verbatim_while_csv_escapes_them() {// Reproduces #10087: a value that is itself wrapped in double quotes (e.g.