Merge pull request #39 from stackql/feature/updates

added rowsaffected to executeStmt

Author: jeffreyaven

.github/workflows/test.yaml

@@ -19,9 +19,10 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
+          # - "3.13"
         exclude:
-          - os: windows-latest
-            python-version: "3.12"
+          - os: macos-latest
+            python-version: "3.7"
     runs-on: ${{matrix.os}}
     name: 'Run Tests on ${{matrix.os}} with Python ${{matrix.python-version}}'
 
@@ -33,6 +34,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Upgrade pip
+        if: matrix.os == 'macos-latest'
+        run: python${{ matrix.python-version }} -m pip install --upgrade pip
+
       - name: Install dependencies from requirements.txt
         shell: bash
         run: |
@@ -42,27 +47,13 @@ jobs:
       - name: Install psycopg2 for non-Windows OS
         if: matrix.os != 'windows-latest'
         run: |
-          pip install psycopg2
+          pip install psycopg2-binary
 
       # Windows specific
-      # whl files downloaded from https://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg
-      - name: Install psycopg2-binary for Windows using local wheel
+      - name: Install psycopg2-binary for Windows
         if: matrix.os == 'windows-latest'
         run: |
-          # Determine the wheel filename based on the Python version
-          $wheelFilename = switch ("${{ matrix.python-version }}") {
-            "3.7" { "psycopg2-2.9.3-cp37-cp37m-win_amd64.whl" }
-            "3.8" { "psycopg2-2.9.3-cp38-cp38-win_amd64.whl" }
-            "3.9" { "psycopg2-2.9.3-cp39-cp39-win_amd64.whl" }
-            "3.10" { "psycopg2-2.9.3-cp310-cp310-win_amd64.whl" }
-            "3.11" { "psycopg2-2.9.3-cp311-cp311-win_amd64.whl" }
-          }
-
-          # Print the wheel filename for debugging
-          Write-Host "Determined wheel filename: $wheelFilename"
-
-          # Install the wheel
-          pip install ./tests/whls/$wheelFilename
+          pip install psycopg2-binary
         shell: powershell
       # End Windows specific
 

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v3.6.2 (2024-05-06)
+
+### Updates
+
+ * added `rowsaffected` to dict response for `executeStmt`
+
 ## v3.6.1 (2024-04-18)
 
 ### Updates

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.1.tar.gz
+    twine upload --config-file .pypirc dist/pystackql-3.6.2.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.1'
+release = '3.6.2'
 
 
 # -- General configuration ---------------------------------------------------

pystackql/stackql.py

@@ -514,7 +514,11 @@ def executeStmt(self, query):
 			elif self.output == 'csv':
 				return message
 			else:
-				return {'message': message}			
+				# count number of rows in the message
+				try:
+					return {'message': message, 'rowsaffected': message.count('\n')}
+				except Exception as e:
+					return {'message': message, 'rowsaffected': 0}							
 
 	def execute(self, query, suppress_errors=True):
 		"""

setup.py

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

tests/pystackql_tests.py

@@ -41,9 +41,6 @@ def setUpModule():
     print("downloading aws provider for tests...")
     res = PyStackQLTestsBase.stackql.executeStmt(registry_pull_aws_query)
     print(res)
-    print("downloading awscc provider for tests...")
-    res = PyStackQLTestsBase.stackql.executeStmt(registry_pull_awscc_query)
-    print(res)    
     print("downloading google provider for tests...")
     res = PyStackQLTestsBase.stackql.executeStmt(registry_pull_google_query)
     print(res)

tests/test_params.py

@@ -27,7 +27,6 @@ def get_custom_download_dir(platform_name):
 
 registry_pull_google_query = "REGISTRY PULL google"
 registry_pull_aws_query = "REGISTRY PULL aws"
-registry_pull_awscc_query = "REGISTRY PULL awscc"
 registry_pull_okta_query = "REGISTRY PULL okta"
 registry_pull_github_query = "REGISTRY PULL github"
 
@@ -44,7 +43,7 @@ def registry_pull_resp_pattern(provider):
 
 aws_query = f"""
 SELECT 
-SPLIT_PART(CreationDate, '-', 1) as year, count(*) as num_buckets FROM aws.s3.buckets
+SPLIT_PART(CreationDate, '-', 1) as year, count(*) as num_buckets FROM aws.s3_api.buckets
 WHERE region = 'us-east-1'
 GROUP BY year
 """
@@ -54,7 +53,7 @@ def registry_pull_resp_pattern(provider):
 async_queries = [
     f"""
     SELECT region, COUNT(*) as num_functions
-    FROM awscc.lambda.functions
+    FROM aws.lambda.functions
     WHERE region = '{region}'
     """
     for region in regions