fix #1064

tursodatabase · Feb 27, 2025 · a23c51e · a23c51e
1 parent 672fe06
commit a23c51e
Showing 1 changed file with 6 additions and 2 deletions.
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,8 +1735,11 @@ 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();
                             let OwnedValue::Agg(agg) = state.registers[*acc_reg].borrow_mut()