Merge pull request #6 from EncoreTechnologies/master

Generic query issues.

Author: nmaludy

CHANGES.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.1.2
+
+- Fixed issue with generic query where connection was being closed before query results were returned.
+  Contributed by Bradley Bishop (Encore Technologies)
+
 ## v0.1.1
 
 Pack bump to update files from master to a tagged release.

actions/generic_query.py

@@ -18,17 +18,19 @@ def run(self, **kwargs):
 
         query = self.get_del_arg('query', kwargs_dict)
 
+        return_result = None
         with self.db_connection(kwargs_dict) as conn:
             # Execute the query
             query_result = conn.execute(query)
 
-        return_result = {'affected_rows': query_result.rowcount}
-        if query_result.returns_rows:
-            return_result = []
-            all_results = query_result.fetchall()
-            for row in all_results:
-                # Rows are returned as tuples with keys.
-                # Convert that to a dictionary for return
-                return_result.append(self.row_to_dict(row))
+            # We need to execute these commands while connection is still open.
+            return_result = {'affected_rows': query_result.rowcount}
+            if query_result.returns_rows:
+                return_result = []
+                all_results = query_result.fetchall()
+                for row in all_results:
+                    # Rows are returned as tuples with keys.
+                    # Convert that to a dictionary for return
+                    return_result.append(self.row_to_dict(row))
 
         return return_result

pack.yaml

@@ -2,10 +2,10 @@
 ref: sql
 name: sql
 description: StackStorm Integration Pack for SQL Databases (Postgres, MySQL, etc)
-keywords: 
+keywords:
     - Postgres
-    -  MySQL
-    -  MsSQL
-version: 0.1.1
+    - MySQL
+    - MsSQL
+version: 0.1.2
 author: Encore Technologies
 email: [email protected]