mycli 2.30.3__tar.gz → 2.31.0__tar.gz

{mycli-2.30.3 → mycli-2.31.0}/.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@fb8ae72ad9f2f8244e594d6d48a981e975aee78e # v1.56.1
+        uses: shogo82148/actions-setup-mysql@13a38f2af408e58a0c80168fc620a63a15357339 # v1.56.2
         with:
           mysql-version: '9.7'
           root-password: root
@@ -166,7 +166,7 @@ jobs:
         run: |
           mkdir -p /root/mycli
 
-      - uses: ubuntu/wsl/.github/actions/wsl-checkout@e7fb23c6481945b25b974b6cf7a5c7f4550b6cf8
+      - uses: ubuntu/wsl/.github/actions/wsl-checkout@c1984d32aea99733825250f86df5f9f6d7e284c3
         with:
           distro: Ubuntu-26.04
           working-dir: /root/mycli

{mycli-2.30.3 → mycli-2.31.0}/.github/workflows/publish.yml

@@ -158,7 +158,7 @@ jobs:
       run: uv sync --extra dev,llm,dataframe --python ${{ matrix.python-version }}
 
     - name: Set up MySQL
-      uses: shogo82148/actions-setup-mysql@fb8ae72ad9f2f8244e594d6d48a981e975aee78e # v1.56.1
+      uses: shogo82148/actions-setup-mysql@13a38f2af408e58a0c80168fc620a63a15357339 # v1.56.2
       with:
         mysql-version: '9.7'
         root-password: root
@@ -195,7 +195,7 @@ jobs:
       run: |
         mkdir -p /root/mycli
 
-    - uses: ubuntu/wsl/.github/actions/wsl-checkout@e7fb23c6481945b25b974b6cf7a5c7f4550b6cf8
+    - uses: ubuntu/wsl/.github/actions/wsl-checkout@c1984d32aea99733825250f86df5f9f6d7e284c3
       with:
         distro: Ubuntu-26.04
         working-dir: /root/mycli
@@ -309,7 +309,7 @@ jobs:
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
     - name: Log in to the Container registry
-      uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0
+      uses: docker/login-action@8aa5831fb8d48d8f76594c7ddde61ae58019f550 # v4.8.0
       with:
         registry: ${{ env.REGISTRY }}
         username: ${{ github.actor }}

