diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index 8434bc8129..a2e523aa01 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -555,6 +555,7 @@ interface DataGridProps { /** Column names captured with a document-store local-filter snapshot. */ localColumnFilterColumns?: string[]; exportSql?: string; + pageSql?: string; onExecuteSql?: (sql: string) => Promise; fullExportResult?: (onProgress?: (info: { rowsExported: number; totalRows: number | null }) => void) => Promise; queryResultExportRequest?: (options: { @@ -8059,7 +8060,7 @@ function sqlWithDisplayDatabaseName(sql: string): string { async function syncUserFacingSql() { const generation = ++userFacingSqlGeneration; - const executionSql = props.sql?.trim() ?? ""; + const executionSql = (props.pageSql || props.sql)?.trim() ?? ""; const includeDatabaseName = settingsStore.editorSettings.generateSqlIncludeDatabaseName; const shouldRebuildSql = executionSql.includes("__DBX_LARGE_VALUE_BYTES_") || includeDatabaseName; if (props.context !== "table-data" || !shouldRebuildSql || !props.tableMeta?.tableName) { @@ -8101,7 +8102,7 @@ async function syncUserFacingSql() { } watch( - () => [props.sql, props.context, props.tableMeta, props.pageLimit, props.pageOffset, props.executedPageLimit, props.executedPageOffset, currentWhereInput(), effectiveOrderBy(), settingsStore.editorSettings.generateSqlIncludeDatabaseName], + () => [props.sql, props.pageSql, props.context, props.tableMeta, props.pageLimit, props.pageOffset, props.executedPageLimit, props.executedPageOffset, currentWhereInput(), effectiveOrderBy(), settingsStore.editorSettings.generateSqlIncludeDatabaseName], () => void syncUserFacingSql(), { immediate: true }, ); @@ -8150,6 +8151,7 @@ const { extractorOptions: computed(() => settingsStore.editorSettings.dataGridExtractorOptions), sql: computed(() => props.sql), exportSql: computed(() => props.exportSql), + pageSql: computed(() => props.pageSql), tableMeta: computed(() => (props.tableMeta ? { ...props.tableMeta } : undefined)), includeDatabaseName: computed(() => settingsStore.editorSettings.generateSqlIncludeDatabaseName), copyInsertTargetLabel: computed(() => props.tableMeta?.tableName ?? props.customSaveHandler?.targetLabel), diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vue index 2d95d886ca..07f8bc986e 100644 --- a/apps/desktop/src/components/layout/ContentArea.vue +++ b/apps/desktop/src/components/layout/ContentArea.vue @@ -2456,6 +2456,7 @@ defineExpose({ :initial-order-by-input="activeTab.orderByInput" :sql="activeResultSql" :export-sql="activeResultExportSql" + :page-sql="activeTab.resultPageSql" :loading="activeResultIsLoading" :editable="!hasNeo4jNodes && (!!activeTab.queryAnalysis || !!mongoQueryResultSaveHandler)" :source-columns="hasNeo4jNodes ? undefined : activeTab.querySourceColumns" @@ -2936,6 +2937,7 @@ defineExpose({ :sort-mode="activeTab.resultSortMode" :initial-order-by-input="activeTab.orderByInput" :sql="activeTab.sql" + :page-sql="activeTab.resultPageSql || activeTab.sql" :loading="activeTab.isExecuting" :editable="!activeTab.tableMetaPending && (isTableDataEditable(activeEffectiveDatabaseType, activeTableMeta?.primaryKeys ?? [], activeTableMeta?.tableType) || !!influxDbV1DeleteSaveHandler)" :custom-save-handler="influxDbV1DeleteSaveHandler" diff --git a/apps/desktop/src/composables/useDataGridExport.ts b/apps/desktop/src/composables/useDataGridExport.ts index 0d6d977558..4a75cf7343 100644 --- a/apps/desktop/src/composables/useDataGridExport.ts +++ b/apps/desktop/src/composables/useDataGridExport.ts @@ -83,6 +83,7 @@ export interface UseDataGridExportOptions { extractorOptions?: ComputedRef; sql: ComputedRef; exportSql?: ComputedRef; + pageSql?: ComputedRef; tableMeta: ComputedRef; /** Editor setting "Include database name in generated SQL" — passed through to SQL extractors. */ includeDatabaseName?: ComputedRef; @@ -189,6 +190,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) { extractorOptions: extractorOptionsOption, sql, exportSql: resultExportSql, + pageSql: resultPageSql, tableMeta, copyInsertTargetLabel, sourceColumns, @@ -520,8 +522,13 @@ export function useDataGridExport(options: UseDataGridExportOptions) { return resultExportSql?.value || sql.value; } - async function writeXlsxResult(outputPath: string, result: { columns: string[]; columnTypes: string[]; columnComments?: (string | null)[]; rows: CellValue[][] }, includeSqlSheet: boolean, autoFilter: boolean) { - const sqlWorksheet = includeSqlSheet ? buildXlsxSqlWorksheet([{ sql: currentExportSql() || "" }]) : undefined; + function currentPageExportSql(): string | undefined { + return resultPageSql?.value || currentExportSql(); + } + + async function writeXlsxResult(outputPath: string, result: { columns: string[]; columnTypes: string[]; columnComments?: (string | null)[]; rows: CellValue[][] }, includeSqlSheet: boolean, autoFilter: boolean, sqlOverride?: string) { + const effectiveSql = sqlOverride ?? currentExportSql(); + const sqlWorksheet = includeSqlSheet ? buildXlsxSqlWorksheet([{ sql: effectiveSql || "" }]) : undefined; const rightAlign = useSettingsStore().editorSettings.numericColumnRightAlign; // The rows are already rendered with the global export pattern, but the // workbook still needs the pattern itself so its numFmt matches; without it @@ -543,7 +550,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) { numericColumnRightAlign: rightAlign, autoFilter, }, - { ...sqlWorksheet, autoFilter }, + { ...sqlWorksheet, autoFilter: false }, ], autoFilter, dateTimeFormat, @@ -1243,7 +1250,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) { outputPath = path as string; } const result = await resultToExport(undefined, undefined, false, true, exportOptions.headerMode); - await writeXlsxResult(outputPath, result, includeSqlSheet, exportOptions.autoFilter); + await writeXlsxResult(outputPath, result, includeSqlSheet, exportOptions.autoFilter, currentPageExportSql()); toast(t("grid.exported")); } catch (e: any) { toast(t("grid.exportFailed", { message: translateBackendError(t, e) }), 5000); @@ -1291,7 +1298,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) { autoFilter: exportOptions.autoFilter, })); const sqlWorksheet = includeSqlSheet ? buildXlsxSqlWorksheet(sheets.map((sheet) => ({ resultName: sheet.sheetName, sql: sheet.sql || sheet.result.sourceStatement || "" }))) : undefined; - await api.exportQueryResultsXlsx(outputPath, sqlWorksheet ? [...worksheets, { ...sqlWorksheet, autoFilter: exportOptions.autoFilter }] : worksheets, exportOptions.autoFilter, exportPattern || undefined); + await api.exportQueryResultsXlsx(outputPath, sqlWorksheet ? [...worksheets, { ...sqlWorksheet, autoFilter: false }] : worksheets, exportOptions.autoFilter, exportPattern || undefined); toast(t("grid.exported")); } catch (e: any) { toast(t("grid.exportFailed", { message: translateBackendError(t, e) }), 5000); diff --git a/apps/desktop/src/lib/export/xlsxExport.ts b/apps/desktop/src/lib/export/xlsxExport.ts index 11b62b76b1..c92ba8d582 100644 --- a/apps/desktop/src/lib/export/xlsxExport.ts +++ b/apps/desktop/src/lib/export/xlsxExport.ts @@ -117,9 +117,23 @@ function normalizeUniqueSheetNames(sheets: readonly { sheetName?: string }[]): s function estimateColumnWidths(columns: readonly string[], rows: readonly (readonly XlsxCellValue[])[], rowStart: number, rowEnd: number, columnComments?: readonly (string | null)[]): number[] { return columns.map((column, colIndex) => { const headerText = columnComments?.[colIndex] || column; + const isSqlCol = column.toUpperCase() === "SQL"; + const maxClamp = isSqlCol ? 100 : 60; const values = Array.from({ length: Math.min(100, rowEnd - rowStart) }, (_, index) => rows[rowStart + index]?.[colIndex]); - const maxLen = [headerText, ...values.map((value) => (value == null ? "" : String(value)))].map((value) => Math.min(value.length, 60)).reduce((max, length) => Math.max(max, length), 8); - return Math.max(10, Math.min(60, maxLen + 2)); + const maxLen = [ + headerText, + ...values.map((value) => { + if (value == null) return ""; + const str = String(value); + if (isSqlCol || str.includes("\n")) { + return str.split("\n").reduce((max, line) => Math.max(max, line.length), 0); + } + return str.length; + }), + ] + .map((value) => Math.min(typeof value === "number" ? value : value.length, maxClamp)) + .reduce((max, length) => Math.max(max, length), 8); + return Math.max(isSqlCol ? 40 : 10, Math.min(maxClamp, maxLen + 2)); }); } @@ -133,15 +147,20 @@ function safeExcelNumber(value: string): string | undefined { const NUMERIC_RIGHT_ALIGN_STYLE_INDEX = 2; const NUMERIC_LEFT_ALIGN_STYLE_INDEX = 3; +const XLSX_WRAP_TEXT_STYLE_INDEX = 4; function numericColumnStyle(columnType?: string, enabled = true): number | undefined { if (!isNumericColumnType(columnType)) return undefined; return enabled ? NUMERIC_RIGHT_ALIGN_STYLE_INDEX : NUMERIC_LEFT_ALIGN_STYLE_INDEX; } -function cellXml(value: XlsxCellValue, rowIndex: number, colIndex: number, style?: number, columnType?: string): string { +function cellXml(value: XlsxCellValue, rowIndex: number, colIndex: number, style?: number, columnType?: string, columnName?: string): string { const ref = cellRef(rowIndex, colIndex); - const styleAttr = style == null ? "" : ` s="${style}"`; + const isSqlCol = columnName?.toLowerCase() === "sql"; + const strVal = typeof value === "string" ? value : undefined; + const isMultiline = strVal !== undefined && (strVal.includes("\n") || strVal.includes("\r")); + const effectiveStyle = isSqlCol || isMultiline ? XLSX_WRAP_TEXT_STYLE_INDEX : style; + const styleAttr = effectiveStyle == null ? "" : ` s="${effectiveStyle}"`; if (value == null) return ``; if (typeof value === "number" && Number.isFinite(value)) { return `${value}`; @@ -155,7 +174,8 @@ function cellXml(value: XlsxCellValue, rowIndex: number, colIndex: number, style const number = safeExcelNumber(value); if (number !== undefined) return `${number}`; } - return `${escapeXml(String(value))}`; + const spaceAttr = typeof value === "string" && /^\s|\s$|[\r\n\t]/.test(value) ? ' xml:space="preserve"' : ""; + return `${escapeXml(String(value))}`; } function worksheetXml(segment: XlsxWorksheetSegment): string { @@ -171,7 +191,7 @@ function worksheetXml(segment: XlsxWorksheetSegment): string { const bodyXml = Array.from({ length: segment.rowEnd - segment.rowStart }, (_, rowIndex) => { const row = rows[segment.rowStart + rowIndex]!; const excelRowIndex = rowIndex + 2; - const cells = columns.map((_, colIndex) => cellXml(row[colIndex], excelRowIndex - 1, colIndex, numericColumnStyle(data.columnTypes?.[colIndex], rightAlignEnabled), data.columnTypes?.[colIndex])).join(""); + const cells = columns.map((colName, colIndex) => cellXml(row[colIndex], excelRowIndex - 1, colIndex, numericColumnStyle(data.columnTypes?.[colIndex], rightAlignEnabled), data.columnTypes?.[colIndex], colName)).join(""); return `${cells}`; }).join(""); @@ -254,7 +274,7 @@ function stylesXml(): string { - + `; } diff --git a/apps/desktop/src/lib/export/xlsxSqlSheet.ts b/apps/desktop/src/lib/export/xlsxSqlSheet.ts index 9776c5a0ad..a68ba6ca3e 100644 --- a/apps/desktop/src/lib/export/xlsxSqlSheet.ts +++ b/apps/desktop/src/lib/export/xlsxSqlSheet.ts @@ -9,6 +9,7 @@ export interface XlsxSqlWorksheet { sheetName: "SQL"; columns: string[]; rows: Array>; + autoFilter?: boolean; } function splitExcelCellText(value: string): string[] { diff --git a/crates/dbx-core/examples/data_transfer_bench.rs b/crates/dbx-core/examples/data_transfer_bench.rs index ac82902943..fb785465a7 100644 --- a/crates/dbx-core/examples/data_transfer_bench.rs +++ b/crates/dbx-core/examples/data_transfer_bench.rs @@ -115,6 +115,7 @@ fn run() -> Result<(), String> { column_comments: Vec::new(), rows, numeric_column_right_align: false, + auto_filter: None, })?; let xlsx_ms = elapsed_ms(xlsx_started); diff --git a/crates/dbx-core/examples/table_import_bench.rs b/crates/dbx-core/examples/table_import_bench.rs index ef3d33c823..b1a370166f 100644 --- a/crates/dbx-core/examples/table_import_bench.rs +++ b/crates/dbx-core/examples/table_import_bench.rs @@ -102,6 +102,7 @@ fn write_xlsx(path: &Path, row_count: usize, column_count: usize) -> Result<(), column_comments: vec![], rows: (0..row_count).map(|row_index| row(row_index, column_count)).collect(), numeric_column_right_align: false, + auto_filter: None, })?; fs::write(path, workbook).map_err(|error| error.to_string()) } diff --git a/crates/dbx-core/examples/table_import_live_bench.rs b/crates/dbx-core/examples/table_import_live_bench.rs index 4d776651aa..d77d71ffc2 100644 --- a/crates/dbx-core/examples/table_import_live_bench.rs +++ b/crates/dbx-core/examples/table_import_live_bench.rs @@ -271,6 +271,7 @@ fn write_xlsx(path: &Path, row_count: usize, column_count: usize, text_bytes: us column_comments: Vec::new(), rows: (0..row_count).map(|row_index| row(row_index, column_count, text_bytes)).collect(), numeric_column_right_align: false, + auto_filter: None, })?; fs::write(path, workbook).map_err(|error| error.to_string()) } diff --git a/crates/dbx-core/src/data/query_result_export.rs b/crates/dbx-core/src/data/query_result_export.rs index d462e3ed94..b3dacf26c9 100644 --- a/crates/dbx-core/src/data/query_result_export.rs +++ b/crates/dbx-core/src/data/query_result_export.rs @@ -250,6 +250,7 @@ fn query_sql_worksheets(request: &QueryResultExportRequest) -> Vec Option { if scale == 0 || scale > MAX_NUMERIC_SCALE_FORMAT { @@ -38,7 +39,7 @@ fn decimal_fraction_digits(value: &str) -> usize { trimmed.split_once('.').map_or(0, |(_, fraction)| fraction.chars().filter(|ch| ch.is_ascii_digit()).count()) } -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Default, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct XlsxWorksheetData { pub sheet_name: Option, @@ -50,6 +51,22 @@ pub struct XlsxWorksheetData { pub rows: Vec>, #[serde(default)] pub numeric_column_right_align: bool, + #[serde(default)] + pub auto_filter: Option, +} + +impl XlsxWorksheetData { + pub fn new(sheet_name: Option, columns: Vec, rows: Vec>) -> Self { + Self { + sheet_name, + columns, + column_types: Vec::new(), + column_comments: Vec::new(), + rows, + numeric_column_right_align: false, + auto_filter: None, + } + } } fn normalize_sheet_name(input: Option<&str>) -> String { @@ -170,8 +187,13 @@ fn estimate_header_widths(columns: &[String], column_comments: &[Option] .iter() .enumerate() .map(|(index, col)| { + let is_sql_col = col.eq_ignore_ascii_case("sql"); let header_text = column_comments.get(index).and_then(|c| c.as_deref()).unwrap_or(col.as_str()); - (header_text.chars().count() + 2).clamp(10, 60) + if is_sql_col { + (header_text.chars().count() + 2).clamp(40, 100) + } else { + (header_text.chars().count() + 2).clamp(10, 60) + } }) .collect() } @@ -218,18 +240,17 @@ fn push_data_row_xml( numeric_right_align: bool, ) { write!(output, "").expect("writing XLSX XML into a String cannot fail"); - for (col_index, _) in columns.iter().enumerate() { + for (col_index, col) in columns.iter().enumerate() { let col_type = column_types.get(col_index); let align_style = numeric_column_style(col_type, numeric_right_align); - push_typed_cell_xml( - output, - row.get(col_index), - col_type, - row_number - 1, - col_index, - align_style, - date_time_format, - ); + let val = row.get(col_index); + let is_sql_col = col.eq_ignore_ascii_case("sql"); + let is_multiline = match val { + Some(Value::String(s)) => s.contains('\n') || s.contains('\r'), + _ => false, + }; + let style = if is_sql_col || is_multiline { Some(XLSX_WRAP_TEXT_STYLE) } else { align_style }; + push_typed_cell_xml(output, val, col_type, row_number - 1, col_index, style, date_time_format); } output.push_str(""); } @@ -480,6 +501,7 @@ impl StreamingXlsxWriter { column_comments: &sheet.column_comments, rows: &sheet.rows, numeric_column_right_align: sheet.numeric_column_right_align, + auto_filter: sheet.auto_filter, }; write_worksheet_xml(&mut self.zip, &segment, self.auto_filter, self.date_time_format.as_deref())?; } @@ -583,15 +605,32 @@ fn estimate_column_widths(columns: &[String], column_comments: &[Option] .iter() .enumerate() .map(|(col_index, col)| { + let is_sql_col = col.eq_ignore_ascii_case("sql"); + let max_clamp = if is_sql_col { 100 } else { 60 }; let header_text = effective_header(col, column_comments.get(col_index).and_then(|c| c.as_deref())); - let max_len = std::iter::once(header_text.chars().count().min(60)) - .chain(rows.iter().take(100).map(|row| value_text(row.get(col_index)).chars().count().min(60))) + let max_len = std::iter::once(header_text.chars().count().min(max_clamp)) + .chain(rows.iter().take(100).map(|row| { + let text = value_text(row.get(col_index)); + if is_sql_col { + text.lines().map(|line| line.chars().count()).max().unwrap_or(0).min(max_clamp) + } else { + text.chars().count().min(max_clamp) + } + })) .fold(8usize, usize::max); - (max_len + 2).clamp(10, 60) + (max_len + 2).clamp(if is_sql_col { 40 } else { 10 }, max_clamp) }) .collect() } +fn needs_xml_space_preserve(text: &str) -> bool { + text.starts_with(char::is_whitespace) + || text.ends_with(char::is_whitespace) + || text.contains('\n') + || text.contains('\r') + || text.contains('\t') +} + fn cell_xml(value: Option<&Value>, row_index: usize, col_index: usize, style: Option) -> String { let reference = cell_ref(row_index, col_index); let style_attr = style.map_or(String::new(), |s| format!(" s=\"{s}\"")); @@ -612,12 +651,20 @@ fn cell_xml(value: Option<&Value>, row_index: usize, col_index: usize, style: Op } } Some(Value::String(s)) => { - format!("{}", escape_xml(s)) + let space_attr = if needs_xml_space_preserve(s) { " xml:space=\"preserve\"" } else { "" }; + format!( + "{}", + escape_xml(s) + ) + } + Some(other) => { + let text = other.to_string(); + let space_attr = if needs_xml_space_preserve(&text) { " xml:space=\"preserve\"" } else { "" }; + format!( + "{}", + escape_xml(&text) + ) } - Some(other) => format!( - "{}", - escape_xml(&other.to_string()) - ), } } @@ -657,15 +704,24 @@ fn push_cell_xml(output: &mut String, value: Option<&Value>, row_index: usize, c Some(Value::String(value)) => { output.push_str(" t=\"inlineStr\""); push_cell_style(output, style); - output.push_str(">"); + if needs_xml_space_preserve(value) { + output.push_str(">"); + } else { + output.push_str(">"); + } push_xml_escaped(output, value); output.push_str(""); } Some(value) => { + let text = value.to_string(); output.push_str(" t=\"inlineStr\""); push_cell_style(output, style); - output.push_str(">"); - push_xml_escaped(output, &value.to_string()); + if needs_xml_space_preserve(&text) { + output.push_str(">"); + } else { + output.push_str(">"); + } + push_xml_escaped(output, &text); output.push_str(""); } } @@ -877,7 +933,8 @@ fn write_worksheet_xml( writer.write_all(row_buffer.as_bytes()).map_err(|err| err.to_string())?; } - let auto_filter = if auto_filter { format!("") } else { String::new() }; + let effective_auto_filter = segment.auto_filter.unwrap_or(auto_filter); + let auto_filter = if effective_auto_filter { format!("") } else { String::new() }; writer.write_all(format!("{auto_filter}").as_bytes()).map_err(|err| err.to_string()) } @@ -1056,7 +1113,7 @@ fn styles_xml(date_time_format: Option<&str>) -> String { "", "", "", - "{}", + "{}", "", "" ), @@ -1064,7 +1121,7 @@ fn styles_xml(date_time_format: Option<&str>) -> String { escape_xml(&date_format), escape_xml(&datetime_format), scale_numfmts, - 6 + MAX_NUMERIC_SCALE_FORMAT * 2, + 7 + MAX_NUMERIC_SCALE_FORMAT * 2, scale_xfs ) } @@ -1084,6 +1141,7 @@ struct WorksheetSegment<'a> { column_comments: &'a [Option], rows: &'a [Vec], numeric_column_right_align: bool, + auto_filter: Option, } fn normalize_unique_sheet_names(segments: &[WorksheetSegment]) -> Vec { @@ -1127,6 +1185,7 @@ fn split_sheets_for_max_rows<'a>( column_comments: &sheet.column_comments, rows: &sheet.rows, numeric_column_right_align: sheet.numeric_column_right_align, + auto_filter: sheet.auto_filter, }); continue; } @@ -1151,6 +1210,7 @@ fn split_sheets_for_max_rows<'a>( column_comments: &sheet.column_comments, rows: chunk, numeric_column_right_align: sheet.numeric_column_right_align, + auto_filter: sheet.auto_filter, }); } } @@ -1313,6 +1373,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!(1), json!("Ada & Bob"), json!(true)], vec![json!(2), json!(null), json!(false)]], numeric_column_right_align: false, + auto_filter: None, }) .expect("build workbook"); @@ -1339,6 +1400,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!(1)]], numeric_column_right_align: false, + auto_filter: None, }; let workbook = build_xlsx_workbook_multi_with_auto_filter(&[worksheet], false, None).expect("build workbook"); @@ -1354,6 +1416,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!("1.00000"), json!("2800.000000"), json!("00123")]], numeric_column_right_align: false, + auto_filter: None, }) .expect("build workbook"); @@ -1372,13 +1435,15 @@ mod tests { column_comments: vec![], rows: vec![vec![json!("5.0000"), json!("0.3500000"), json!("1.23E-5")]], numeric_column_right_align: true, + auto_filter: None, }) .expect("build workbook"); let styles = read_zip_entry(&workbook, "xl/styles.xml"); assert!(styles.contains("numFmtId=\"169\" formatCode=\"0.0000\"")); assert!(styles.contains("numFmtId=\"172\" formatCode=\"0.0000000\"")); - assert!(styles.contains("")); + assert!(styles.contains("")); + assert!(styles.contains("wrapText=\"1\" vertical=\"top\"")); let sheet = read_zip_entry(&workbook, "xl/worksheets/sheet1.xml"); assert!(sheet.contains("5.0000")); @@ -1396,6 +1461,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!("5.0000"), json!("7")]], numeric_column_right_align: false, + auto_filter: None, }) .expect("build workbook"); @@ -1413,6 +1479,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!("0.00000000000000000001")]], numeric_column_right_align: true, + auto_filter: None, }) .expect("build workbook"); @@ -1443,6 +1510,7 @@ mod tests { json!("not-a-number"), ]], numeric_column_right_align: true, + auto_filter: None, }) .expect("build workbook"); @@ -1485,6 +1553,7 @@ mod tests { json!("2024-02-25T13:02:15+08:00"), ]], numeric_column_right_align: false, + auto_filter: None, }) .expect("build workbook"); @@ -1513,6 +1582,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!("2026-07-25 13:02:15.456")]], numeric_column_right_align: false, + auto_filter: None, }; let workbook = @@ -1564,6 +1634,7 @@ mod tests { json!("2800.000000"), ]], numeric_column_right_align: false, + auto_filter: None, }) .expect("build workbook"); @@ -1591,6 +1662,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!("9223372036854775807"), json!("123456789012345.6789000000")]], numeric_column_right_align: false, + auto_filter: None, }) .expect("build workbook"); @@ -1624,6 +1696,7 @@ mod tests { json!(12345678901234567.89_f64), ]], numeric_column_right_align: false, + auto_filter: None, }) .expect("build workbook"); @@ -1663,6 +1736,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!("ok")]], numeric_column_right_align: false, + auto_filter: None, }) .expect("build workbook"); let workbook_xml = read_zip_entry(&workbook, "xl/workbook.xml"); @@ -1680,6 +1754,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!(1)]], numeric_column_right_align: false, + auto_filter: None, }, XlsxWorksheetData { sheet_name: Some("Result 2".to_string()), @@ -1688,6 +1763,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!("Ada")]], numeric_column_right_align: false, + auto_filter: None, }, ]) .expect("build multi-sheet workbook"); @@ -1788,6 +1864,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!("SELECT id, name FROM users")]], numeric_column_right_align: false, + auto_filter: Some(false), }; let mut writer = start_streaming_xlsx_workbook_with_trailing_sheets( file, @@ -1819,6 +1896,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!(1.5), json!("row")]], numeric_column_right_align: true, + auto_filter: None, }) .expect("build workbook"); let sheet = read_zip_entry(&workbook, "xl/worksheets/sheet1.xml"); @@ -1836,6 +1914,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!(1.5), json!("row")]], numeric_column_right_align: false, + auto_filter: None, }) .expect("build workbook"); let sheet = read_zip_entry(&workbook, "xl/worksheets/sheet1.xml"); @@ -1876,6 +1955,7 @@ mod tests { column_comments: vec![], rows: vec![row], numeric_column_right_align: true, + auto_filter: None, }) .expect("build workbook"); let sheet = read_zip_entry(&workbook, "xl/worksheets/sheet1.xml"); @@ -1986,6 +2066,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!("SELECT 1")]], numeric_column_right_align: false, + auto_filter: Some(false), }; let mut writer = start_streaming_xlsx_workbook_with_max_rows( file, @@ -2070,6 +2151,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!("SELECT 1")]], numeric_column_right_align: false, + auto_filter: Some(false), }; let sql_sheet_b = XlsxWorksheetData { sheet_name: Some("SQL".to_string()), @@ -2078,6 +2160,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!("SELECT 2")]], numeric_column_right_align: false, + auto_filter: Some(false), }; let mut writer = start_streaming_xlsx_workbook_with_max_rows( file, @@ -2118,6 +2201,7 @@ mod tests { column_comments: vec![], rows: vec![vec![json!("SELECT 1")]], numeric_column_right_align: false, + auto_filter: Some(false), }; let mut writer = start_streaming_xlsx_workbook_with_max_rows( file, @@ -2157,6 +2241,7 @@ mod tests { column_comments: vec![], rows, numeric_column_right_align: false, + auto_filter: None, }], 2, None, @@ -2220,6 +2305,7 @@ mod tests { column_comments: vec![], rows, numeric_column_right_align: true, + auto_filter: None, }; let segment = WorksheetSegment { name: worksheet.sheet_name.clone(), @@ -2228,6 +2314,7 @@ mod tests { column_comments: &worksheet.column_comments, rows: &worksheet.rows, numeric_column_right_align: worksheet.numeric_column_right_align, + auto_filter: worksheet.auto_filter, }; let mut stats = WriteStats::default(); @@ -2253,6 +2340,7 @@ mod tests { column_comments: vec![], rows: (0..7).map(|i| vec![json!(i)]).collect(), numeric_column_right_align: false, + auto_filter: None, }; let sheet_b = XlsxWorksheetData { sheet_name: Some("B".to_string()), @@ -2261,6 +2349,7 @@ mod tests { column_comments: vec![], rows: (100..102).map(|i| vec![json!(i)]).collect(), numeric_column_right_align: false, + auto_filter: None, }; let data = build_xlsx_workbook_multi_with_max_rows(&[sheet_a, sheet_b], 3, None).expect("build workbook"); @@ -2294,6 +2383,7 @@ mod tests { column_comments: vec![], rows, numeric_column_right_align: false, + auto_filter: None, }], 100, None, @@ -2321,6 +2411,7 @@ mod tests { column_comments: vec![], rows: vec![], numeric_column_right_align: false, + auto_filter: None, }) .expect("build workbook"); @@ -2349,6 +2440,51 @@ mod tests { assert!(sheet2.contains("row_3"), "row 3 should be on sheet 2: {sheet2}"); } + #[test] + fn sql_worksheet_disables_auto_filter_and_preserves_multiline_whitespace() { + let data_sheet = XlsxWorksheetData { + sheet_name: Some("Users".to_string()), + columns: vec!["id".to_string(), "name".to_string()], + column_types: vec!["int".to_string(), "varchar".to_string()], + column_comments: vec![], + rows: vec![vec![json!(1), json!("Ada")]], + numeric_column_right_align: false, + auto_filter: None, + }; + let multiline_sql = "SELECT id, name\n FROM users\n WHERE active = 1\n ORDER BY id ASC"; + let sql_sheet = XlsxWorksheetData { + sheet_name: Some("SQL".to_string()), + columns: vec!["SQL".to_string()], + column_types: vec![], + column_comments: vec![], + rows: vec![vec![json!(multiline_sql)]], + numeric_column_right_align: false, + auto_filter: Some(false), + }; + + let workbook = build_xlsx_workbook_multi_with_auto_filter(&[data_sheet, sql_sheet], true, None) + .expect("build multi workbook with sql"); + + // Sheet 1 (Users) should have autoFilter enabled + let sheet1 = read_zip_entry(&workbook, "xl/worksheets/sheet1.xml"); + assert!(sheet1.contains(""), "data sheet must have autoFilter: {sheet1}"); + + // Sheet 2 (SQL) must NOT have autoFilter + let sheet2 = read_zip_entry(&workbook, "xl/worksheets/sheet2.xml"); + assert!(!sheet2.contains(""), + "multiline indented sql cell must have xml:space=\"preserve\": {sheet2}" + ); + assert!(sheet2.contains("FROM users"), "sql content preserved: {sheet2}"); + assert!(sheet2.contains("s=\"36\""), "sql sheet cell must have wrapText style s=36: {sheet2}"); + + // Column width for SQL column should be expanded beyond the default 10/60 + assert!(sheet2.contains(" exportColumns), displayItems: computed(() => rowItems), - sql: computed(() => "SELECT * FROM users"), - exportSql: computed(() => "SELECT * FROM users ORDER BY id DESC"), + sql: computed(() => options.sql ?? "SELECT * FROM users"), + exportSql: computed(() => options.exportSql ?? "SELECT * FROM users ORDER BY id DESC"), + pageSql: computed(() => options.pageSql), tableMeta: computed(() => options.tableMeta), databaseType: computed(() => options.databaseType ?? "postgres"), connectionId: computed(() => "conn-1"), @@ -1034,6 +1038,45 @@ test("selected XLSX with SQL uses the effective result SQL in a second worksheet assert.deepEqual(worksheets[0].rows, [[1, "Ada"]]); assert.equal(worksheets[1].sheetName, "SQL"); assert.deepEqual(worksheets[1].rows, [["SELECT * FROM users ORDER BY id DESC"]]); + assert.equal(worksheets[1].autoFilter, false); +}); + +test("exportCurrentPageXlsxWithSql prioritizes pageSql over base query and disables autoFilter on SQL worksheet", async () => { + apiMock.exportQueryResultsXlsx.mockClear(); + const { composable } = buildExportHarness({ + currentResultLabel: "public.users", + sql: "SELECT * FROM users", + exportSql: "SELECT * FROM users ORDER BY id DESC", + pageSql: "SELECT * FROM users ORDER BY id DESC LIMIT 50 OFFSET 0", + }); + + await composable.exportCurrentPageXlsxWithSql(); + + assert.equal(apiMock.exportQueryResultsXlsx.mock.calls.length, 1); + const worksheets = apiMock.exportQueryResultsXlsx.mock.calls[0][1]; + assert.equal(worksheets.length, 2); + assert.equal(worksheets[0].sheetName, "public.users"); + assert.equal(worksheets[1].sheetName, "SQL"); + assert.deepEqual(worksheets[1].rows, [["SELECT * FROM users ORDER BY id DESC LIMIT 50 OFFSET 0"]]); + assert.equal(worksheets[1].autoFilter, false); +}); + +test("exportCurrentPageXlsxWithSql falls back to exportSql when pageSql is unset", async () => { + apiMock.exportQueryResultsXlsx.mockClear(); + const { composable } = buildExportHarness({ + currentResultLabel: "public.users", + sql: "SELECT * FROM users", + exportSql: "SELECT * FROM users ORDER BY id DESC", + }); + + await composable.exportCurrentPageXlsxWithSql(); + + assert.equal(apiMock.exportQueryResultsXlsx.mock.calls.length, 1); + const worksheets = apiMock.exportQueryResultsXlsx.mock.calls[0][1]; + assert.equal(worksheets.length, 2); + assert.equal(worksheets[1].sheetName, "SQL"); + assert.deepEqual(worksheets[1].rows, [["SELECT * FROM users ORDER BY id DESC"]]); + assert.equal(worksheets[1].autoFilter, false); }); test("all-results XLSX with SQL maps each result set to its source statement", async () => { diff --git a/packages/app-tests/xlsxExport.test.ts b/packages/app-tests/xlsxExport.test.ts index 6f2fee86eb..b7b079aef7 100644 --- a/packages/app-tests/xlsxExport.test.ts +++ b/packages/app-tests/xlsxExport.test.ts @@ -94,9 +94,48 @@ test("builds a result workbook with a separate SQL worksheet", () => { assert.match(text, /name="Result"/); assert.match(text, /name="SQL"/); assert.match(text, /xl\/worksheets\/sheet2\.xml/); + assert.match(text, /wrapText="1" vertical="top"/); assert.match(text, /SELECT id, name FROM users WHERE active = true/); }); +test("omits autoFilter on worksheet when autoFilter is false", () => { + const sqlWorksheet = buildXlsxSqlWorksheet([{ sql: "SELECT id, name FROM users" }]); + assert.ok(sqlWorksheet); + const workbook = buildXlsxWorkbookMulti([ + { sheetName: "Result", columns: ["id", "name"], rows: [[1, "Ada"]], autoFilter: true }, + { ...sqlWorksheet, autoFilter: false }, + ]); + const sheet1 = readStoredZipEntry(workbook, "xl/worksheets/sheet1.xml"); + const sheet2 = readStoredZipEntry(workbook, "xl/worksheets/sheet2.xml"); + + assert.match(sheet1, //); + assert.doesNotMatch(sheet2, / { + const multilineSql = "SELECT id, name\n FROM users\n WHERE active = true\n ORDER BY id ASC"; + const sqlWorksheet = buildXlsxSqlWorksheet([{ sql: multilineSql }]); + assert.ok(sqlWorksheet); + const workbook = buildXlsxWorkbookMulti([ + { sheetName: "Result", columns: ["id"], rows: [[1]] }, + { ...sqlWorksheet, autoFilter: false }, + ]); + const sheet2 = readStoredZipEntry(workbook, "xl/worksheets/sheet2.xml"); + + assert.match(sheet2, /SELECT id, name\n FROM users\n WHERE active = true\n ORDER BY id ASC<\/t><\/is><\/c>/); +}); + +test("adjusts column width for SQL worksheet based on line lengths", () => { + const sql = "SELECT id, name, email, department, created_at FROM users WHERE id IN (1, 2, 3)"; + const sqlWorksheet = buildXlsxSqlWorksheet([{ sql }]); + assert.ok(sqlWorksheet); + const workbook = buildXlsxWorkbookMulti([sqlWorksheet]); + const sheet1 = readStoredZipEntry(workbook, "xl/worksheets/sheet1.xml"); + + // Header "SQL" (length 3 + 2 = 5) clamped to at least 40; sql length 79 + 2 = 81. + assert.match(sheet1, //); +}); + test("web in-memory XLSX export splits oversized worksheets", () => { const workbook = buildXlsxWorkbookMultiWithMaxRows( [ diff --git a/src-tauri/src/commands/xlsx_export.rs b/src-tauri/src/commands/xlsx_export.rs index b7fbf08888..9348b84650 100644 --- a/src-tauri/src/commands/xlsx_export.rs +++ b/src-tauri/src/commands/xlsx_export.rs @@ -47,6 +47,7 @@ pub async fn export_query_result_xlsx(request: QueryResultXlsxExportRequest) -> column_comments: request.column_comments, rows: request.rows, numeric_column_right_align: request.numeric_column_right_align, + auto_filter: request.auto_filter, }; // Ensure consistency: if the feature is disabled, clear the flag. if !data.numeric_column_right_align {