diff --git a/py_dbcn/connectors/core/display.py b/py_dbcn/connectors/core/display.py index 273f1a52649490b9788d92db8afa3f899befaeae..3c7fb2c9248651ae5bae9281999e9e04dde026bc 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 1fdffc4dbf4a1a4d26a820948d91c2cedf326175..39962526586a8a714deb3f570890ac880b304bd7 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()