{mycli-2.30.3/mycli.egg-info → mycli-2.31.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mycli
-Version: 2.30.3
+Version: 2.31.0
 Summary: Rich MySQL terminal client with autocompletion, syntax highlighting, and dataframes
 Author: Mycli Core Team
 License-Expression: BSD-3-Clause
@@ -33,8 +33,8 @@ Requires-Dist: clickdc~=0.1.1
 Requires-Dist: cryptography~=50.0.2
 Requires-Dist: Pygments~=2.21.0
 Requires-Dist: prompt_toolkit~=3.0.53
-Requires-Dist: PyMySQL~=1.2.3
-Requires-Dist: sqlparse~=0.6.0
+Requires-Dist: PyMySQL~=1.2.4
+Requires-Dist: sqlparse~=0.6.1
 Requires-Dist: sqlglot~=30.25.0
 Requires-Dist: sqlglotc~=30.25.0
 Requires-Dist: configobj~=5.0.9
@@ -48,9 +48,9 @@ Requires-Dist: jinja2~=3.1.6
 Requires-Dist: markupsafe~=3.0.4
 Requires-Dist: yaspin~=3.5.1
 Provides-Extra: llm
-Requires-Dist: llm~=0.36; extra == "llm"
+Requires-Dist: llm~=0.37.1; extra == "llm"
 Requires-Dist: setuptools==84.*; extra == "llm"
-Requires-Dist: pip~=26.2.2; extra == "llm"
+Requires-Dist: pip~=26.3; extra == "llm"
 Provides-Extra: dataframe
 Requires-Dist: polars~=2.1.0; extra == "dataframe"
 Requires-Dist: altair~=6.3.0; extra == "dataframe"
@@ -59,8 +59,8 @@ Provides-Extra: all
 Requires-Dist: mycli[dataframe,llm]; extra == "all"
 Provides-Extra: dev
 Requires-Dist: behave~=1.3.3; extra == "dev"
-Requires-Dist: coverage~=7.17.0; extra == "dev"
-Requires-Dist: mypy~=2.4.0; extra == "dev"
+Requires-Dist: coverage~=7.17.2; extra == "dev"
+Requires-Dist: mypy~=2.4.1; extra == "dev"
 Requires-Dist: pexpect~=4.9.0; extra == "dev"
 Requires-Dist: pytest~=9.2.0; extra == "dev"
 Requires-Dist: pytest-cov~=7.1.0; extra == "dev"

{mycli-2.30.3 → mycli-2.31.0}/changelog.md

@@ -1,3 +1,43 @@
+v2.31.0 (2026/11/14)
+==============
+
+Features
+--------
+* Bracket IPv6 literals in prompt strings.
+
+
+Bug Fixes
+--------
+* Read `/source` files and the `\e` editor file as UTF-8 instead of the locale encoding, so non-ASCII SQL no longer fails or is mis-decoded under non-UTF-8 locales.
+* Open the audit log and the `\T`/`\o` output files as UTF-8, so non-ASCII output no longer fails under non-UTF-8 locales.
+* Bracket IPv6 hosts in the DSN shown and saved by `\dsn`, so a saved alias for `::1` can be used to connect again.
+* Support `DELIMITER` in batch input (`mycli < file.sql`, `--batch`), so dumps with triggers or routines restore.
+* Read `--batch` files and read and write `--checkpoint` files as UTF-8, fixing `--resume` and non-ASCII batch files on Windows.
+* Terminate `use`, `source`, `\u` and `\.` at newline in batch input, as the vendor client does.
+
+
+v2.30.4 (2026/11/12)
+==============
+
+Bug Fixes
+--------
+* Decode percent-encoded database names in DSN URIs, including aliases with environment variable expansion enabled.
+
+
+Internal
+--------
+* Improve test coverage for `packages/special_commands/main.py`.
+* Improve test coverage for `packages/special_commands/io_commands.py`.
+* Improve test coverage for `packages/execution/sql_execute.py`.
+* Improve test coverage for `packages/tabular_output/sql_format.py`.
+* Update `pymysql` dependency to v1.2.4.
+* Update `sqlparse` dependency to v0.6.1.
+* Update `llm` dependency to v0.37.1.
+* Update `pip` dependency to v26.3.
+* Update `coverage` dev dependency to v7.17.2.
+* Update `mypy` dev dependency to v2.4.1.
+
+
 v2.30.3 (2026/11/05)
 ==============
 

{mycli-2.30.3 → mycli-2.31.0}/docker/resources/test_db-1.0.7.tar.gz

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

{mycli-2.30.3 → mycli-2.31.0}/mycli/AUTHORS.txt

@@ -122,6 +122,10 @@ Contributors:
   * Chris Burr
   * Wei-Lun Li
   * Shaurya Kesarwani
+  * Alex Castillo
+  * Karim Masmoudi
+  * Jay Hemnani
+  * Alpenj
 
 
 Created by:

{mycli-2.30.3 → mycli-2.31.0}/mycli/cli_runner.py

@@ -117,7 +117,7 @@ def expand_dsn_alias_env_vars(
         expand_dsn_alias_env_var(unquote(password) if password is not None else None, alias_name),
         expand_dsn_alias_env_var(host, alias_name),
         port_number,
-        expand_dsn_alias_env_var(uri.path[1:], alias_name) or '',
+        expand_dsn_alias_env_var(unquote(uri.path[1:]), alias_name) or '',
         params,
     )
 
@@ -310,7 +310,7 @@ def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory | None
             dsn_password = unquote(uri.password) if uri.password is not None else None
             dsn_host = uri.hostname
             dsn_port = uri.port
-            dsn_database = uri.path[1:]
+            dsn_database = unquote(uri.path[1:])
             dsn_params = parse_qs(uri.query, keep_blank_values=True) if uri.query else {}
 
         if not database:

{mycli-2.30.3 → mycli-2.31.0}/mycli/client.py

@@ -180,7 +180,7 @@ class MyCli(AppStateMixin, OutputMixin, ClientCommandsMixin, ClientConnectionMix
         # audit log
         if self.logfile is None and "audit_log" in c["main"]:
             try:
-                self.logfile = open(os.path.expanduser(c["main"]["audit_log"]), "a")
+                self.logfile = open(os.path.expanduser(c["main"]["audit_log"]), "a", encoding="utf-8")
             except (IOError, OSError):
                 self.echo("Error: Unable to open the audit log file. Your queries will not be logged.", err=True, fg="red")
                 self.logfile = False

{mycli-2.30.3 → mycli-2.31.0}/mycli/client_commands.py

@@ -305,7 +305,7 @@ class ClientCommandsMixin:
             return
 
         try:
-            file_h = open(os.path.expanduser(filename))
+            file_h = open(os.path.expanduser(filename), encoding='utf-8')
         except OSError as error:
             yield SQLResult(status=str(error))
             return

{mycli-2.30.3 → mycli-2.31.0}/mycli/client_connection.py

@@ -10,7 +10,7 @@ import click
 import keyring
 import pymysql
 from pymysql.constants.CR import CR_SERVER_LOST
-from pymysql.constants.ER import ACCESS_DENIED_ERROR, HANDSHAKE_ERROR
+from pymysql.constants.ER import ACCESS_DENIED_ERROR, HANDSHAKE_ERROR, MUST_CHANGE_PASSWORD_LOGIN
 
 from mycli.compat import WIN
 from mycli.config import str_to_bool
@@ -19,7 +19,6 @@ from mycli.constants import (
     DEFAULT_HOST,
     DEFAULT_PORT,
     EMPTY_PASSWORD_FLAG_SENTINEL,
-    ER_MUST_CHANGE_PASSWORD_LOGIN,
 )
 from mycli.packages.credentials.password_sources import PasswordCandidates
 from mycli.packages.execution.sql_execute import SQLExecute
@@ -433,7 +432,7 @@ class ClientConnectionMixin:
                         keyring_retrieved_cleanly=keyring_retrieved_cleanly,
                         keyring_save_eligible=keyring_save_eligible,
                     )
-                elif e1.args[0] == ER_MUST_CHANGE_PASSWORD_LOGIN:
+                elif e1.args[0] == MUST_CHANGE_PASSWORD_LOGIN:
                     self.echo(
                         "Your password has expired and the server rejected the connection.",
                         err=True,

{mycli-2.30.3 → mycli-2.31.0}/mycli/client_query.py

@@ -97,7 +97,7 @@ class ClientQueryMixin:
         assert self.sql_execute is not None
         self.log_query(query)
         if checkpoint and not self.checkpoint:
-            self.checkpoint = click.open_file(checkpoint, mode='a')
+            self.checkpoint = click.open_file(checkpoint, mode='a', encoding='utf-8')
         results = self.sql_execute.run(query)
         for result in results:
             self.main_formatter.query = query

{mycli-2.30.3 → mycli-2.31.0}/mycli/constants.py

@@ -38,10 +38,6 @@ TEST_DATABASE = 'mycli_test_db'
 DEFAULT_WIDTH = 80
 DEFAULT_HEIGHT = 25
 
-# MySQL error codes not available in pymysql.constants.ER
-ER_MUST_CHANGE_PASSWORD_LOGIN = 1862
-ER_MUST_CHANGE_PASSWORD = 1820
-
 EMPTY_PASSWORD_FLAG_SENTINEL = -1
 DEFAULT_PROMPT = "\\t \\u@\\h:\\d> "
 

{mycli-2.30.3 → mycli-2.31.0}/mycli/main_modes/batch.py

@@ -25,6 +25,11 @@ class CheckpointReplayError(Exception):
     pass
 
 
+def batch_file_encoding(batch_path: str) -> str | None:
+    # Leave standard input to click, which picks the console encoding.
+    return None if batch_path == '-' else 'utf-8'
+
+
 def replay_checkpoint_file(
     batch_path: str,
     checkpoint_path: str | None,
@@ -48,7 +53,10 @@ def replay_checkpoint_file(
         spinner = yaspin(text='replaying checkpoint', side='right', stream=sys.stderr)
         spinner.start()
     try:
-        with click.open_file(batch_path) as batch_h, click.open_file(checkpoint_path, mode='r', encoding='utf-8') as checkpoint_h:
+        with (
+            click.open_file(batch_path, encoding=batch_file_encoding(batch_path)) as batch_h,
+            click.open_file(checkpoint_path, mode='r', encoding='utf-8') as checkpoint_h,
+        ):
             try:
                 batch_gen = statements_from_filehandle(batch_h)
             except ValueError as e:
@@ -140,13 +148,13 @@ def main_batch_with_progress_bar(mycli: 'MyCli', cli_args: 'CliArgs') -> int:
         return 1
     try:
         completed_statement_count = replay_checkpoint_file(cli_args.batch, cli_args.checkpoint, cli_args.resume, progress=True)
-        batch_count_h = click.open_file(cli_args.batch)
+        batch_count_h = click.open_file(cli_args.batch, encoding=batch_file_encoding(cli_args.batch))
         with yaspin(text='validating batch    ', side='right', stream=sys.stderr) as spinner:
             for _statement, _counter in statements_from_filehandle(batch_count_h):
                 goal_statements += 1
             spinner.ok('✔')
         batch_count_h.close()
-        batch_h = click.open_file(cli_args.batch)
+        batch_h = click.open_file(cli_args.batch, encoding=batch_file_encoding(cli_args.batch))
         batch_gen = statements_from_filehandle(batch_h)
     except (OSError, FileNotFoundError):
         click.secho(f'Failed to open --batch file: {cli_args.batch}', err=True, fg='red')
@@ -192,7 +200,7 @@ def main_batch_without_progress_bar(mycli: 'MyCli', cli_args: 'CliArgs') -> int:
         click.secho('Ignoring STDIN since --batch was also given.', err=True, fg='red')
     try:
         completed_statement_count = replay_checkpoint_file(cli_args.batch, cli_args.checkpoint, cli_args.resume)
-        batch_h = click.open_file(cli_args.batch)
+        batch_h = click.open_file(cli_args.batch, encoding=batch_file_encoding(cli_args.batch))
     except (OSError, FileNotFoundError):
         click.secho(f'Failed to open --batch file: {cli_args.batch}', err=True, fg='red')
         return 1

{mycli-2.30.3 → mycli-2.31.0}/mycli/main_modes/repl.py

@@ -49,6 +49,7 @@ from pymysql.constants.CR import (
     CR_SERVER_GONE_ERROR,
     CR_SERVER_LOST,
 )
+from pymysql.constants.ER import MUST_CHANGE_PASSWORD
 from pymysql.constants.SERVER_STATUS import SERVER_STATUS_IN_TRANS
 from pymysql.cursors import Cursor
 
@@ -57,7 +58,6 @@ from mycli.compat import WIN
 from mycli.constants import (
     DEFAULT_HOST,
     DEFAULT_WIDTH,
-    ER_MUST_CHANGE_PASSWORD,
     HOME_URL,
     ISSUES_URL,
     QueryState,
@@ -98,7 +98,7 @@ from mycli.packages.utils.sql_utils import (
     need_completion_refresh,
     need_completion_reset,
 )
-from mycli.packages.utils.string_utils import sanitize_terminal_title
+from mycli.packages.utils.string_utils import bracket_ipv6_literal, sanitize_terminal_title
 from mycli.types import Query
 
 if TYPE_CHECKING:
@@ -321,6 +321,8 @@ def render_prompt_string(
     short_prompt_host, _, _ = prompt_host.partition('.')
     if re.match(r'^[\d\.]+$', short_prompt_host):
         short_prompt_host = prompt_host
+    prompt_host = bracket_ipv6_literal(prompt_host)
+    short_prompt_host = bracket_ipv6_literal(short_prompt_host)
     now = datetime.now()
     species_name = sql_execute.server_info.species.name if sql_execute.server_info and sql_execute.server_info.species else 'MySQL'
     strings = string.split('\\\\')
@@ -1110,7 +1112,7 @@ def _one_iteration(
         mycli.echo(str(exc), err=True, fg='red')
     except pymysql.OperationalError as e1:
         mycli.logger.debug('Exception: %r', e1)
-        if e1.args[0] == ER_MUST_CHANGE_PASSWORD:
+        if e1.args[0] == MUST_CHANGE_PASSWORD:
             mycli.sandbox_mode = True
             mycli.echo(
                 "ERROR 1820: You must reset your password using ALTER USER or SET PASSWORD before executing this statement.",

{mycli-2.30.3 → mycli-2.31.0}/mycli/packages/execution/sql_execute.py

@@ -12,10 +12,10 @@ import pymysql
 from pymysql.connections import Connection
 from pymysql.constants import FIELD_TYPE
 from pymysql.constants.CR import CR_SSL_CONNECTION_ERROR
+from pymysql.constants.ER import MUST_CHANGE_PASSWORD
 from pymysql.converters import conversions, convert_date, convert_datetime, convert_time, decoders
 from pymysql.cursors import Cursor, SSCursor
 
-from mycli.constants import ER_MUST_CHANGE_PASSWORD
 from mycli.packages.execution.background_runner import BackgroundRunner
 from mycli.packages.special_commands import io_commands
 from mycli.packages.special_commands.main import CommandNotFound, execute
@@ -296,9 +296,9 @@ class SQLExecute:
                 connect_kwargs['ssl_disabled'] = True
                 conn = pymysql.connect(**connect_kwargs)  # type: ignore[misc]
         except pymysql.OperationalError as e:
-            if e.args[0] == ER_MUST_CHANGE_PASSWORD:
+            if e.args[0] == MUST_CHANGE_PASSWORD:
                 # Post-handshake queries (SET NAMES, SET AUTOCOMMIT, init_command)
-                # fail with ER_MUST_CHANGE_PASSWORD in sandbox mode.
+                # fail with MUST_CHANGE_PASSWORD in sandbox mode.
                 # Reconnect with only the raw handshake.
                 connect_kwargs['defer_connect'] = True
                 connect_kwargs['autocommit'] = None
@@ -659,7 +659,7 @@ class SQLExecute:
         """Connect in sandbox mode, performing only the handshake.
 
         pymysql's normal connect() runs post-handshake queries (SET NAMES,
-        SET AUTOCOMMIT, init_command) that all fail with ER_MUST_CHANGE_PASSWORD
+        SET AUTOCOMMIT, init_command) that all fail with MUST_CHANGE_PASSWORD
         in sandbox mode.  This method performs the raw socket connection and
         authentication handshake only.
         """

{mycli-2.30.3 → mycli-2.31.0}/mycli/packages/special_commands/io_commands.py

@@ -289,7 +289,7 @@ def open_external_editor(filename: str | None = None, sql: str | None = None) ->
         message = None
         click.edit(filename=filename)
         try:
-            with open(filename, 'r') as f:
+            with open(filename, 'r', encoding='utf-8') as f:
                 query = f.read()
         except IOError:
             message = f'Error reading file: {filename}'
@@ -899,7 +899,7 @@ def set_tee(arg: str, **_) -> list[SQLResult]:
     global tee_file
 
     try:
-        tee_file = open(*parseargfile(arg))
+        tee_file = open(*parseargfile(arg), encoding='utf-8')
     except (IOError, OSError) as e:
         raise OSError(f"Cannot write to file '{e.filename}': {e.strerror}") from e
 
@@ -949,7 +949,7 @@ def _set_once_file(filename: str, mode: str) -> list[SQLResult]:
     global once_file, written_to_once_file
 
     try:
-        once_file = open(os.path.expanduser(filename), mode)
+        once_file = open(os.path.expanduser(filename), mode, encoding='utf-8')
     except (IOError, OSError) as e:
         raise OSError(f"Cannot write to file '{e.filename}': {e.strerror}") from e
     written_to_once_file = False
@@ -1096,7 +1096,7 @@ def flush_pipe_once_if_written(
     returncode = PIPE_ONCE['process'].returncode
     if PIPE_ONCE['stdout_file']:
         if not timed_out and not returncode and (stdout_data or force):
-            with open(PIPE_ONCE['stdout_file'], PIPE_ONCE['stdout_mode']) as f:
+            with open(PIPE_ONCE['stdout_file'], PIPE_ONCE['stdout_mode'], encoding='utf-8') as f:
                 if stdout_data:
                     print(stdout_data, file=f)
             _run_post_redirect_hook(post_redirect_command, PIPE_ONCE['stdout_file'])

{mycli-2.30.3 → mycli-2.31.0}/mycli/packages/special_commands/special_command_utils.py

@@ -9,6 +9,8 @@ import click
 import pymysql
 from pymysql.cursors import Cursor
 
+from mycli.packages.utils.string_utils import bracket_ipv6_literal
+
 logger = logging.getLogger(__name__)
 
 CACHED_SSL_VERSION: dict[tuple, str | None] = {}
@@ -166,7 +168,7 @@ def format_connection_dsn(
 ) -> str:
     if user_part := urlquote(user or ''):
         user_part = f'{user_part}@'
-    host_part = host or 'localhost'
+    host_part = bracket_ipv6_literal(host or 'localhost')
     port_part = f':{port}' if port is not None else ''
     if db_part := urlquote(database or ''):
         db_part = f'/{db_part}'

mycli-2.31.0/mycli/packages/utils/batch_utils.py

@@ -0,0 +1,71 @@
+import re
+from typing import IO, Generator
+
+import sqlglot
+import sqlparse
+
+MAX_MULTILINE_BATCH_STATEMENT = 5000
+
+DELIMITER_RE = re.compile(r'^\s*delimiter\s+(\S+)\s*$', re.IGNORECASE)
+# Client commands the vendor client ends at the newline, without a delimiter
+LINE_COMMAND_RE = re.compile(r'^\s*(/?use|/?source|[/\\]u|[/\\]\.)\s+\S', re.IGNORECASE)
+
+
+def _has_tokens(text: str) -> bool:
+    try:
+        return bool(sqlglot.tokenize(text, read='mysql'))
+    except sqlglot.errors.TokenError:
+        return True
+
+
+def statements_from_filehandle(file_h: IO) -> Generator[tuple[str, int], None, None]:
+    statements = ''
+    line_counter = 0
+    batch_counter = 0
+    delimiter = ';'
+    for batch_text in file_h:
+        line_counter += 1
+        if line_counter > MAX_MULTILINE_BATCH_STATEMENT:
+            raise ValueError(f'Saw single input statement greater than {MAX_MULTILINE_BATCH_STATEMENT} lines; assuming a parsing error.')
+        # DELIMITER is a client command, as in the mysql client: switch delimiters, don't send it
+        delimiter_match = DELIMITER_RE.match(batch_text)
+        if delimiter_match and not _has_tokens(statements):
+            delimiter = delimiter_match.group(1)
+            statements = ''
+            line_counter = 0
+            continue
+        if LINE_COMMAND_RE.match(batch_text) and not _has_tokens(statements) and not batch_text.rstrip().endswith(delimiter):
+            yield (batch_text.strip(), batch_counter)
+            batch_counter += 1
+            statements = ''
+            line_counter = 0
+            continue
+        statements += batch_text
+        if delimiter != ';':
+            statement = statements.rstrip()
+            # A custom delimiter is only recognized at the end of a line, so
+            # two statements on one line are sent together as one
+            if statement.endswith(delimiter):
+                yield (statement[: -len(delimiter)].strip(), batch_counter)
+                batch_counter += 1
+                statements = ''
+                line_counter = 0
+            continue
+        try:
+            tokens = sqlglot.tokenize(statements, read='mysql')
+            if not tokens:
+                continue
+            if tokens[-1].text == ';':
+                # The advantage of sqlparse for splitting is that it preserves the input.
+                # https://github.com/tobymao/sqlglot/issues/2587#issuecomment-1823109501
+                for statement in sqlparse.split(statements):
+                    yield (statement, batch_counter)
+                    batch_counter += 1
+                statements = ''
+                line_counter = 0
+        except sqlglot.errors.TokenError:
+            continue
+    if statements:
+        for statement in sqlparse.split(statements):
+            yield (statement, batch_counter)
+            batch_counter += 1

{mycli-2.30.3 → mycli-2.31.0}/mycli/packages/utils/string_utils.py

@@ -1,3 +1,4 @@
+import ipaddress
 import re
 
 from cli_helpers.utils import strip_ansi
@@ -13,3 +14,13 @@ def sanitize_terminal_title(title: FormattedText) -> str:
     sanitized = sanitized.replace('\n', ' ')
     sanitized = re.sub('[\x00-\x1f\x7f]', '', sanitized)
     return sanitized
+
+
+def bracket_ipv6_literal(host: str) -> str:
+    try:
+        ip_obj = ipaddress.ip_address(host)
+    except ValueError:
+        return host
+    if isinstance(ip_obj, ipaddress.IPv6Address) and not host.startswith('['):
+        return f'[{host}]'
+    return host

{mycli-2.30.3 → mycli-2.31.0/mycli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mycli
-Version: 2.30.3
+Version: 2.31.0
 Summary: Rich MySQL terminal client with autocompletion, syntax highlighting, and dataframes
 Author: Mycli Core Team
 License-Expression: BSD-3-Clause
@@ -33,8 +33,8 @@ Requires-Dist: clickdc~=0.1.1
 Requires-Dist: cryptography~=50.0.2
 Requires-Dist: Pygments~=2.21.0
 Requires-Dist: prompt_toolkit~=3.0.53
-Requires-Dist: PyMySQL~=1.2.3
-Requires-Dist: sqlparse~=0.6.0
+Requires-Dist: PyMySQL~=1.2.4
+Requires-Dist: sqlparse~=0.6.1
 Requires-Dist: sqlglot~=30.25.0
 Requires-Dist: sqlglotc~=30.25.0
 Requires-Dist: configobj~=5.0.9
@@ -48,9 +48,9 @@ Requires-Dist: jinja2~=3.1.6
 Requires-Dist: markupsafe~=3.0.4
 Requires-Dist: yaspin~=3.5.1
 Provides-Extra: llm
-Requires-Dist: llm~=0.36; extra == "llm"
+Requires-Dist: llm~=0.37.1; extra == "llm"
 Requires-Dist: setuptools==84.*; extra == "llm"
-Requires-Dist: pip~=26.2.2; extra == "llm"
+Requires-Dist: pip~=26.3; extra == "llm"
 Provides-Extra: dataframe
 Requires-Dist: polars~=2.1.0; extra == "dataframe"
 Requires-Dist: altair~=6.3.0; extra == "dataframe"
@@ -59,8 +59,8 @@ Provides-Extra: all
 Requires-Dist: mycli[dataframe,llm]; extra == "all"
 Provides-Extra: dev
 Requires-Dist: behave~=1.3.3; extra == "dev"
-Requires-Dist: coverage~=7.17.0; extra == "dev"
-Requires-Dist: mypy~=2.4.0; extra == "dev"
+Requires-Dist: coverage~=7.17.2; extra == "dev"
+Requires-Dist: mypy~=2.4.1; extra == "dev"
 Requires-Dist: pexpect~=4.9.0; extra == "dev"
 Requires-Dist: pytest~=9.2.0; extra == "dev"
 Requires-Dist: pytest-cov~=7.1.0; extra == "dev"

{mycli-2.30.3 → mycli-2.31.0}/mycli.egg-info/SOURCES.txt

@@ -216,6 +216,7 @@ mycli_test/pytests/test_special_main.py
 mycli_test/pytests/test_special_source.py
 mycli_test/pytests/test_special_utils.py
 mycli_test/pytests/test_sql_execute.py
+mycli_test/pytests/test_sql_format.py
 mycli_test/pytests/test_sql_utils.py
 mycli_test/pytests/test_sqlcompleter.py
 mycli_test/pytests/test_sqlresult.py

{mycli-2.30.3 → mycli-2.31.0}/mycli.egg-info/requires.txt

@@ -3,8 +3,8 @@ clickdc~=0.1.1
 cryptography~=50.0.2
 Pygments~=2.21.0
 prompt_toolkit~=3.0.53
-PyMySQL~=1.2.3
-sqlparse~=0.6.0
+PyMySQL~=1.2.4
+sqlparse~=0.6.1
 sqlglot~=30.25.0
 sqlglotc~=30.25.0
 configobj~=5.0.9
@@ -28,8 +28,8 @@ vl-convert-python~=1.9.0
 
 [dev]
 behave~=1.3.3
-coverage~=7.17.0
-mypy~=2.4.0
+coverage~=7.17.2
+mypy~=2.4.1
 pexpect~=4.9.0
 pytest~=9.2.0
 pytest-cov~=7.1.0
@@ -39,6 +39,6 @@ pdbpp~=0.12.1
 ruff~=0.17.3
 
 [llm]
-llm~=0.36
+llm~=0.37.1
 setuptools==84.*
-pip~=26.2.2
+pip~=26.3

{mycli-2.30.3 → mycli-2.31.0}/mycli.egg-info/scm_file_list.json

@@ -208,6 +208,7 @@
     "mycli_test/pytests/test_special_source.py",
     "mycli_test/pytests/test_special_utils.py",
     "mycli_test/pytests/test_sql_execute.py",
+    "mycli_test/pytests/test_sql_format.py",
     "mycli_test/pytests/test_sql_utils.py",
     "mycli_test/pytests/test_sqlcompleter.py",
     "mycli_test/pytests/test_sqlresult.py",

mycli-2.31.0/mycli.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.31.0",
+  "distance": 0,
+  "node": "g9a216b6c68294b4222e1780bfe66d00d3c1d1a91",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-11-14"
+}

{mycli-2.30.3 → mycli-2.31.0}/mycli_test/pytests/test_batch_utils.py

@@ -99,3 +99,32 @@ def test_statements_from_filehandle_continues_when_tokenizer_returns_no_tokens(m
         ('select 1;', 0),
         ('select 2;', 1),
     ]
+
+
+def test_statements_from_filehandle_handles_delimiter_blocks() -> None:
+    statements = collect_statements('DELIMITER //\nCREATE PROCEDURE p1()\nBEGIN\n  SELECT 1;\nEND //\nDELIMITER ;\nCALL p1();\n')
+
+    assert statements == [
+        ('CREATE PROCEDURE p1()\nBEGIN\n  SELECT 1;\nEND', 0),
+        ('CALL p1();', 1),
+    ]
+
+
+def test_statements_from_filehandle_ends_use_at_newline() -> None:
+    statements = collect_statements('select 1;\nuse mysql\nselect database();\n')
+
+    assert statements == [
+        ('select 1;', 0),
+        ('use mysql', 1),
+        ('select database();', 2),
+    ]
+
+
+def test_statements_from_filehandle_ends_slash_use_at_newline() -> None:
+    statements = collect_statements('select 1;\n/use mysql\nselect database();\n')
+
+    assert statements == [
+        ('select 1;', 0),
+        ('/use mysql', 1),
+        ('select database();', 2),
+    ]