mycli 2.28.1__tar.gz → 2.29.1__tar.gz

{mycli-2.28.1 → mycli-2.29.1}/.github/workflows/ci.yml

@@ -130,7 +130,7 @@ jobs:
         run: uv sync --extra dev,llm,dataframe -p ${{ matrix.python-version }}
 
       - name: Set up MySQL
-        uses: shogo82148/actions-setup-mysql@083ec148d28e62f2b24b8f4541693dfe1d50488d # v1.54.0
+        uses: shogo82148/actions-setup-mysql@1d4ebc60ba1227dd13fc7e6ba845bd3997928d75 # v1.54.2
         with:
           mysql-version: '9.7'
           root-password: root

{mycli-2.28.1 → mycli-2.29.1}/.github/workflows/publish.yml

@@ -147,7 +147,7 @@ jobs:
       run: uv sync --extra dev,llm,dataframe -p ${{ matrix.python-version }}
 
     - name: Set up MySQL
-      uses: shogo82148/actions-setup-mysql@083ec148d28e62f2b24b8f4541693dfe1d50488d # v1.54.0
+      uses: shogo82148/actions-setup-mysql@1d4ebc60ba1227dd13fc7e6ba845bd3997928d75 # v1.54.2
       with:
         mysql-version: '9.7'
         root-password: root

