3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-13 10:26:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Make nil safe some decode helpers on db ns

Browse source
This commit is contained in:
Andrey Antukh 2022-11-01 09:41:39 +01:00 • committed by Andrés Moya
parent ce99ca0aa8
commit c027de2592
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
backend/src/app/db.clj
View file

@ -420,21 +420,23 @@
(defn decode-json-pgobject (defn decode-json-pgobject
[^PGobject o] [^PGobject o]
(let [typ (.getType o) (when o
val (.getValue o)] (let [typ (.getType o)
(if (or (= typ "json") val (.getValue o)]
(= typ "jsonb")) (if (or (= typ "json")
(json/read val) (= typ "jsonb"))
val))) (json/read val)
val))))
(defn decode-transit-pgobject (defn decode-transit-pgobject
[^PGobject o] [^PGobject o]
(let [typ (.getType o) (when o
val (.getValue o)] (let [typ (.getType o)
(if (or (= typ "json") val (.getValue o)]
(= typ "jsonb")) (if (or (= typ "json")
(t/decode-str val) (= typ "jsonb"))
val))) (t/decode-str val)
val))))
(defn inet (defn inet
[ip-addr] [ip-addr]