[chore] Rework SQLResult dataclass to not require all fields when used in for loops

mycli/main.py

@@ -816,10 +816,12 @@ def show_suggestion_tip() -> bool:
         # mutating if any one of the component statements is mutating
         mutating = False
 
-        def output_res(res: Generator[SQLResult], start: float) -> None:
+        def output_res(results: Generator[SQLResult], start: float) -> None:
             nonlocal mutating
             result_count = 0
-            for title, cur, headers, status, command in res:
+            for result in results:
+                title, cur, headers, status = result.get_output()
+                command = result.command
                 logger.debug("title: %r", title)
                 logger.debug("headers: %r", headers)
                 logger.debug("rows: %r", cur)
@@ -828,8 +830,12 @@ def output_res(res: Generator[SQLResult], start: float) -> None:
                 # If this is a watch query, offset the start time on the 2nd+ iteration
                 # to account for the sleep duration
                 if command is not None and command["name"] == "watch":
-                    watch_seconds = float(command["seconds"])
                     if result_count > 0:
+                        try:
+                            watch_seconds = float(command["seconds"])
+                        except ValueError as e:
+                            self.echo(f"Invalid watch sleep time provided ({e}).", err=True, fg="red")
+                            sys.exit(1)
                         start += watch_seconds
                 if is_select(status) and cur and cur.rowcount > threshold:
                     self.echo(
@@ -880,7 +886,8 @@ def output_res(res: Generator[SQLResult], start: float) -> None:
                 # get and display warnings if enabled
                 if self.show_warnings and isinstance(cur, Cursor) and cur.warning_count > 0:
                     warnings = sqlexecute.run("SHOW WARNINGS")
-                    for title, cur, headers, status, _command in warnings:
+                    for warning in warnings:
+                        title, cur, headers, status = warning.get_output()
                         formatted = self.format_output(
                             title,
                             cur,
@@ -1339,8 +1346,9 @@ def get_prompt(self, string: str) -> str:
     def run_query(self, query: str, new_line: bool = True) -> None:
         """Runs *query*."""
         assert self.sqlexecute is not None
-        res = self.sqlexecute.run(query)
-        for title, cur, headers, _status, _command in res:
+        results = self.sqlexecute.run(query)
+        for result in results:
+            title, cur, headers, _status = result.get_output()
             self.main_formatter.query = query
             self.redirect_formatter.query = query
             output = self.format_output(
@@ -1357,7 +1365,8 @@ def run_query(self, query: str, new_line: bool = True) -> None:
             # get and display warnings if enabled
             if self.show_warnings and isinstance(cur, Cursor) and cur.warning_count > 0:
                 warnings = self.sqlexecute.run("SHOW WARNINGS")
-                for title, cur, headers, _status, _command in warnings:
+                for warning in warnings:
+                    title, cur, headers, _status = warning.get_output()
                     output = self.format_output(
                         title,
                         cur,

mycli/packages/special/iocommands.py

@@ -582,7 +582,7 @@ def watch_query(arg: str, **kwargs) -> Generator[SQLResult, None, None]:
                 cur.execute(sql)
                 command = {
                     "name": "watch",
-                    "seconds": seconds,
+                    "seconds": str(seconds),
                 }
                 if cur.description:
                     headers = [x[0] for x in cur.description]

mycli/packages/sqlresult.py

@@ -9,10 +9,13 @@ class SQLResult:
     results: Cursor | list[tuple] | None = None
     headers: list[str] | str | None = None
     status: str | None = None
-    command: dict[str, object] | None = None
+    command: dict[str, str] | None = None
+
+    def get_output(self):
+        return self.title, self.results, self.headers, self.status
 
     def __iter__(self):
-        return iter((self.title, self.results, self.headers, self.status, self.command))
+        return self
 
     def __str__(self):
         return f"{self.title}, {self.results}, {self.headers}, {self.status}, {self.command}"

mycli/sqlexecute.py

@@ -489,8 +489,9 @@ def reset_connection_id(self) -> None:
         # Remember current connection id
         _logger.debug("Get current connection id")
         try:
-            res = self.run("select connection_id()")
-            for _title, cur, _headers, _status, _command in res:
+            results = self.run("select connection_id()")
+            for result in results:
+                _title, cur, _headers, _status = result.get_output()
                 self.connection_id = cur.fetchone()[0]
         except Exception as e:
             # See #1054

test/utils.py

@@ -47,13 +47,19 @@ def create_db(dbname):
 
 def run(executor, sql, rows_as_list=True):
     """Return string output for the sql to be run."""
-    result = []
-
-    for title, rows, headers, status, _command in executor.run(sql):
+    results = []
+
+    for result in executor.run(sql):
+        (
+            title,
+            rows,
+            headers,
+            status,
+        ) = result.get_output()
         rows = list(rows) if (rows_as_list and rows) else rows
-        result.append({"title": title, "rows": rows, "headers": headers, "status": status})
+        results.append({"title": title, "rows": rows, "headers": headers, "status": status})
 
-    return result
+    return results
 
 
 def set_expanded_output(is_expanded):