From 23908edc284600b9c1ac0b835289b78d337f5a44 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Sun, 10 Feb 2019 12:41:16 +0100
Subject: [PATCH] Handle InterruptException in Athena query runnner like in the
 Presto query runner. (#3403)

---
 redash/query_runner/athena.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/redash/query_runner/athena.py b/redash/query_runner/athena.py
index 67d7e19fff..8d4f3dfcff 100644
--- a/redash/query_runner/athena.py
+++ b/redash/query_runner/athena.py
@@ -197,7 +197,7 @@ def run_query(self, query, user):
             }
             json_data = json_dumps(data, ignore_nan=True)
             error = None
-        except KeyboardInterrupt:
+        except (KeyboardInterrupt, InterruptException):
             if cursor.query_id:
                 cursor.cancel()
             error = "Query cancelled by user."