From c5c5c8be6d201e152d5aca28e13492092b91da2e Mon Sep 17 00:00:00 2001 From: Daniel King Date: Tue, 14 May 2019 10:12:20 -0300 Subject: [PATCH 1/2] Add try/catch to cursor.fetchall() I use SQL_QUERY_MUTATOR to add some sql for changing role before the main query. Some of them doesn't return data, and causes exceptions here. --- superset/models/core.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/superset/models/core.py b/superset/models/core.py index e16a234bfd723..bb26c6244b915 100644 --- a/superset/models/core.py +++ b/superset/models/core.py @@ -866,7 +866,10 @@ def _log_query(sql): for sql in sqls[:-1]: _log_query(sql) self.db_engine_spec.execute(cursor, sql) - cursor.fetchall() + try: + cursor.fetchall() + except: + None _log_query(sqls[-1]) self.db_engine_spec.execute(cursor, sqls[-1]) From 9eff28ba876556cb698af6e39dd3918cc1b11f30 Mon Sep 17 00:00:00 2001 From: Daniel King Date: Tue, 14 May 2019 16:25:54 -0300 Subject: [PATCH 2/2] Update core.py --- superset/models/core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/superset/models/core.py b/superset/models/core.py index bb26c6244b915..9b9d085b5e2a9 100644 --- a/superset/models/core.py +++ b/superset/models/core.py @@ -868,8 +868,8 @@ def _log_query(sql): self.db_engine_spec.execute(cursor, sql) try: cursor.fetchall() - except: - None + except BaseException: + pass _log_query(sqls[-1]) self.db_engine_spec.execute(cursor, sqls[-1])