fix(client): handle null from server (#3922)

* fix(client): regression because non-scalar resolution, handle null from db better

* test(client): snapshot conflict resolution

* fix(client): reorder condition

Author: Divyendu Singh

cli/packages/prisma-client-lib/src/Client.test.js.md

@@ -4,6 +4,73 @@ The actual snapshot is saved in `Client.test.js.snap`.
 
 Generated by [AVA](https://ava.li).
 
+## automatic non-scalar sub selection
+
+> Snapshot 1
+
+    `query ($where: UserWhereInput) {␊
+      users(where: $where) {␊
+        __typename␊
+      }␊
+    }␊
+    `
+
+## automatic non-scalar sub selection for a connection with scalars
+
+> Snapshot 1
+
+    `query ($where: HouseWhereInput) {␊
+      housesConnection(where: $where) {␊
+        pageInfo {␊
+          hasNextPage␊
+          hasPreviousPage␊
+          startCursor␊
+          endCursor␊
+        }␊
+        edges {␊
+          node {␊
+            id␊
+            name␊
+          }␊
+          cursor␊
+        }␊
+      }␊
+    }␊
+    `
+
+## automatic non-scalar sub selection for a connection without scalars
+
+> Snapshot 1
+
+    `query ($where: UserWhereInput) {␊
+      usersConnection(where: $where) {␊
+        pageInfo {␊
+          hasNextPage␊
+          hasPreviousPage␊
+          startCursor␊
+          endCursor␊
+        }␊
+        edges {␊
+          node␊
+          cursor␊
+        }␊
+      }␊
+    }␊
+    `
+
+## automatic non-scalar sub selection for relation
+
+> Snapshot 1
+
+    `query ($where: HouseWhereInput) {␊
+      house(where: $where) {␊
+        user {␊
+          __typename␊
+        }␊
+      }␊
+    }␊
+    `
+
 ## deep related type
 
 > Snapshot 1
@@ -31,6 +98,19 @@ Generated by [AVA](https://ava.li).
     }␊
     `
 
+## nested args
+
+> Snapshot 1
+
+    `query ($where: PostInput!) {␊
+      post(where: $where) {␊
+        id␊
+        title␊
+        content␊
+      }␊
+    }␊
+    `
+
 ## nested mbedded type
 
 > Snapshot 1
@@ -57,9 +137,9 @@ Generated by [AVA](https://ava.li).
         id␊
       }␊
     }␊
-    
+    `
 
-## nested args
+## top level args
 
 > Snapshot 1
 
@@ -72,39 +152,26 @@ Generated by [AVA](https://ava.li).
     }␊
     `
 
-## top level args
+## unpacking extract payload - array
 
 > Snapshot 1
 
-    `query ($where: PostInput!) {␊
-      post(where: $where) {␊
-        id␊
-        title␊
-        content␊
-      }␊
-    }␊
-    
+    '[{"id":"1","name":"Alice"},{"id":"2","name":"Bob"}]'
 
-## automatic non-scalar sub selection
+## unpacking extract payload - nested array
 
 > Snapshot 1
 
-    `query ($where: UserWhereInput) {␊
-      users(where: $where) {␊
-        __typename␊
-      }␊
-    }␊
-    
+    '[{"id":"1","name":"My House"},{"id":"2","name":"Summer House"}]'
 
-## automatic non-scalar sub selection for relation
+## unpacking extract payload - nested object
 
 > Snapshot 1
 
-    `query ($where: HouseWhereInput) {␊
-      house(where: $where) {␊
-        user {␊
-          __typename␊
-        }␊
-      }␊
-    }␊
-    `
+    '{"id":"1","name":"My House"}'
+
+## unpacking extract payload - null from server
+
+> Snapshot 1
+
+    'null'