From 1889a7b8911ae75c25e818548d7fb59e4e26256a Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sun, 18 Aug 2024 14:57:03 -0500 Subject: [PATCH] Refactor to make methods simpler --- src/pgwui_sql/views/sql.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/pgwui_sql/views/sql.py b/src/pgwui_sql/views/sql.py index 6bf005c..2d1eda5 100644 --- a/src/pgwui_sql/views/sql.py +++ b/src/pgwui_sql/views/sql.py @@ -148,6 +148,14 @@ class SQLHandler(pgwui_core.core.SessionDBHandler): return response + def get_result_rows(self, cur, sql_results): + first = True + while (row := cur.fetchone()) is not None: + if first: + sql_results.append(SQLResult().build_new_result_row(cur, True)) + first = False + sql_results.append(SQLResult().build_data_row(row)) + def cleanup(self): ''' Execute a series of SQL statements. @@ -162,13 +170,7 @@ class SQLHandler(pgwui_core.core.SessionDBHandler): while nextset is True: have_rows = cur.rownumber is not None if have_rows: - first = True - while (row := cur.fetchone()) is not None: - if first: - sql_results.append(SQLResult().build_new_result_row( - cur, have_rows)) - first = False - sql_results.append(SQLResult().build_data_row(row)) + self.get_result_rows(cur, sql_results) else: sql_results.append(SQLResult().build_new_result_row( cur, have_rows)) -- 2.34.1