Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Features
Bug Fixes
--------
* Reduce duplicated `--checkup` output.
* Handle errors generating completions on stored procedures.


Internal
Expand Down
13 changes: 9 additions & 4 deletions mycli/sqlexecute.py
Original file line number Diff line number Diff line change
Expand Up @@ -455,15 +455,20 @@ def functions(self) -> Generator[tuple[str, str], None, None]:
for row in cur:
yield row

def procedures(self) -> Generator[tuple[str, str], None, None]:
def procedures(self) -> Generator[tuple, None, None]:
"""Yields tuples of (procedure_name, )"""

assert isinstance(self.conn, Connection)
with self.conn.cursor() as cur:
_logger.debug("Procedures Query. sql: %r", self.procedures_query)
cur.execute(self.procedures_query % self.dbname)
for row in cur:
yield row
try:
cur.execute(self.procedures_query % self.dbname)
except pymysql.DatabaseError as e:
_logger.error('No procedure completions due to %r', e)
yield ()
else:
for row in cur:
yield row

def show_candidates(self) -> Generator[tuple, None, None]:
assert isinstance(self.conn, Connection)
Expand Down