mycli 2.30.4__tar.gz → 2.31.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mycli
-Version: 2.30.4
+Version: 2.31.0
 Summary: Rich MySQL terminal client with autocompletion, syntax highlighting, and dataframes
 Author: Mycli Core Team
 License-Expression: BSD-3-Clause

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

@@ -1,3 +1,21 @@
+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)
 ==============
 

{mycli-2.30.4 → 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.4/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.4 → mycli-2.31.0}/mycli/AUTHORS.txt

@@ -123,6 +123,9 @@ Contributors:
   * Wei-Lun Li
   * Shaurya Kesarwani
   * Alex Castillo
+  * Karim Masmoudi
+  * Jay Hemnani
+  * Alpenj
 
 
 Created by:

{mycli-2.30.4 → 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.4 → 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.4 → 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.4 → 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.4 → mycli-2.31.0}/mycli/main_modes/repl.py

@@ -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('\\\\')

{mycli-2.30.4 → 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.4 → 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.4 → 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.4 → mycli-2.31.0/mycli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mycli
-Version: 2.30.4
+Version: 2.31.0
 Summary: Rich MySQL terminal client with autocompletion, syntax highlighting, and dataframes
 Author: Mycli Core Team
 License-Expression: BSD-3-Clause

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.4 → 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),
+    ]

{mycli-2.30.4 → mycli-2.31.0}/mycli_test/pytests/test_client.py

