Merge 'Fix wrong count() result if the column specified contains a NU…

…LL' from lgualtieri75 Fixes #1064 Closes #1065
tursodatabase · Feb 28, 2025 · c5095e8 · c5095e8
2 parents 672fe06 + cf407f6
commit c5095e8
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/core/vdbe/mod.rs b/core/vdbe/mod.rs
@@ -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();