fix tests

walmartlabs · Feb 3, 2024 · a1d6712 · a1d6712
1 parent d830c0b
commit a1d6712
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/com/walmartlabs/lacinia/executor.clj b/src/com/walmartlabs/lacinia/executor.clj
@@ -181,9 +181,16 @@
   is an ResultTuple."
   [left-value right-value]
   (if (su/is-result-tuple? right-value)
-    (let [{:keys [alias value]} right-value]
-      (if (contains? left-value alias)
+    (let [{:keys [alias value]} right-value
+      left-alias-value (alias left-value)]
+      (cond
+        (= left-alias-value :com.walmartlabs.lacinia.schema/null)
+        left-value
+
+        (map? left-alias-value)
         (update left-value alias deep-merge value)
+
+        :else
         (assoc left-value alias value)))
     (deep-merge left-value right-value)))
 

diff --git a/test/com/walmartlabs/lacinia/executor_test.clj b/test/com/walmartlabs/lacinia/executor_test.clj
@@ -93,5 +93,3 @@ query MyQuery {
     id
   }
 }")))))
-
-(clojure.test/run-test deep-merge-on-error)