@@ -423,6 +423,7 @@ def test_init_opens_audit_log_from_config(monkeypatch: pytest.MonkeyPatch, tmp_p
     try:
         assert isinstance(cli.logfile, TextIOWrapper)
         assert Path(cli.logfile.name) == audit_log
+        assert cli.logfile.encoding.lower().replace('_', '-') == 'utf-8'
     finally:
         if isinstance(cli.logfile, TextIOWrapper):
             cli.logfile.close()

{mycli-2.30.4 → mycli-2.31.0}/mycli_test/pytests/test_client_commands.py

@@ -4,6 +4,8 @@ from collections.abc import Generator
 from io import StringIO
 import logging
 from pathlib import Path
+import subprocess
+import sys
 from types import SimpleNamespace
 from typing import Any
 
@@ -574,7 +576,7 @@ def test_execute_from_file_iterates_statements_without_reading_entire_file(monke
     file_h = IteratedFile('select 1;\nselect\n 2;\nselect 3; select 4;\nselect 5')
     opened_paths: list[str] = []
 
-    def open_file(path: str) -> IteratedFile:
+    def open_file(path: str, **_: Any) -> IteratedFile:
         opened_paths.append(path)
         return file_h
 
@@ -596,7 +598,7 @@ def test_execute_from_file_reports_read_errors(monkeypatch: pytest.MonkeyPatch)
     client = DummyClient()
     client.sql_execute = FakeSQLExecute()
     file_h = FailingFile()
-    monkeypatch.setattr(client_commands, 'open', lambda path: file_h, raising=False)
+    monkeypatch.setattr(client_commands, 'open', lambda path, **_: file_h, raising=False)
 
     assert list(client.execute_from_file('query.sql')) == [SQLResult(status='read failed')]
     assert file_h.closed is True
@@ -655,7 +657,7 @@ def test_execute_from_file_help_is_terminal(monkeypatch: pytest.MonkeyPatch) ->
     client.sql_execute = FakeSQLExecute()
     opened_paths: list[str] = []
     sleep_calls: list[float] = []
-    monkeypatch.setattr(client_commands, 'open', lambda path: opened_paths.append(path), raising=False)
+    monkeypatch.setattr(client_commands, 'open', lambda path, **_: opened_paths.append(path), raising=False)
     monkeypatch.setattr(client_commands.time, 'sleep', lambda seconds: sleep_calls.append(seconds))
 
     assert list(client.execute_from_file('--page --help ignored.sql')) == [
@@ -716,7 +718,7 @@ def test_execute_from_file_does_not_throttle_after_declined_statement(monkeypatc
 def test_execute_from_file_reports_invalid_throttle_without_opening_file(monkeypatch: pytest.MonkeyPatch) -> None:
     client = DummyClient()
     opened_paths: list[str] = []
-    monkeypatch.setattr(client_commands, 'open', lambda path: opened_paths.append(path), raising=False)
+    monkeypatch.setattr(client_commands, 'open', lambda path, **_: opened_paths.append(path), raising=False)
 
     assert list(client.execute_from_file('--throttle nope query.sql')) == [
         SQLResult(
@@ -782,6 +784,31 @@ def test_execute_from_file_shows_each_query(capsys: pytest.CaptureFixture[str],
     assert capsys.readouterr().out == '> select 1;\n> select 2;\n'
 
 
+def test_execute_from_file_does_not_use_locale_encoding(tmp_path: Path) -> None:
+    # SQL files are commonly UTF-8; the locale encoding (cp1252, cp932, ...) would
+    # mis-decode or reject them.  EncodingWarning is raised for any open() that
+    # falls back to the locale encoding.
+    sql_file = tmp_path / 'query.sql'
+    sql_file.write_text('-- caf\u00e9\nselect 1;', encoding='utf-8')
+    script = '\n'.join((
+        'import sys',
+        'from mycli.client_commands import ClientCommandsMixin',
+        'class C(ClientCommandsMixin):',
+        '    pass',
+        'try:',
+        '    list(C().execute_from_file(sys.argv[1]))',
+        'except AttributeError:',
+        '    pass',
+    ))
+    result = subprocess.run(
+        [sys.executable, '-X', 'warn_default_encoding', '-W', 'error::EncodingWarning', '-c', script, str(sql_file)],
+        capture_output=True,
+        encoding='utf8',
+        errors='replace',
+    )
+    assert 'EncodingWarning' not in result.stderr, result.stderr
+
+
 def test_execute_from_file_parses_special_option_and_preserves_filename(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
@@ -791,7 +818,7 @@ def test_execute_from_file_parses_special_option_and_preserves_filename(
     file_h = IteratedFile('select 1;')
     opened_paths: list[str] = []
 
-    def open_file(path: str) -> IteratedFile:
+    def open_file(path: str, **_: Any) -> IteratedFile:
         opened_paths.append(path)
         return file_h
 
@@ -815,7 +842,7 @@ def test_execute_from_file_reports_missing_filename_after_options(options: str)
 def test_execute_from_file_rejects_unquoted_filename_with_spaces(monkeypatch: pytest.MonkeyPatch) -> None:
     client = DummyClient()
     opened_paths: list[str] = []
-    monkeypatch.setattr(client_commands, 'open', lambda path: opened_paths.append(path), raising=False)
+    monkeypatch.setattr(client_commands, 'open', lambda path, **_: opened_paths.append(path), raising=False)
 
     assert list(client.execute_from_file('query file.sql')) == [SQLResult(status=source_command.INVALID_SOURCE_FILENAME, is_error=True)]
     assert opened_paths == []

{mycli-2.30.4 → mycli-2.31.0}/mycli_test/pytests/test_client_query.py

@@ -225,7 +225,7 @@ def test_on_completions_refreshed_starts_schema_prefetch() -> None:
     assert state['prefetch_started'] == [True]
 
 
-def run_query_with_state(monkeypatch, tmp_path, *, warnings_enabled: bool = True) -> dict[str, Any]:
+def run_query_with_state(monkeypatch, tmp_path, *, warnings_enabled: bool = True, query: str = 'select 1;\n') -> dict[str, Any]:
     cli = make_bare_mycli()
     normal_rows = FakeCursorBase(rows=[('one',)], warning_count=1)
     warning_rows = FakeCursorBase(rows=[('warning',)], warning_count=0)
@@ -258,7 +258,7 @@ def run_query_with_state(monkeypatch, tmp_path, *, warnings_enabled: bool = True
     cli.log_query = lambda query: state['logged_queries'].append(query)
     cli.log_output = lambda line: state['logged_output'].append(line)
     cli.format_sqlresult = format_sqlresult
-    mycli_client.MyCli.run_query(cli, 'select 1;\n', checkpoint=str(state['checkpoint_path']), new_line=False)
+    mycli_client.MyCli.run_query(cli, query, checkpoint=str(state['checkpoint_path']), new_line=False)
     state['cli'] = cli
     return state
 
@@ -336,6 +336,12 @@ def test_run_query_writes_checkpoint(monkeypatch, tmp_path) -> None:
     assert state['checkpoint_path'].read_text(encoding='utf-8') == 'select 1;\n'
 
 
+def test_run_query_writes_checkpoint_as_utf8(monkeypatch, tmp_path) -> None:
+    state = run_query_with_state(monkeypatch, tmp_path, warnings_enabled=False, query="select 'Łukasz ✨';\n")
+
+    assert state['checkpoint_path'].read_text(encoding='utf-8') == "select 'Łukasz ✨';\n"
+
+
 def test_run_query_raises_for_error_result_when_requested(tmp_path) -> None:
     cli = make_bare_mycli()
     logged_output: list[str] = []

{mycli-2.30.4 → mycli-2.31.0}/mycli_test/pytests/test_main_modes_batch.py

@@ -513,7 +513,7 @@ def test_main_batch_with_progress_bar_handles_open_errors(monkeypatch) -> None:
     cli_args = DummyCliArgs(batch='missing.sql')
 
     monkeypatch.setattr(batch_mode.os.path, 'exists', lambda _path: False)
-    monkeypatch.setattr(batch_mode.click, 'open_file', lambda _path: (_ for _ in ()).throw(FileNotFoundError()))
+    monkeypatch.setattr(batch_mode.click, 'open_file', lambda _path, **_kwargs: (_ for _ in ()).throw(FileNotFoundError()))
     monkeypatch.setattr(batch_mode.click, 'secho', lambda message, err, fg: messages.append((message, err, fg)))
     monkeypatch.setattr(batch_mode, 'sys', make_fake_sys(stdin_tty=True))
 
@@ -529,7 +529,7 @@ def test_main_batch_with_progress_bar_handles_counting_value_errors(monkeypatch)
     cli_args = DummyCliArgs(batch='statements.sql')
 
     monkeypatch.setattr(batch_mode.os.path, 'exists', lambda _path: False)
-    monkeypatch.setattr(batch_mode.click, 'open_file', lambda _path: count_handle)
+    monkeypatch.setattr(batch_mode.click, 'open_file', lambda _path, **_kwargs: count_handle)
     monkeypatch.setattr(batch_mode, 'statements_from_filehandle', lambda _handle: (_ for _ in ()).throw(ValueError('bad sql')))
     monkeypatch.setattr(batch_mode.click, 'secho', lambda message, err, fg: messages.append((message, err, fg)))
     monkeypatch.setattr(batch_mode, 'sys', make_fake_sys(stdin_tty=True))
@@ -548,7 +548,7 @@ def test_main_batch_with_progress_bar_processes_all_statements(monkeypatch) -> N
     dispatch_calls: list[tuple[str, int]] = []
     cli_args = DummyCliArgs(batch='statements.sql')
 
-    def fake_open_file(path: str) -> DummyFile:
+    def fake_open_file(path: str, **_kwargs: Any) -> DummyFile:
         open_calls.append(path)
         return count_handle if len(open_calls) == 1 else run_handle
 
@@ -588,7 +588,7 @@ def test_main_batch_with_progress_bar_returns_error_when_dispatch_fails(monkeypa
     open_calls = 0
     cli_args = DummyCliArgs(batch='statements.sql')
 
-    def fake_open_file(_path: str) -> DummyFile:
+    def fake_open_file(_path: str, **_kwargs: Any) -> DummyFile:
         nonlocal open_calls
         open_calls += 1
         return count_handle if open_calls == 1 else run_handle
@@ -626,7 +626,7 @@ def test_main_batch_without_progress_bar_handles_open_errors(monkeypatch) -> Non
     messages: list[tuple[str, bool, str]] = []
     cli_args = DummyCliArgs(batch='missing.sql')
 
-    monkeypatch.setattr(batch_mode.click, 'open_file', lambda _path: (_ for _ in ()).throw(FileNotFoundError()))
+    monkeypatch.setattr(batch_mode.click, 'open_file', lambda _path, **_kwargs: (_ for _ in ()).throw(FileNotFoundError()))
     monkeypatch.setattr(batch_mode.click, 'secho', lambda message, err, fg: messages.append((message, err, fg)))
     monkeypatch.setattr(batch_mode, 'sys', make_fake_sys(stdin_tty=True))
 
@@ -642,7 +642,7 @@ def test_main_batch_without_progress_bar_processes_statements(monkeypatch) -> No
     dispatch_calls: list[tuple[str, int]] = []
     cli_args = DummyCliArgs(batch='statements.sql')
 
-    monkeypatch.setattr(batch_mode.click, 'open_file', lambda _path: batch_handle)
+    monkeypatch.setattr(batch_mode.click, 'open_file', lambda _path, **_kwargs: batch_handle)
     monkeypatch.setattr(batch_mode, 'statements_from_filehandle', lambda _handle: iter([('select 1;', 0), ('select 2;', 1)]))
     monkeypatch.setattr(
         batch_mode,
@@ -680,6 +680,26 @@ def test_main_batch_without_progress_bar_skips_checkpoint_prefix(monkeypatch, tm
     assert dispatch_calls == [('select 3;', 2)]
 
 
+def test_main_batch_without_progress_bar_reads_utf8_batch_and_checkpoint(monkeypatch, tmp_path: Path) -> None:
+    batch_path = write_batch_file(tmp_path, "select 'Łukasz ✨';\nselect 2;\n")
+    dispatch_calls: list[tuple[str, int]] = []
+
+    monkeypatch.setattr(
+        batch_mode,
+        'dispatch_batch_statements',
+        lambda _mycli, _cli_args, statement, counter: dispatch_calls.append((statement, counter)),
+    )
+    monkeypatch.setattr(batch_mode, 'sys', make_fake_sys(stdin_tty=True))
+
+    checkpoint = write_checkpoint_file(tmp_path, "select 'Łukasz ✨';\n")
+
+    cli_args = DummyCliArgs(batch=batch_path, checkpoint=checkpoint, resume=True)
+    result = main_batch_without_progress_bar(DummyMyCli(), cli_args)
+
+    assert result == 0
+    assert dispatch_calls == [('select 2;', 1)]
+
+
 def test_main_batch_without_progress_bar_skips_only_matching_duplicate_prefix(monkeypatch, tmp_path: Path) -> None:
     batch_path = write_batch_file(tmp_path, 'select 1;\nselect 1;\nselect 2;\n')
     dispatch_calls: list[tuple[str, int]] = []
@@ -764,6 +784,26 @@ def test_main_batch_with_progress_bar_skips_checkpoint_prefix_and_counts_all_sta
     assert DummyProgressBar.calls == [[0, 1, 2]]
 
 
+def test_main_batch_with_progress_bar_reads_utf8_batch(monkeypatch, tmp_path: Path) -> None:
+    batch_path = write_batch_file(tmp_path, "select 'Łukasz ✨';\nselect 2;\n")
+    dispatch_calls: list[tuple[str, int]] = []
+
+    DummyProgressBar.calls.clear()
+    monkeypatch.setattr(batch_mode, 'ProgressBar', DummyProgressBar)
+    monkeypatch.setattr(batch_mode.prompt_toolkit.output, 'create_output', lambda **_kwargs: object())
+    monkeypatch.setattr(
+        batch_mode,
+        'dispatch_batch_statements',
+        lambda _mycli, _cli_args, statement, counter: dispatch_calls.append((statement, counter)),
+    )
+    monkeypatch.setattr(batch_mode, 'sys', make_fake_sys(stdin_tty=True))
+
+    result = main_batch_with_progress_bar(DummyMyCli(), DummyCliArgs(batch=batch_path))
+
+    assert result == 0
+    assert dispatch_calls == [("select 'Łukasz ✨';", 0), ('select 2;', 1)]
+
+
 def test_main_batch_with_progress_bar_returns_error_when_checkpoint_replay_fails(monkeypatch, tmp_path: Path) -> None:
     batch_path = write_batch_file(tmp_path, 'select 1;\n')
     messages: list[tuple[str, bool, str]] = []
@@ -785,7 +825,7 @@ def test_main_batch_without_progress_bar_returns_error_when_iteration_fails(monk
     batch_handle = DummyFile('run')
     cli_args = DummyCliArgs(batch='statements.sql')
 
-    monkeypatch.setattr(batch_mode.click, 'open_file', lambda _path: batch_handle)
+    monkeypatch.setattr(batch_mode.click, 'open_file', lambda _path, **_kwargs: batch_handle)
     monkeypatch.setattr(batch_mode, 'statements_from_filehandle', lambda _handle: (_ for _ in ()).throw(ValueError('bad sql')))
     monkeypatch.setattr(batch_mode.click, 'secho', lambda message, err, fg: messages.append((message, err, fg)))
     monkeypatch.setattr(batch_mode, 'sys', make_fake_sys(stdin_tty=True))

{mycli-2.30.4 → mycli-2.31.0}/mycli_test/pytests/test_main_modes_repl.py

@@ -1178,6 +1178,28 @@ def test_transaction_prompt_reuses_cached_render_without_ping() -> None:
     ping.assert_called_once_with()
 
 
+@pytest.mark.parametrize('escape', [r'\h', r'\H'])
+@pytest.mark.parametrize(
+    ('host', 'expected'),
+    [('::1', '[::1]:3306'), ('2001:db8::1', '[2001:db8::1]:3306'), ('fe80::1%en0', '[fe80::1%en0]:3306'), ('[::1]', '[::1]:3306')],
+)
+def test_render_prompt_string_brackets_ipv6_host(escape: str, host: str, expected: str) -> None:
+    cli = make_repl_cli(SimpleNamespace(user='alice', host=host, dbname='db', port=3306, socket=None, server_info=None, conn=None))
+
+    prompt = repl_mode.render_prompt_string(cli, escape + r':\p', 0)
+
+    assert to_plain_text(prompt) == expected
+
+
+@pytest.mark.parametrize('escape', [r'\h', r'\H'])
+def test_render_prompt_string_preserves_colon_in_login_path(escape: str) -> None:
+    cli = make_repl_cli(SimpleNamespace(user='alice', host='::1', dbname='db', port=3306, socket=None, server_info=None, conn=None))
+    cli.login_path = 'prod:readonly'
+    cli.login_path_as_host = True
+
+    assert to_plain_text(repl_mode.render_prompt_string(cli, escape, 0)) == 'prod:readonly'
+
+
 def test_render_prompt_string_includes_current_edit_mode() -> None:
     cli = make_repl_cli(
         SimpleNamespace(