Reject unknown value-field func in insert.pivotTable (#1757)

Found while testing crates/engine/src/cmd/pivot.rs:678 (func_param at :248)

Co-authored-by: Claude Haiku 5.5 <noreply@anthropic.com>
This commit is contained in:
NetterSilver
2026-10-17 18:34:28 -06:00
committed by GitHub
co-authored by Claude Haiku 5.5
parent 823c56582d
commit 217a8907ff
2 changed files with 40 additions and 1 deletions
+7 -1
View File
@@ -675,7 +675,13 @@ fn insert_pivot(s: &mut Session, p: &Json) -> Result<Json> {
Json::String(n) => add_to_area("insert.pivotTable", pt, &src, n, area, None, None, None)?,
Json::Object(_) => {
let n = str_param(f, "field").ok_or_else(|| bad("insert.pivotTable", "a field object needs `field`"))?;
add_to_area("insert.pivotTable", pt, &src, n, area, func_param(str_param(f, "func")), str_param(f, "name"), None)?;
let func = match str_param(f, "func") {
Some(fname) => {
Some(func_param(Some(fname)).ok_or_else(|| bad("insert.pivotTable", format!("unknown function `{fname}`")))?)
}
None => None,
};
add_to_area("insert.pivotTable", pt, &src, n, area, func, str_param(f, "name"), None)?;
let by = group_param(str_param(f, "group"));
if let Some(by) = by.filter(|b| *b != PivotDateGroup::None)
&& matches!(area, "rows" | "columns")
+33
View File
@@ -0,0 +1,33 @@
use gridcraft_engine::Session;
use serde_json::json;
fn session() -> Session {
let mut s = Session::new();
s.new_workbook();
s.execute("range.setValues", json!({"range":"A1", "values":[["Region", "Sales"], ["East", "10"], ["East", "2"], ["West", "4"]]})).unwrap();
s
}
#[test]
fn insert_pivot_table_rejects_unknown_func() {
for func in ["stdev", "sumx"] {
let mut s = session();
let r = s.execute(
"insert.pivotTable",
json!({"source":"Sheet1!A1:B4", "destination":"Sheet1!F1", "rows":["Region"], "values":[{"field":"Sales", "func":func}]}),
);
assert!(r.is_err(), "unknown func `{func}` accepted silently");
assert!(s.doc().unwrap().wb.active().unwrap().pivots.is_empty());
}
}
#[test]
fn insert_pivot_table_accepts_known_func() {
let mut s = session();
s.execute(
"insert.pivotTable",
json!({"source":"Sheet1!A1:B4", "destination":"Sheet1!F1", "rows":["Region"], "values":[{"field":"Sales", "func":"stddev"}]}),
)
.unwrap();
assert_eq!(s.doc().unwrap().wb.active().unwrap().pivots.len(), 1);
}