feat: FIR-30193: improved error handling when JSON parsing fails (#75)

firebolt-db · Apr 25, 2024 · e2491ac · e2491ac
1 parent ab72d73
commit e2491ac
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/FireboltDotNetSdk.Tests/Unit/FireboltCommandTest.cs b/FireboltDotNetSdk.Tests/Unit/FireboltCommandTest.cs
@@ -140,6 +140,15 @@ public void GetOriginalJsonDataTest()
             Assert.False(reader.Read());
         }
 
+        [Test]
+        public void GetBadJsonDataTest()
+        {
+            string response = "not a json";
+            var cs = createCommand("select 1", response);
+            string message = Assert.Throws<FireboltException>(() => cs.ExecuteReader()).Message;
+            Assert.That(message, Does.Contain("Failed to execute a query"));
+        }
+
         [TestCase("SET param=1")]
         [TestCase("SET param=1,param=2")]
         public void ClearSetListTest(string commandText)

diff --git a/FireboltNETSDK/Client/FireboltCommand.cs b/FireboltNETSDK/Client/FireboltCommand.cs
@@ -330,8 +330,15 @@ private string GetParamValue(object? value)
         private QueryResult? GetOriginalJsonData(string? Response)
         {
             if (Response == null) throw new FireboltException("Response is empty while GetOriginalJSONData");
-            var prettyJson = JToken.Parse(Response).ToString(Formatting.Indented);
-            return JsonConvert.DeserializeObject<QueryResult>(prettyJson);
+            try
+            {
+                var prettyJson = JToken.Parse(Response).ToString(Formatting.Indented);
+                return JsonConvert.DeserializeObject<QueryResult>(prettyJson);
+            }
+            catch (JsonReaderException e)
+            {
+                throw new FireboltException($"Failed to execute a query. Invalid response body format. Try again or contact support.", e);
+            }
         }
 
         public void ClearSetList()