From c816a8cb016c92d4266d69ce653b393ee45b4d41 Mon Sep 17 00:00:00 2001
From: Brandon Rodriguez <brodriguez8774@gmail.com>
Date: Fri, 9 Jun 2023 00:33:19 -0400
Subject: [PATCH] Update query display to include data when possible
---
py_dbcn/connectors/core/display.py | 8 ++++++--
py_dbcn/connectors/core/query.py | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/py_dbcn/connectors/core/display.py b/py_dbcn/connectors/core/display.py
index 273f1a5..3c7fb2c 100644
--- a/py_dbcn/connectors/core/display.py
+++ b/py_dbcn/connectors/core/display.py
@@ -59,13 +59,17 @@ class BaseDisplay:
# Return max of all.
return max(max_count, len(curr_database))
- def query(self, query_str):
+ def query(self, query_str, data=None):
"""Formats query output for display."""
# Remove any whitespace created from standard code indentations.
query_str = textwrap.dedent(query_str).strip()
+ data_str = ''
+ if data is not None:
+ data_str = '\nWith data of {0}'.format(data)
+
# Log results.
- logger.query('{0}{1}{2}'.format(OUTPUT_QUERY, query_str, OUTPUT_RESET))
+ logger.query('{0}{1}{2}{3}'.format(OUTPUT_QUERY, query_str, data_str, OUTPUT_RESET))
def results(self, result_str):
"""Formats result output for display."""
diff --git a/py_dbcn/connectors/core/query.py b/py_dbcn/connectors/core/query.py
index 1fdffc4..3996252 100644
--- a/py_dbcn/connectors/core/query.py
+++ b/py_dbcn/connectors/core/query.py
@@ -38,7 +38,7 @@ class BaseQuery:
:param display_query: Optional bool indicating if query should output to console or not. Defaults to True.
"""
if display_query:
- self._base.display.query(query)
+ self._base.display.query(query, data=data)
if isinstance(data, str):
data = [data]
@@ -73,7 +73,7 @@ class BaseQuery:
:param display_query: Optional bool indicating if query should output to console or not. Defaults to True.
"""
if display_query:
- self._base.display.query(query)
+ self._base.display.query(query, data=data)
# Create connection and execute query.
cursor = self._base._connection.cursor()
--
GitLab