From 279ca00208a3391190e8d0d776673226b4b6d285 Mon Sep 17 00:00:00 2001
From: Martin Tournoij <martin@arp242.net>
Date: Sun, 25 Aug 2024 04:32:39 +0100
Subject: [PATCH] Fix export when collecting browsers/systems is disabled

Would end up as NULL.

Aside: these columns pronably should be NULL in hits; no reason to store
it as "0". Same with location column.
---
 .github/workflows/test.yml | 6 +-----
 export.go                  | 6 +++---
 go.mod                     | 4 ++--
 go.sum                     | 8 ++++----
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9eb6c082d..ef55e6880 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,9 +1,5 @@
 name: 'test backend'
-on:
-  push:
-    paths: ['**.go', 'go.mod', '.github/workflows/*']
-  pull_request:
-    paths: ['**.go', 'go.mod', '.github/workflows/*']
+on:   ['push', 'pull_request']
 
 jobs:
   # Uncomment to get a debug shell.
diff --git a/export.go b/export.go
index 0730017ac..04896d585 100644
--- a/export.go
+++ b/export.go
@@ -442,15 +442,15 @@ func (h *ExportRows) Export(ctx context.Context, limit, paginate int64) (int64,
 			paths.title,
 			paths.event,
 
-			browsers.name || ' ' || browsers.version as browser,
-			systems.name  || ' ' || systems.version  as system,
+			coalesce(browsers.name || ' ' || browsers.version, '') as browser,
+			coalesce(systems.name  || ' ' || systems.version, '')  as system,
 
 			hits.session,
 			hits.bot,
 			coalesce(refs.ref, '')        as ref,
 			coalesce(refs.ref_scheme, '') as ref_s,
 			coalesce(sizes.size, '')      as size,
-			hits.location                 as loc,
+			coalesce(hits.location, '')   as loc,
 			hits.first_visit              as first,
 			hits.created_at
 		from hits
diff --git a/go.mod b/go.mod
index 7cb0b3e21..bd614fcac 100644
--- a/go.mod
+++ b/go.mod
@@ -26,7 +26,7 @@ require (
 	zgo.at/errors v1.3.0
 	zgo.at/follow v0.0.0-20240522232612-673fb184d32f
 	zgo.at/gadget v1.0.0
-	zgo.at/guru v1.1.0
+	zgo.at/guru v1.2.0
 	zgo.at/isbot v1.0.0
 	zgo.at/json v0.0.0-20221020004326-fe4f75bb278e
 	zgo.at/termtext v1.5.0
@@ -34,7 +34,7 @@ require (
 	zgo.at/z18n v0.0.0-20240522230155-4d5af439f8c4
 	zgo.at/zcache v1.2.0
 	zgo.at/zcache/v2 v2.1.0
-	zgo.at/zdb v0.0.0-20240818155550-1a862f98cab0
+	zgo.at/zdb v0.0.0-20240820041039-abefdffc704f
 	zgo.at/zhttp v0.0.0-20240819012318-b761c83c740e
 	zgo.at/zli v0.0.0-20240614180544-47534b1ce136
 	zgo.at/zlog v0.0.0-20211017235224-dd4772ddf860
diff --git a/go.sum b/go.sum
index 7af70b27a..0ec7804a4 100644
--- a/go.sum
+++ b/go.sum
@@ -115,8 +115,8 @@ zgo.at/follow v0.0.0-20240522232612-673fb184d32f h1:i18eV/TqcF/vwAHQmtqeJ3AprzAe
 zgo.at/follow v0.0.0-20240522232612-673fb184d32f/go.mod h1:4OJUid1+SqN/MT4BjPQj+A25nwouKPuP5/1O0kli4rg=
 zgo.at/gadget v1.0.0 h1:aY+h6cRSY1KgjuNWb1fFzT8KWAGllhuYEcf18f1adWw=
 zgo.at/gadget v1.0.0/go.mod h1:1x0AKFOjKScVTzJh+V69Ku6hTwvEM56MlnKOtrjMwSo=
-zgo.at/guru v1.1.0 h1:hvMLOzPnv7XApwJZgxvFxBA8wb6RGPUw9lz8kmq450g=
-zgo.at/guru v1.1.0/go.mod h1:eltnfk6QwmM7ic3OLzmGMjEChP2iLuYXERyliREiA00=
+zgo.at/guru v1.2.0 h1:qiU8pEiekni+XtzXFUxu/Qep9snC7wxhxNuGcybWyQE=
+zgo.at/guru v1.2.0/go.mod h1:eltnfk6QwmM7ic3OLzmGMjEChP2iLuYXERyliREiA00=
 zgo.at/isbot v1.0.0 h1:wM+40WO2LudR5352eCAQlHQdWsdNVpngB8Oe1qlTpdM=
 zgo.at/isbot v1.0.0/go.mod h1:/w+LTWbHsV7G5fT41VnwM0kTdk1H/prynfMqaxcBWjA=
 zgo.at/json v0.0.0-20221020004326-fe4f75bb278e h1:rEyfeeAnUDOYdH9PVHe5EZ8seo1V1UdbIAMmusS1LjQ=
@@ -133,8 +133,8 @@ zgo.at/zcache v1.2.0 h1:++0dNWOrmUBa10WSja+eHx5bEO2PzZLRY6MJlBD47yk=
 zgo.at/zcache v1.2.0/go.mod h1:xWQo2ha/bamTmx8CbfrZl9Nf8AoT5uNh2hWfbQi8TiE=
 zgo.at/zcache/v2 v2.1.0 h1:USo+ubK+R4vtjw4viGzTe/zjXyPw6R7SK/RL3epBBxs=
 zgo.at/zcache/v2 v2.1.0/go.mod h1:gyCeoLVo01QjDZynjime8xUGHHMbsLiPyUTBpDGd4Gk=
-zgo.at/zdb v0.0.0-20240818155550-1a862f98cab0 h1:kqQjQGkuuU4Tx1Ltsb2TYC2wTgWen1chHe9OSSq68ig=
-zgo.at/zdb v0.0.0-20240818155550-1a862f98cab0/go.mod h1:hXIbV/v/ENSl5CfzICL/jpTjYb50k/gKi2kN8UeuZcY=
+zgo.at/zdb v0.0.0-20240820041039-abefdffc704f h1:oMMrRuJTMEJhIQfvv558sasUQc6FMj+ehqgSeHLwdDo=
+zgo.at/zdb v0.0.0-20240820041039-abefdffc704f/go.mod h1:hXIbV/v/ENSl5CfzICL/jpTjYb50k/gKi2kN8UeuZcY=
 zgo.at/zhttp v0.0.0-20240819012318-b761c83c740e h1:XkppPemmGbgCauiZOCUpWtvPor9yiB9611AsFUoVmho=
 zgo.at/zhttp v0.0.0-20240819012318-b761c83c740e/go.mod h1:OEB7qL85qu5BBFfdmep9TTnUUb25j3aqEYYuUnmFqX4=
 zgo.at/zli v0.0.0-20240614180544-47534b1ce136 h1:Q0j5M5+5YGNaECQmKOcznyDYX3jZUCVN+c7GKUkoV8o=