{mycli-2.28.1/mycli.egg-info → mycli-2.29.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mycli
-Version: 2.28.1
+Version: 2.29.1
 Summary: Rich MySQL terminal client with autocompletion, syntax highlighting, and dataframes
 Author: Mycli Core Team
 License-Expression: BSD-3-Clause
@@ -32,27 +32,28 @@ Requires-Dist: click~=8.5.0
 Requires-Dist: clickdc~=0.1.1
 Requires-Dist: cryptography~=50.0.1
 Requires-Dist: Pygments~=2.21.0
-Requires-Dist: prompt_toolkit<4.0.0,>=3.0.41
+Requires-Dist: prompt_toolkit~=3.0.53
 Requires-Dist: PyMySQL~=1.2.3
 Requires-Dist: sqlparse~=0.6.0
 Requires-Dist: sqlglot~=30.17.0
 Requires-Dist: sqlglotc~=30.17.0
 Requires-Dist: configobj~=5.0.9
 Requires-Dist: cli_helpers[styles]~=2.15.1
-Requires-Dist: wcwidth~=0.8.3
+Requires-Dist: wcwidth~=0.9.1
 Requires-Dist: pyperclip~=1.11.0
 Requires-Dist: pycryptodomex~=3.23.0
-Requires-Dist: rapidfuzz~=3.14.5
+Requires-Dist: rapidfuzz~=3.14.6
 Requires-Dist: keyring~=25.7.0
 Requires-Dist: jinja2~=3.1.6
-Requires-Dist: yaspin~=3.4.0
+Requires-Dist: yaspin~=3.5.1
 Provides-Extra: llm
-Requires-Dist: llm~=0.33; extra == "llm"
-Requires-Dist: setuptools==83.*; extra == "llm"
+Requires-Dist: llm~=0.36; extra == "llm"
+Requires-Dist: setuptools==84.*; extra == "llm"
 Requires-Dist: pip~=26.2.1; extra == "llm"
+Requires-Dist: httpx2~=2.13.1; extra == "llm"
 Provides-Extra: dataframe
-Requires-Dist: polars~=1.44.1; extra == "dataframe"
-Requires-Dist: altair~=6.2.2; extra == "dataframe"
+Requires-Dist: polars~=2.0.0; extra == "dataframe"
+Requires-Dist: altair~=6.3.0; extra == "dataframe"
 Requires-Dist: vl-convert-python~=1.9.0; extra == "dataframe"
 Provides-Extra: all
 Requires-Dist: mycli[dataframe,llm]; extra == "all"
@@ -67,6 +68,7 @@ Requires-Dist: pytest-random-order~=1.2.0; extra == "dev"
 Requires-Dist: tox~=4.35.0; extra == "dev"
 Requires-Dist: pdbpp~=0.11.7; extra == "dev"
 Requires-Dist: ruff~=0.16.5; extra == "dev"
+Requires-Dist: virtualenv~=21.7.12; extra == "dev"
 Dynamic: license-file
 
 # mycli

{mycli-2.28.1 → mycli-2.29.1}/changelog.md

@@ -1,3 +1,61 @@
+v2.29.1 (2026/10/10)
+==============
+
+Internal
+--------
+* Pin tox's ruff version to match `dev` dependency group.
+
+
+v2.29.0 (2026/10/10)
+==============
+
+Features
+--------
+* Add "redirecting" query state for shell-style redirects, `/once`, or `/pipe_once`.
+
+
+Bug Fixes
+--------
+* Fix exceptions when interrupting "streaming" unbuffered queries.
+* Fix exceptions when interrupting "executing" unbuffered queries.
+* Don't try to kill a remote thread when a query is already in the "rendering" state.
+* Don't try to kill a remote thread when a query is already in the "transforming" state.
+* Don't try to kill a remote thread when a query is already in the "redirecting" state.
+
+
+Documentation
+--------
+* Refine several items in the helpdoc.
+
+
+Internal
+--------
+* Fix typo in class name `LimitedQuotePreservingConfigObj`.
+* Update `polars` to v2.0.0.
+* Update `altair` to v6.3.0.
+
+
+v2.28.2 (2026/10/07)
+==============
+
+Bug Fixes
+--------
+* Let the `beep_after_seconds` slow query alert happen before paged output.
+* Allow comma-containing favorite queries in `~/.myclirc`.
+* Allow comma-containing init-commands in `~/.myclirc`.
+
+
+Internal
+--------
+* `pyproject.toml` readability tweak.
+* Force some transitive dependency updates, to pass `uv audit`.
+* No-op updates to pinned dependencies.
+* Upgrade `yaspin` dependency to v3.5.1.
+* Upgrade `wcwidth` dependency to v0.9.1, which includes a C11 core.
+* Upgrade `setuptools` optional dependency to v84.x.x.
+* Pin `prompt_toolkit` dependency to v3.0.53.
+
+
 v2.28.1 (2026/10/03)
 ==============
 

{mycli-2.28.1 → mycli-2.29.1}/doc/known_bugs.md

@@ -59,3 +59,8 @@ The prompt and toolbar are updated more often than needed, even with caching.
 
 When syntax highlighting with `pygmentize` is enabled for history search previews,
 the colors do not match the user's preferences in `~/.myclirc`.
+
+## favorite queries
+
+Favorite queries are triple-quoted on save in `~/.myclirc`.  If the text of the SQL
+in the favorite query contains both possible triple-quote delimiters, this fails.

{mycli-2.28.1 → mycli-2.29.1}/docker/resources/test_db-1.0.7.tar.gz

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
-name: mycli-2.28.1/docker/resources/test_db-1.0.7.tar.gz
+name: mycli-2.29.1/docker/resources/test_db-1.0.7.tar.gz
 size: 35607473 bytes
 sha256: c44c140f352f35d47fdb65df60f52b779ef552822fad6c4efcfa7b134c3faf84

{mycli-2.28.1 → mycli-2.29.1}/mycli/config.py

@@ -14,24 +14,86 @@ from Cryptodome.Cipher import AES
 logger = logging.getLogger(__name__)
 
 
-class LimiitedQuotePreservingConfigObj(ConfigObj):
+class SQLValuePreservingConfigObj(ConfigObj):
+    """When reading, quote SQL text on the fly which ConfigObj would otherwise interpret as a list."""
+
+    # Buglet: the use of _get_triple_quote() does not allow values which
+    # contain _both_ possible triple-quote delimiters to be read.
+    def _parse(self, infile: list[str]) -> None:
+        if not self.list_values or self.unrepr:
+            super()._parse(infile)
+            return
+
+        lines = infile.copy()
+        in_sql_stanza = False
+        index = 0
+        while index < len(lines):
+            line = lines[index]
+            if not line.strip() or line.lstrip().startswith('#'):
+                index += 1
+                continue
+            section = self._sectionmarker.match(line)
+            if section is not None:
+                _, opening, name, closing, _ = section.groups()
+                in_sql_stanza = opening.count('[') == closing.count(']') == 1 and (
+                    self._unquote(name) == 'favorite_queries' or 'init-commands' in name
+                )
+            else:
+                entry = self._keyword.match(line)
+                if entry is not None:
+                    indent, key, value = entry.groups()
+                    if value.startswith(('"""', "'''")):
+                        # Skip complete multiline values, including section-like SQL.
+                        try:
+                            _, _, index = self._multiline(value, lines, index, len(lines) - 1)
+                        except SyntaxError:
+                            break
+                    elif in_sql_stanza and not value.startswith(('"', "'")):
+                        match = self._nolistvalue.match(value)
+                        if match is not None:
+                            sql, comment = match.groups()
+                            lines[index] = f'{indent}{key} = {self._get_triple_quote(sql) % sql} {comment or ""}'
+            index += 1
+
+        super()._parse(lines)
+
+
+class TripleQuotedConfigValue(str):
+    """A value that must retain triple quoting when written."""
+
+    quote: str | None
+
+    def __new__(cls, value: str, quote: str | None = None) -> 'TripleQuotedConfigValue':
+        instance = super().__new__(cls, value)
+        instance.quote = quote
+        return instance
+
+
+class LimitedQuotePreservingConfigObj(ConfigObj):
     """Useful for saving individual items without modifying the whole file.
 
-    Triplequotes must be manually added for multiline values, and despite the
-    name of the class, could change from double to single in style.  If we
-    don't do this, multiline triplequoted strings lose their quotes entirely,
-    resulting in unreadable files.
+    Preserve existing quoting and add triple quotes for new multiline values.
     """
 
+    # Buglet: the use of _get_triple_quote() does not allow values which
+    # contain _both_ possible triple-quote delimiters to be saved.
     def __init__(self, *args, **kwargs):
         ConfigObj.__init__(self, *args, **kwargs)
 
     def _unquote(self, value):
         return value
 
-    def _quote(self, value, multiline=True):
+    def _multiline(self, value: str, infile: list[str], cur_index: int, maxline: int) -> tuple[str, str | None, int]:
+        parsed, comment, end_index = super()._multiline(value, infile, cur_index, maxline)
+        return TripleQuotedConfigValue(parsed, value[:3]), comment, end_index
+
+    def _quote(self, value: str, multiline: bool = True) -> str:
+        if isinstance(value, TripleQuotedConfigValue):
+            if value.quote is not None:
+                return f'{value.quote}{value}{value.quote}'
+            return self._get_triple_quote(value) % value
         if '\n' in value:
-            return f"'''{value}'''"
+            return self._get_triple_quote(value) % value
         return value
 
 
@@ -49,7 +111,7 @@ def read_config_file(
     list_values: bool = True,
     preserve_quotes: bool = False,
     raise_errors: bool = False,
-) -> ConfigObj | LimiitedQuotePreservingConfigObj | None:
+) -> ConfigObj | LimitedQuotePreservingConfigObj | None:
     """Read a config file.
 
     *list_values* set to `True` is the default behavior of ConfigObj.
@@ -68,9 +130,9 @@ def read_config_file(
 
     try:
         if preserve_quotes:
-            config = LimiitedQuotePreservingConfigObj(f, interpolation=False, encoding="utf8", list_values=False)
+            config = LimitedQuotePreservingConfigObj(f, interpolation=False, encoding="utf8", list_values=False)
         else:
-            config = ConfigObj(f, interpolation=False, encoding="utf8", list_values=list_values)
+            config = SQLValuePreservingConfigObj(f, interpolation=False, encoding="utf8", list_values=list_values)
     except ConfigObjError as e:
         if raise_errors:
             raise

{mycli-2.28.1 → mycli-2.29.1}/mycli/constants.py

@@ -58,6 +58,7 @@ TTY_ERASE_LINE = '\r\x1b[2K'
 
 
 class QueryState(enum.StrEnum):
+    REDIRECTING = 'redirecting'
     RENDERING = 'rendering'
     STREAMING = 'streaming'
     TRANSFORMING = 'transforming'

{mycli-2.28.1 → mycli-2.29.1}/mycli/main.py

@@ -66,13 +66,13 @@ class CliArgs:
         'host',
         type=str,
         envvar='MYSQL_HOST',
-        help='Host address of the database.',
+        help='Host address of the MySQL server.',
     )
     port: int | None = clickdc.option(
         '-P',
         type=int,
         envvar='MYSQL_TCP_PORT',
-        help='Port number to use for connection. Honors $MYSQL_TCP_PORT.',
+        help='Port number on the MySQL server.',
     )
     user: str | None = clickdc.option(
         '-u',
@@ -81,13 +81,14 @@ class CliArgs:
         'user',
         type=str,
         envvar='MYSQL_USER',
-        help='User name to connect to the database.',
+        help='User name to connect to the MySQL server.',
     )
     socket: str | None = clickdc.option(
         '-S',
         type=str,
         envvar='MYSQL_UNIX_SOCKET',
-        help='The socket file to use for connection.',
+        metavar='PATH',
+        help='Socket path to connect to the MySQL server.',
     )
     password: int | str | None = clickdc.option(
         '-p',
@@ -96,14 +97,14 @@ class CliArgs:
         'password',
         type=INT_OR_STRING_CLICK_TYPE,
         help=dedent(
-            """Password to connect to the database.
+            """Password to connect to the MySQL server..
             Use with a value to set the password at the CLI, or alone in the last position to request a prompt.
             """
         ),
     )
     password_file: str | None = clickdc.option(
         type=click.Path(),
-        help='File or FIFO path containing the password to connect to the db if not specified otherwise.',
+        help='File or FIFO path containing the password to connect to the server.',
     )
     vault_address: str | None = clickdc.option(
         type=str,
@@ -139,7 +140,7 @@ class CliArgs:
     )
     ssl_cert: str | None = clickdc.option(
         type=click.Path(exists=True),
-        help='X509 cert in PEM format.',
+        help='X509 certificate in PEM format.',
     )
     ssl_key: str | None = clickdc.option(
         type=click.Path(exists=True),
@@ -155,7 +156,7 @@ class CliArgs:
     )
     ssl_verify_server_cert: bool = clickdc.option(
         is_flag=True,
-        help=("""Verify server's "Common Name" in its cert against hostname used when connecting. This option is disabled by default."""),
+        help=("""Verify server's "Common Name" in its cert against hostname used when connecting."""),
     )
     verbose: int = clickdc.option(
         '-v',
@@ -201,11 +202,12 @@ class CliArgs:
     logfile: TextIOWrapper | None = clickdc.option(
         '-l',
         type=click.File(mode='a', encoding='utf-8'),
+        metavar='PATH',
         help='Log every query and its results to a file.',
     )
     checkpoint: str | None = clickdc.option(
         type=str,
-        help='In batch or --execute mode, log successful queries to a file, and skip them with --resume.',
+        help='In batch or --execute mode, log successful queries to a file, and skip them on replay with --resume.',
     )
     resume: bool = clickdc.option(
         '--resume',
@@ -214,7 +216,7 @@ class CliArgs:
     )
     myclirc: str = clickdc.option(
         type=click.Path(),
-        help='Location of myclirc file.',
+        help='Location of the myclirc configuration file.',
     )
     auto_vertical_output: bool = clickdc.option(
         is_flag=True,
@@ -225,7 +227,7 @@ class CliArgs:
         is_flag=True,
         default=None,
         clickdc=None,
-        help='Automatically show warnings after executing a SQL statement.',
+        help='Whether to show warnings after executing a SQL statement.',
     )
     table: bool = clickdc.option(
         '-t',
@@ -240,7 +242,7 @@ class CliArgs:
         '--warn/--no-warn',
         default=None,
         clickdc=None,
-        help='Warn before running a destructive query.',
+        help='Whether to warn before running a destructive query.',
     )
     warn_batch: bool = clickdc.option(
         is_flag=True,
@@ -264,11 +266,11 @@ class CliArgs:
     )
     init_command: str | None = clickdc.option(
         type=str,
-        help='SQL statement to execute after connecting.',
+        help='Initial SQL statement to execute when connecting.',
     )
     unbuffered: bool | None = clickdc.option(
         is_flag=True,
-        help='Instead of copying every row of data into a buffer, fetch rows as needed, to save memory.',
+        help='Instead of copying every row of data into a buffer, fetch rows as needed, saving memory.',
     )
     character_set: str | None = clickdc.option(
         '--charset',
@@ -279,6 +281,7 @@ class CliArgs:
     )
     batch: str | None = clickdc.option(
         type=str,
+        metavar='PATH',
         help='SQL script to execute in batch mode.',
     )
     # deprecated 2026-06-20
@@ -319,10 +322,11 @@ class CliArgs:
     )
     ssh_options: str | None = clickdc.option(
         type=str,
-        help='Extra CLI arguments for SSH with --ssh-jump, placed after options from myclirc.',
+        help='Extra CLI arguments for SSH with --ssh-jump, placed after options from ~/.myclirc.',
     )
     kubectl_resource: str | None = clickdc.option(
         type=str,
+        metavar='RESOURCE',
         help='Open a kubectl port-forward tunnel to RESOURCE and connect through it.',
     )
     kubectl_options: str | None = clickdc.option(
@@ -331,6 +335,7 @@ class CliArgs:
     )
     boundary_id: str | None = clickdc.option(
         type=str,
+        metavar='TARGET_ID',
         help='Open a HashiCorp Boundary tunnel to TARGET_ID and connect through it.',
     )
     checkup: bool = clickdc.option(