Skip to content

[fix] Track watch iterations independently to ensure proper time tracking (#1565) #1580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scottnemes wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[fix] Track watch iterations independently to ensure proper time tracking (#1565) #1580

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions mycli/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ def show_suggestion_tip() -> bool:

def output_res(results: Generator[SQLResult], start: float) -> None:
nonlocal mutating
result_count = 0
result_count = watch_count = 0
for result in results:
title = result.title
cur = result.results
Expand All @@ -915,13 +915,15 @@ def output_res(results: 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":
if result_count > 0:
if watch_count > 0:
try:
watch_seconds = float(command["seconds"])
start += watch_seconds
except ValueError as e:
self.echo(f"Invalid watch sleep time provided ({e}).", err=True, fg="red")
sys.exit(1)
else:
watch_count += 1
if is_select(status) and isinstance(cur, Cursor) and cur.rowcount > threshold:
self.echo(
f"The result set has more than {threshold} rows.",
Expand Down