Merge pull request #284 from ExNexu/patch-1

Fix NPE in <-pgobject
seancorfield · Jul 26, 2024 · 1fed35a · 1fed35a
2 parents 005ec2a + d6d0edb
commit 1fed35a
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/doc/tips-and-tricks.md b/doc/tips-and-tricks.md
@@ -417,14 +417,12 @@ containing JSON:
       (.setValue (->json x)))))
 
 (defn <-pgobject
-  "Transform PGobject containing `json` or `jsonb` value to Clojure
-  data."
-  [^org.postgresql.util.PGobject v]
+  "Transform PGobject containing `json` or `jsonb` value to Clojure data."
+  [^PGobject v]
   (let [type  (.getType v)
         value (.getValue v)]
     (if (#{"jsonb" "json"} type)
-      (when value
-        (with-meta (<-json value) {:pgtype type}))
+      (some-> value <-json (with-meta {:pgtype type}))
       value)))
 ```