aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2025-12-29 14:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'Fix wrong count() result if the column specified contains a NULL' from lgualtieri75

Browse Source 
Fixes #1064

Closes #1065
This commit is contained in:
Pekka Enberg
2025-02-28 16:28:08 +02:00
parent 672fe066c1 cf407f639e
commit c5095e82a8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/vdbe/mod.rs
View File

@@ -1722,6 +1722,7 @@ impl Program {
*acc += col;
}
AggFunc::Count | AggFunc::Count0 => {
let col = state.registers[*col].clone();
if matches!(&state.registers[*acc_reg], OwnedValue::Null) {
state.registers[*acc_reg] = OwnedValue::Agg(Box::new(
AggContext::Count(OwnedValue::Integer(0)),
@@ -1734,7 +1735,12 @@ impl Program {
let AggContext::Count(count) = agg.borrow_mut() else {
unreachable!();
};
*count += 1;
if (matches!(func, AggFunc::Count) && matches!(col, OwnedValue::Null))
== false
{
*count += 1;
};
}
AggFunc::Max => {
let col = state.registers[*col].clone();