improved display format

Author: Friskes

pyproject.toml

@@ -112,6 +112,7 @@ warn_return_any = false  # [no-any-return]
 disable_error_code = [
     "operator",
     "assignment",
+    "union-attr",
 ]
 
 

src/capture_db_queries/printers.py

@@ -87,23 +87,23 @@ class PrinterSql(AbcPrinter):
 
     single_sql_template = (
         'Queries count: {queries_count}  |  '
-        'Execution time: {execution_time_per_iter:.3f}s  |  Vendor: {vendor}'
+        'Execution time: {execution_time_per_iter:.6f}s  |  Vendor: {vendor}\n'
     )
     several_sql_template = (
         'Tests count: {current_iteration}  |  '
         'Total queries count: {queries_count}  |  '
-        'Total execution time: {sum_all_execution_times:.2f}s  |  '
-        'Median time one test is: {median_all_execution_times:.3f}s  |  '
-        'Vendor: {vendor}'
+        'Total execution time: {sum_all_execution_times:.5f}s  |  '
+        'Median time one test is: {median_all_execution_times:.6f}s  |  '
+        'Vendor: {vendor}\n'
     )
     iteration_sql_template = (
         'Test №{current_iteration} | '
         'Queries count: {queries_count_per_iter} | '
-        'Execution time: {execution_time_per_iter:.2f}s'
+        'Execution time: {execution_time_per_iter:.6f}s'
     )
     assert_msg_template = '{queries_count} not less than or equal to {assert_q_count} queries'
 
-    sql_template = '№[{ordinal_num}] time=[{time:.3f}]{explain}\n{sql}'
+    sql_template = '№[{ordinal_num}] time=[{time:.6f}]{explain}\n{sql}'
 
     def print_single_sql(self, dto: SinglePrintDTO) -> str:
         return self.print_sql(
@@ -125,10 +125,14 @@ def print_several_sql(self, dto: SeveralPrintDTO) -> str:
                     'median_all_execution_times': dto.median_all_execution_times,
                 }
             )
+        if self.verbose and not self.advanced_verb and not self.queries:
+            print('\n')
         return self.print_sql(self.several_sql_template, dto.queries_log, **format_kwargs)
 
     def iteration_print(self, dto: IterationPrintDTO) -> None:
         if self.advanced_verb:
+            if dto.current_iteration == 1:
+                print('\n')
             print(
                 self.iteration_sql_template.format(
                     current_iteration=dto.current_iteration,
@@ -155,17 +159,18 @@ def format_sql(self, queries_log: QueriesLog) -> QueriesLog:
 
     def filter_queries(self, queries_log: QueriesLog) -> QueriesLog:
         if _EXCLUDE:
-            return deque(
-                query
-                for query in queries_log
-                if query['sql'].upper() not in self.EXCLUDE  # type: ignore[union-attr]
-            )
+            return deque(query for query in queries_log if query['sql'].upper() not in self.EXCLUDE)
         return queries_log
 
     def format_explain(self, queries_log: QueriesLog) -> QueriesLog:
         for query in queries_log:
             if 'explain' in query:
-                query['explain'] = f' explain=[{query["explain"]!r}]'
+                explain_count = len(query['explain'].split('\n'))
+                if explain_count > 1:
+                    explain = f' explain=[\n{query["explain"]}\n]'
+                else:
+                    explain = f' explain=[{query["explain"]}]'
+                query['explain'] = explain
         return queries_log
 
     def build_output_string(self, queries_log: QueriesLog) -> str:
@@ -178,4 +183,4 @@ def build_output_string(self, queries_log: QueriesLog) -> str:
             )
             for ordinal_num, query in enumerate(queries_log, start=1)
         )
-        return f'\n\n\n{formatted_queries}\n\n'
+        return f'\n\n{formatted_queries}\n\n'

src/capture_db_queries/wrappers.py

@@ -58,6 +58,7 @@ class ExplainExecutionWrapper(BaseExecutionWrapper):
 
     https://docs.djangoproject.com/en/5.1/topics/db/instrumentation/#connection-execute-wrapper
     https://docs.djangoproject.com/en/5.1/ref/models/querysets/#explain
+    from django_extensions.management.debug_cursor import monkey_patch_cursordebugwrapper
     """
 
     # Inspired from

tests/test_decorators.py

@@ -269,7 +269,7 @@ def test_capture_queries_loop(self, intercept_output: StringIO) -> None:
         output = intercept_output.getvalue()
 
         assert re.match(
-            f'Tests count: 100  |  Total queries count: 200  |  Total execution time: {ANYNUM}s  |  Median time one test is: {ANYNUM}s\n',  # noqa: E501
+            f'\n\nTests count: 100  |  Total queries count: 200  |  Total execution time: {ANYNUM}s  |  Median time one test is: {ANYNUM}s\n',  # noqa: E501
             output,
         ), 'incorrect output'
 
@@ -284,7 +284,7 @@ def _() -> None:
         output = intercept_output.getvalue()
 
         assert re.match(
-            f'Tests count: 100  |  Total queries count: 200  |  Total execution time: {ANYNUM}s  |  Median time one test is: {ANYNUM}s\n',  # noqa: E501
+            f'\n\nTests count: 100  |  Total queries count: 200  |  Total execution time: {ANYNUM}s  |  Median time one test is: {ANYNUM}s\n',  # noqa: E501
             output,
         ), 'incorrect output'
 

tests/test_printers.py

@@ -37,9 +37,9 @@ def setup_method(self, method: Callable[..., Any]) -> None:
             maxlen=9000,
         )
         self.queries_log_output = (
-            '\n\n\n№[1] time=[0.094]\nSELECT "tests_reporter"."id",\n       '
+            '\n\n№[1] time=[0.094000]\nSELECT "tests_reporter"."id",\n       '
             '"tests_reporter"."full_name"\n  FROM "tests_reporter"\n '
-            'WHERE "tests_reporter"."id" = %s\n\n\n№[2] time=[0.109]\nSELECT "tests_article"."id",\n       '  # noqa: E501
+            'WHERE "tests_reporter"."id" = %s\n\n\n№[2] time=[0.109000]\nSELECT "tests_article"."id",\n       '  # noqa: E501
             '"tests_article"."pub_date",\n       '
             '"tests_article"."headline",\n       '
             '"tests_article"."content",\n       '
@@ -48,11 +48,11 @@ def setup_method(self, method: Callable[..., Any]) -> None:
         )
 
         self.assert_msg = '4 not less than or equal to 2 queries'
-        self.iter_output = 'Test №1 | Queries count: 2 | Execution time: 0.74s\n'
-        self.single_output = 'Queries count: 2  |  Execution time: 0.743s  |  Vendor: fake_vendor\n'
+        self.iter_output = '\n\nTest №1 | Queries count: 2 | Execution time: 0.743167s\n'
+        self.single_output = 'Queries count: 2  |  Execution time: 0.743167s  |  Vendor: fake_vendor\n\n'
         self.several_output = (
-            'Tests count: 1  |  Total queries count: 2  |  '
-            'Total execution time: 1.49s  |  Median time one test is: 0.743s  |  Vendor: fake_vendor\n'
+            '\n\nTests count: 1  |  Total queries count: 2  |  Total execution time: 1.48633s  |  '
+            'Median time one test is: 0.743167s  |  Vendor: fake_vendor\n\n'
         )
 
         self.iter_dto = IterationPrintDTO(