[fix] Update watch command execution time to be correct for all iterations (#763)

changelog.md

@@ -3,9 +3,12 @@ Upcoming (TBD)
 
 Features
 --------
-
 * Add enum value completions for WHERE/HAVING clauses. (#790)
 
+Bug Fixes
+--------
+* Update watch query output to display the correct execution time on all iterations (#763).
+
 
 1.43.1 (2026/01/03)
 ==============

mycli/main.py

@@ -817,14 +817,30 @@ def show_suggestion_tip() -> bool:
         # mutating if any one of the component statements is mutating
         mutating = False
 
-        def output_res(res: Generator[tuple], start: float) -> None:
+        def output_res(results: Generator[tuple], start: float) -> None:
             nonlocal mutating
             result_count = 0
-            for title, cur, headers, status in res:
+            for result in results:
+                # unpack the results, including the command info if present
+                try:
+                    title, cur, headers, status, command = result
+                except ValueError:
+                    title, cur, headers, status = result
+                    command = None
+                except Exception as e:
+                    self.echo("An unexpected error has occurred.", err=True, fg="red")
+                    self.logger.error(f"Error unpacking results: {e}")
+                    sys.exit(1)
                 logger.debug("headers: %r", headers)
                 logger.debug("rows: %r", cur)
                 logger.debug("status: %r", status)
                 threshold = 1000
+                # 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:
+                        start += watch_seconds
                 if is_select(status) and cur and cur.rowcount > threshold:
                     self.echo(
                         f"The result set has more than {threshold} rows.",
@@ -1335,7 +1351,16 @@ def run_query(self, query: str, new_line: bool = True) -> None:
         assert self.sqlexecute is not None
         results = self.sqlexecute.run(query)
         for result in results:
-            title, cur, headers, status = result
+            # discard the optional command portion of the results
+            # tuple since it is not used here currently
+            try:
+                title, cur, headers, status, _ = result
+            except ValueError:
+                title, cur, headers, status = result
+            except Exception as e:
+                self.echo("An unexpected error has occurred.", err=True, fg="red")
+                self.logger.error(f"Error unpacking results: {e}")
+                sys.exit(1)
             self.main_formatter.query = query
             self.redirect_formatter.query = query
             output = self.format_output(

mycli/packages/special/iocommands.py

@@ -566,11 +566,15 @@ def watch_query(arg: str, **kwargs) -> Generator[tuple, None, None]:
             set_pager_enabled(False)
             for sql, title in sql_list:
                 cur.execute(sql)
+                command = {
+                    "name": "watch",
+                    "seconds": seconds,
+                }
                 if cur.description:
                     headers = [x[0] for x in cur.description]
-                    yield (title, cur, headers, None)
+                    yield (title, cur, headers, None, command)
                 else:
-                    yield (title, None, None, None)
+                    yield (title, None, None, None, command)
             sleep(seconds)
         except KeyboardInterrupt:
             # This prints the Ctrl-C character in its own line, which prevents