Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(database-sql): preserve repeated selected column values (#7577)
Wolf Mermelsteina1a7043cf3c9
diff --git a/crates/database_sql/src/engine/test.rs b/crates/database_sql/src/engine/test.rsindex ab29b421b2..ad29d83a10 100644--- a/crates/database_sql/src/engine/test.rs+++ b/crates/database_sql/src/engine/test.rs@@ -2,6 +2,7 @@ use models_databases::position::Position;use models_databases::{DatabaseId, OptionId, RowId};use std::collections::HashMap;+mod projection;mod transcripts;use filter_ast::Expr;diff --git a/crates/database_sql/src/engine/test/projection.rs b/crates/database_sql/src/engine/test/projection.rsnew file mode 100644index 0000000000..7fe01dc85a--- /dev/null+++ b/crates/database_sql/src/engine/test/projection.rs@@ -0,0 +1,46 @@+use super::*;++#[test]+fn a_column_selected_twice_keeps_both_values_and_aliases() {+ let (outcome, requests) = drive(+ &catalog(),+ "SELECT name AS original, name AS copy, owner AS first_owner, owner AS second_owner \+ FROM crm.deals ORDER BY name",+ |_| {+ let mut rows = deals();+ rows[0]+ .cells+ .insert(OWNER, Cell::Entities(vec![SAM.into()]));+ rows+ },+ );++ assert_eq!(requests.len(), 1);+ assert_eq!(requests[0].needs, vec![NAME, OWNER]);+ assert_eq!(+ outcome+ .columns+ .iter()+ .map(|column| column.name.as_str())+ .collect::<Vec<_>>(),+ vec!["original", "copy", "first_owner", "second_owner"]+ );+ assert_eq!(+ outcome.rows,+ vec![+ vec![+ Some(Cell::Text("Acme".into())),+ Some(Cell::Text("Acme".into())),+ Some(Cell::Entities(vec![SAM.into()])),+ Some(Cell::Entities(vec![SAM.into()])),+ ],+ vec![+ Some(Cell::Text("Globex".into())),+ Some(Cell::Text("Globex".into())),+ None,+ None,+ ],+ ]+ );+ assert_eq!(outcome.row_ids, vec![ACME, GLOBEX]);+}diff --git a/crates/database_sql/src/fold.rs b/crates/database_sql/src/fold.rsindex 90be56e554..b1343c6559 100644--- a/crates/database_sql/src/fold.rs+++ b/crates/database_sql/src/fold.rs@@ -147,10 +147,10 @@ fn fold_joined(catalog: &Catalog, plan: &Plan, rows: Vec<Row>) -> (Table, Vec<RoShape::Rows(columns) => {let mut rows = rows;sort::rows(catalog, plan, &mut rows);- let projected = rows.into_iter().map(|mut row| {+ let projected = rows.into_iter().map(|row| {let cells: Vec<Option<Cell>> = columns.iter()- .map(|column| row.cells.remove(column))+ .map(|column| row.cells.get(column).cloned()).collect();(row.id, cells)});