From 21250bda835cbd807a29c44a39804a48ef9f6daa Mon Sep 17 00:00:00 2001 From: gjsstigter <30732869+gjsstigter@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:35:52 +0100 Subject: [PATCH 1/5] Patch the URL, where query is sometimes missing --- actions/lib/base_action.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/actions/lib/base_action.py b/actions/lib/base_action.py index 2c1df8c..5bf1027 100644 --- a/actions/lib/base_action.py +++ b/actions/lib/base_action.py @@ -118,6 +118,10 @@ def db_connection(self, kwargs_dict): default_driver = DEFAULT_KNOWN_DRIVER_CONNECTORS.get(connection['drivername'], None) if default_driver: connection['drivername'] = default_driver + + # Check if query is in de connection + if 'query' in connection: + connection['query'] = () # Format the connection string database_connection_string = URL(**connection) From c949739b0313e4cd297eed1958ef36641147520e Mon Sep 17 00:00:00 2001 From: gjsstigter <30732869+gjsstigter@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:36:25 +0100 Subject: [PATCH 2/5] Bump pack version to + 1 patch --- pack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack.yaml b/pack.yaml index e4707b0..1aa21db 100644 --- a/pack.yaml +++ b/pack.yaml @@ -6,7 +6,7 @@ keywords: - Postgres - MySQL - MsSQL -version: 1.1.0 +version: 1.1.1 author: Encore Technologies email: code@encore.tech python_versions: From 92ac4ea5f02fcc425227de532ba0e2424365d288 Mon Sep 17 00:00:00 2001 From: gjsstigter <30732869+gjsstigter@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:37:15 +0100 Subject: [PATCH 3/5] Update CHANGES.md --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 7ffc97d..49b063d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Change Log +## 1.1.1 + +* Resolve issue where query is sometimes missing + ## 1.1.0 * Update psycopg2 to 2.8 to support python 3.8 From 1f453747a3d523b9fc7028c592b2b93dfeba23ec Mon Sep 17 00:00:00 2001 From: gjsstigter <30732869+gjsstigter@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:41:45 +0100 Subject: [PATCH 4/5] Removed whitespace --- actions/lib/base_action.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/lib/base_action.py b/actions/lib/base_action.py index 5bf1027..f402100 100644 --- a/actions/lib/base_action.py +++ b/actions/lib/base_action.py @@ -118,7 +118,7 @@ def db_connection(self, kwargs_dict): default_driver = DEFAULT_KNOWN_DRIVER_CONNECTORS.get(connection['drivername'], None) if default_driver: connection['drivername'] = default_driver - + # Check if query is in de connection if 'query' in connection: connection['query'] = () From 60a565cd72dc522996d6cab0d203638f585b39f5 Mon Sep 17 00:00:00 2001 From: gjsstigter <30732869+gjsstigter@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:54:40 +0100 Subject: [PATCH 5/5] Update base_action.py --- actions/lib/base_action.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/lib/base_action.py b/actions/lib/base_action.py index f402100..5ba9499 100644 --- a/actions/lib/base_action.py +++ b/actions/lib/base_action.py @@ -120,7 +120,7 @@ def db_connection(self, kwargs_dict): connection['drivername'] = default_driver # Check if query is in de connection - if 'query' in connection: + if 'query' not in connection: connection['query'] = () # Format the connection string