Merge pull request #37 from stackql/feature/updates

v3.6.1

Author: jeffreyaven

CHANGELOG.md

@@ -1,11 +1,11 @@
 # Changelog
 
-## v3.6.0 (2024-04-18)
+## v3.6.1 (2024-04-18)
 
 ### Updates
 
  * modified dict response for `executeStmt`
- * modified error response for `execute`
+ * modified error response for `execute`, should never return `None`
 
 ## v3.5.4 (2024-04-11)
 

README.rst

@@ -194,4 +194,4 @@ To publish the package to PyPI, run the following command:
 
 ::
 
-    twine upload --config-file .pypirc dist/pystackql-3.6.0.tar.gz
+    twine upload --config-file .pypirc dist/pystackql-3.6.1.tar.gz

docs/source/conf.py

@@ -26,7 +26,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '3.6.0'
+release = '3.6.1'
 
 
 # -- General configuration ---------------------------------------------------

pystackql/stackql.py

@@ -580,7 +580,10 @@ def execute(self, query, suppress_errors=True):
 						return pd.DataFrame([{"error": "Invalid JSON output"}])
 				else:  # Assume 'dict' output
 					try:
-						return json.loads(data)
+						retval = json.loads(data)
+						if retval is None:
+							return []
+						return retval
 					except ValueError:
 						return [{"error": f"Invalid JSON output : {data}"}]
 

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name='pystackql',
-    version='3.6.0',
+    version='3.6.1',
     description='A Python interface for StackQL',
     long_description=readme,
     author='Jeffrey Aven',

tests/pystackql_tests.py

@@ -193,9 +193,15 @@ def test_10b_executeStmt_with_pandas_output(self):
     @pystackql_test_setup()
     def test_11_execute_with_defaults(self):
         result = self.stackql.execute(google_query)
-        is_valid_dict = isinstance(result, list) and all(isinstance(item, dict) for item in result)
-        self.assertTrue(is_valid_dict, f"Result is not a valid dict: {result}")
-        print_test_result(f"Test execute with defaults\nRESULT: {result}", is_valid_dict)
+        is_valid_data_resp = isinstance(result, list) and all(isinstance(item, dict) for item in result)
+        self.assertTrue(is_valid_data_resp, f"Result is not valid: {result}")
+        print_test_result(f"Test execute with defaults\nRESULT: {result}", is_valid_data_resp)
+
+    def test_11a_execute_with_defaults_null_response(self):
+        result = self.stackql.execute("SELECT 1 WHERE 1=0")
+        is_valid_empty_resp = isinstance(result, list) and len(result) == 0
+        self.assertTrue(is_valid_empty_resp, f"Result is not a empty list: {result}")
+        print_test_result(f"Test execute with defaults (empty response)\nRESULT: {result}", is_valid_empty_resp)        
 
     @pystackql_test_setup(output='pandas')
     def test_12_execute_with_pandas_output(self):