Start to add compatibility with squee returning #f for null values

While maintaining compatibility for older versions of squee.
2021-01-02 10:06:27 +00:00 · 2021-01-02 10:06:27 +00:00 · 64a4058cce
commit 64a4058cce
parent 7df6f92036
6 changed files with 53 additions and 38 deletions
--- a/guix-data-service/database.scm
+++ b/guix-data-service/database.scm
@ -191,12 +191,14 @@
       (map
        (lambda (col-i)
          (let ((val (result-get-value result-ptr row-i col-i)))
-            (if (string-null? val)
-                (if (eq? 1 (%PQgetisnull
-                            (squee/unwrap-result-ptr result-ptr) row-i col-i))
-                    '()
-                    val)
-                val)))
+            (cond
+             ((eq? #f val) '())
+             ((string-null? val)
+              (if (eq? 1 (%PQgetisnull
+                          (squee/unwrap-result-ptr result-ptr) row-i col-i))
+                  '()
+                  val))
+             (else val))))
        cols-range))
     rows-range)))