From 286417146a743838b5a946cd941b1686830fb588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= <lindesvard@gmail.com>
Date: Thu, 1 Aug 2024 22:30:59 +0200
Subject: [PATCH] fixes

---
 packages/db/src/services/chart.service.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/db/src/services/chart.service.ts b/packages/db/src/services/chart.service.ts
index 77324f4c..25394f59 100644
--- a/packages/db/src/services/chart.service.ts
+++ b/packages/db/src/services/chart.service.ts
@@ -114,11 +114,13 @@ export function getChartSql({
   }
 
   if (event.segment === 'property_sum' && event.property) {
-    sb.select.count = `sum(toFloat64OrNull(${getPropertyKey(event.property)})) as count`;
+    sb.select.count = `sum(toFloat64(${getPropertyKey(event.property)})) as count`;
+    sb.where.property = `${getPropertyKey(event.property)} IS NOT NULL`;
   }
 
   if (event.segment === 'property_average' && event.property) {
-    sb.select.count = `avg(toFloat64OrNull(${getPropertyKey(event.property)})) as count`;
+    sb.select.count = `avg(toFloat64(${getPropertyKey(event.property)})) as count`;
+    sb.where.property = `${getPropertyKey(event.property)} IS NOT NULL`;
   }
 
   if (event.segment === 'one_event_per_user') {