From 5eb0654b09a2efb19f51fde386095a81f0e98650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CA=88=E1=B5=83=E1=B5=A2?= <tdupreetan@gmail.com>
Date: Fri, 13 Nov 2020 13:15:24 -1000
Subject: [PATCH] fix(saved query): handle null sql field (#11679)

---
 .../src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx   | 2 +-
 superset-frontend/src/views/CRUD/types.ts                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx b/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx
index 8caafea7080bc..e127d1c2b3721 100644
--- a/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx
+++ b/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx
@@ -162,7 +162,7 @@ const SavedQueryPreviewModal: FunctionComponent<SavedQueryPreviewModalProps> = (
         <QueryTitle>query name</QueryTitle>
         <QueryLabel>{savedQuery.label}</QueryLabel>
         <SyntaxHighlighter language="sql" style={github}>
-          {savedQuery.sql}
+          {savedQuery.sql || ''}
         </SyntaxHighlighter>
       </StyledModal>
     </div>
diff --git a/superset-frontend/src/views/CRUD/types.ts b/superset-frontend/src/views/CRUD/types.ts
index 27e5f000e1ffe..a00a807ce6615 100644
--- a/superset-frontend/src/views/CRUD/types.ts
+++ b/superset-frontend/src/views/CRUD/types.ts
@@ -56,6 +56,6 @@ export type SavedQueryObject = {
   id: number;
   label: string;
   schema: string;
-  sql: string;
+  sql: string | null;
   sql_tables?: { catalog?: string; schema: string; table: string }[];
 };