From 2993ab5ca1384f0b67613e2a51babc02167df1ee Mon Sep 17 00:00:00 2001
From: Fletcher Haynes <fletcher@capitalprawn.com>
Date: Fri, 16 Dec 2022 08:22:27 -0800
Subject: [PATCH] This fixes a bug with displaying errors returned from the
 SQL3 endpoint (#2374)

Co-authored-by: Fletcher Haynes <fletcher.haynes@generalassemb.ly>
(cherry picked from commit f65367ab46d1393a9ebd8f8ccc545b1aec1ed23d)
---
 lattice/src/App/Query/QueryContainer.tsx | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lattice/src/App/Query/QueryContainer.tsx b/lattice/src/App/Query/QueryContainer.tsx
index c07df10df..642ddef42 100644
--- a/lattice/src/App/Query/QueryContainer.tsx
+++ b/lattice/src/App/Query/QueryContainer.tsx
@@ -51,10 +51,16 @@ export const QueryContainer: FC<{}> = () => {
 
   const handleHTTPQueryMessages = (response) => {
     setIsSQL3(true)
-    streamingResults.headers = response.data.schema.fields;
-    streamingResults.rows = response.data.data;
-    setErrorResult(undefined);
-    setResults([streamingResults]);
+    console.log(response.data.error);
+    if (response.status === 400) {
+      streamingResults.error = response.data.error;
+      setErrorResult(streamingResults);
+    } else {
+      streamingResults.headers = response.data.schema.fields;
+      streamingResults.rows = response.data.data;
+      setErrorResult(undefined);
+      setResults([streamingResults]);
+    }
     setLoading(false);
   }
 
@@ -138,6 +144,9 @@ export const QueryContainer: FC<{}> = () => {
             if (e.response.status === 404) {
               setIsSQL3(false);
               querySQL(query, handleQueryMessages, handleQueryEnd);
+            } else if (e.response.status === 400) {
+              setIsSQL3(false)
+              handleHTTPQueryMessages(e.response);
             }