Fixes supabase-community#37 - Return Type minimal would fail to res…

…olve because of incorrect `Accept` headers. Added header and test to verify for future.
ApelegHQ · Dec 27, 2021 · 44d4bf6 · 44d4bf6
1 parent 24f80fe
commit 44d4bf6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/Postgrest/QueryOptions.cs b/Postgrest/QueryOptions.cs
@@ -58,6 +58,7 @@ public enum DuplicateResolutionType
 
         public Dictionary<string, string> ToHeaders()
         {
+            var headers = new Dictionary<string, string>();
             var prefersHeaders = new List<string>();
 
             if (Upsert)
@@ -78,10 +79,14 @@ public Dictionary<string, string> ToHeaders()
                 prefersHeaders.Add($"count={countAttr.Mapping}");
             }
 
-            return new Dictionary<string, string>
+            headers.Add("Prefer", String.Join(",", prefersHeaders.ToArray()));
+
+            if (Returning == ReturnType.Minimal)
             {
-                { "Prefer", String.Join(",", prefersHeaders.ToArray()) }
-            };
+                headers.Add("Accept", "*/*");
+            }
+
+            return headers;
         }
     }
-}
+}
diff --git a/Postgrest/Responses/ModeledResponse.cs b/Postgrest/Responses/ModeledResponse.cs
@@ -22,7 +22,7 @@ public ModeledResponse(BaseResponse baseResponse, JsonSerializerSettings seriali
             Content = baseResponse.Content;
             ResponseMessage = baseResponse.ResponseMessage;
 
-            if (shouldParse)
+            if (shouldParse && !string.IsNullOrEmpty(Content))
             {
                 var token = JToken.Parse(Content);
 

diff --git a/PostgrestTests/ClientApi.cs b/PostgrestTests/ClientApi.cs
@@ -339,6 +339,11 @@ public async Task TestBasicInsert()
             Assert.AreEqual(newUser.Status, insertedUser.Status);
 
             await client.Table<User>().Delete(newUser);
+
+            var response2 = await client.Table<User>().Insert(newUser, new QueryOptions { Returning = QueryOptions.ReturnType.Minimal });
+            Assert.AreEqual("", response2.Content);
+
+            await client.Table<User>().Delete(newUser);
         }
 
         [TestMethod("insert: headers generated")]
@@ -938,13 +943,13 @@ public async Task TestInsertBulk()
                 AgeRange = new IntRange(21, 28),
                 Status = "OFFLINE"
             };
+
             var users = new List<User>
             {
                rocketUser,
                aceUser
             };
 
-
             var response = await client.Table<User>().Insert(users);
             var insertedUsers = response.Models;