another trial

green-labs · Jul 1, 2024 · b7b8d5e · b7b8d5e
1 parent 701b4cd
commit b7b8d5e
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/com/walmartlabs/lacinia/internal_utils.clj b/src/com/walmartlabs/lacinia/internal_utils.clj
@@ -407,11 +407,22 @@
            nil
           coll))
 
+(defn- null?
+  [v]
+  (or (nil? v)
+      (= v :com.walmartlabs.lacinia.schema/null)))
+
 (defn deep-merge
   "Merges two maps together.  Later map override earlier.
   If a key is sequential, then each element in the list is merged."
   [left right]
   (cond
+    (null? left)
+    left
+
+    (null? right)
+    right
+
     (and (map? left) (map? right))
     (merge-with deep-merge left right)