Thanks to visit codestin.com
Credit goes to github.com

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
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ Features
* Add many CLI flags to startup tips.


Bug Fixes
---------
* Correct parameterization for completion queries.


Internal
--------
* Prefer `yield from` over yielding in a loop.
Expand Down
12 changes: 6 additions & 6 deletions mycli/sqlexecute.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,17 @@ class SQLExecute:
users_query = """SELECT CONCAT("'", user, "'@'",host,"'") FROM mysql.user"""

functions_query = '''SELECT ROUTINE_NAME FROM INFORMATION_SCHEMA.ROUTINES
WHERE ROUTINE_TYPE="FUNCTION" AND ROUTINE_SCHEMA = "%s"'''
WHERE ROUTINE_TYPE="FUNCTION" AND ROUTINE_SCHEMA = %s'''

procedures_query = '''SELECT ROUTINE_NAME FROM INFORMATION_SCHEMA.ROUTINES
WHERE ROUTINE_TYPE="PROCEDURE" AND ROUTINE_SCHEMA = %s'''

table_columns_query = """select TABLE_NAME, COLUMN_NAME from information_schema.columns
where table_schema = '%s'
where table_schema = %s
order by table_name,ordinal_position"""

enum_values_query = """select TABLE_NAME, COLUMN_NAME, COLUMN_TYPE from information_schema.columns
where table_schema = '%s' and data_type = 'enum'
where table_schema = %s and data_type = 'enum'
order by table_name,ordinal_position"""

now_query = """SELECT NOW()"""
Expand Down Expand Up @@ -421,15 +421,15 @@ def table_columns(self) -> Generator[tuple[str, str], None, None]:
assert isinstance(self.conn, Connection)
with self.conn.cursor() as cur:
_logger.debug("Columns Query. sql: %r", self.table_columns_query)
cur.execute(self.table_columns_query % self.dbname)
cur.execute(self.table_columns_query, (self.dbname,))
yield from cur

def enum_values(self) -> Generator[tuple[str, str, list[str]], None, None]:
"""Yields (table name, column name, enum values) tuples"""
assert isinstance(self.conn, Connection)
with self.conn.cursor() as cur:
_logger.debug("Enum Values Query. sql: %r", self.enum_values_query)
cur.execute(self.enum_values_query % self.dbname)
cur.execute(self.enum_values_query, (self.dbname,))
for table_name, column_name, column_type in cur:
values = self._parse_enum_values(column_type)
if values:
Expand All @@ -448,7 +448,7 @@ def functions(self) -> Generator[tuple[str, str], None, None]:
assert isinstance(self.conn, Connection)
with self.conn.cursor() as cur:
_logger.debug("Functions Query. sql: %r", self.functions_query)
cur.execute(self.functions_query % self.dbname)
cur.execute(self.functions_query, (self.dbname,))
yield from cur

def procedures(self) -> Generator[tuple, None, None]:
Expand Down