Merge pull request #10 from jampp/FS-1668-fix-pydruid-error-handling

FS:1668: fix pydruid error handling

Author: chpedersen

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Change Log
 
+### 0.9.1j (Unreleased)
+- [FS-1668](https://jampphq.atlassian.net/browse/FS-1668) Fix error handling ('KeyError: errorClass' raised)
+
 ### 0.9.0j (Unreleased)
 - [#7](https://github.com/jampp/pydruid/pull/7) Add support for async SQL API
 

pydruid/db/api.py

@@ -370,6 +370,8 @@ def _handle_http_error(response):
                 "errorClass": "Unknown",
                 "errorMessage": response.text,
             }
+        if "errorClass" not in payload and "errorCode" in payload:
+            payload["errorClass"] = payload["errorCode"]
         msg = "{error} ({errorClass}): {errorMessage}".format(**payload)
         raise exceptions.ProgrammingError(msg)
 

requirements.txt

@@ -25,7 +25,7 @@ six==1.16.0
 sniffio==1.2.0
 sqlalchemy==1.4.15
 tabulate==0.8.9
-tornado==5.1.1
+tornado==6.5.1
 typing-extensions==4.3.0
 ujson==2.0.3
 urllib3==1.26.4

setup.py

@@ -16,7 +16,7 @@
 
 setup(
     name="pydruid",
-    version="0.9.0+j",
+    version="0.9.1+j",
     author="Druid Developers",
     author_email="[email protected]",
     packages=find_packages(),

tests/db/test_cursor.py

@@ -10,7 +10,7 @@
 from requests.models import Response
 
 from pydruid.db.api import apply_parameters, Cursor
-
+from pydruid.db import exceptions
 
 class CursorTestSuite(unittest.TestCase):
     @patch("requests.post")
@@ -28,6 +28,31 @@ def test_execute(self, requests_post_mock):
         expected = [Row(name="alice"), Row(name="bob"), Row(name="charlie")]
         self.assertEqual(result, expected)
 
+    @patch("requests.post")
+    def test_execute_error(self, requests_post_mock):
+        response = Response()
+        response.status_code = 500
+        response.raw = BytesIO(b'{"error": "Internal Server Error", "errorClass": "some error class", "errorMessage": "some error message"}')
+        requests_post_mock.return_value = response
+
+        cursor = Cursor("http://example.com/")
+        with self.assertRaises(exceptions.ProgrammingError) as cm:
+            cursor.execute("SELECT * FROM table")
+        self.assertEqual(cm.exception.args[0], "Internal Server Error (some error class): some error message")
+
+    @patch("requests.post")
+    def test_execute_error_no_errorClass(self, requests_post_mock):
+        response = Response()
+        response.status_code = 500
+        response.raw = BytesIO(b'{"error": "druidException", "errorCode": "invalidInput", "persona": "USER", "category": "INVALID_INPUT", "errorMessage": "Aggregate expressions cannot be nested (line [1], column [215])", "context": {"sourceType": "sql", "line": "1", "column": "215", "endLine": "1", "endColumn": "1691"}}')
+        requests_post_mock.return_value = response
+
+        cursor = Cursor("http://example.com/")
+        with self.assertRaises(exceptions.ProgrammingError) as cm:
+            cursor.execute("SELECT * FROM table")
+        self.assertEqual(cm.exception.args[0], "druidException (invalidInput): Aggregate expressions cannot be nested (line [1], column [215])")
+
+
     @patch("requests.post")
     def test_execute_empty_result(self, requests_post_mock):
         response = Response()