Merge branch 'defer/oustanding-defer-codegen' into preview/defer

apollographql · Jan 5, 2024 · 68b9772 · 68b9772
2 parents 8bdcbcc + f75b6b7
commit 68b9772
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Sources/Apollo/GraphQLResult.swift b/Sources/Apollo/GraphQLResult.swift
@@ -151,7 +151,12 @@ fileprivate extension DataDict {
     }
 
     let mergedData = try pathDataDict._data.merging(newDataDict._data) { current, new in
-      throw Error.cannotOverwriteData(current, new)
+      // TODO: This is a quick fix for __typename being returned with fragments, needs a rethink!
+      if current != new {
+        throw Error.cannotOverwriteData(current, new)
+      }
+
+      return current
     }
 
     let mergedFulfilledFragments = pathDataDict._fulfilledFragments