mycli 2.1.1__tar.gz → 2.2.0__tar.gz

{mycli-2.1.1 → mycli-2.2.0}/.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
-      - uses: astral-sh/setup-uv@f98e06938123ccabd21905ea5d0069192241f9f1 # v8.3.1
+      - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           version: "latest"
 
@@ -66,7 +66,7 @@ jobs:
     steps:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
-      - uses: astral-sh/setup-uv@f98e06938123ccabd21905ea5d0069192241f9f1 # v8.3.1
+      - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           version: "latest"
 
@@ -116,7 +116,7 @@ jobs:
     steps:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
-      - uses: astral-sh/setup-uv@f98e06938123ccabd21905ea5d0069192241f9f1 # v8.3.1
+      - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           version: 'latest'
 
@@ -219,7 +219,7 @@ jobs:
     steps:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
-      - uses: astral-sh/setup-uv@f98e06938123ccabd21905ea5d0069192241f9f1 # v8.3.1
+      - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           version: "latest"
 

{mycli-2.1.1 → mycli-2.2.0}/.github/workflows/publish.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-    - uses: astral-sh/setup-uv@f98e06938123ccabd21905ea5d0069192241f9f1 # v8.3.1
+    - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
       with:
         version: "latest"
 
@@ -74,7 +74,7 @@ jobs:
     steps:
     - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
-    - uses: astral-sh/setup-uv@f98e06938123ccabd21905ea5d0069192241f9f1 # v8.3.1
+    - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
       with:
         version: "latest"
 
@@ -124,7 +124,7 @@ jobs:
     steps:
     - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
-    - uses: astral-sh/setup-uv@f98e06938123ccabd21905ea5d0069192241f9f1 # v8.3.1
+    - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
       with:
         version: 'latest'
 
@@ -226,7 +226,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-    - uses: astral-sh/setup-uv@f98e06938123ccabd21905ea5d0069192241f9f1 # v8.3.1
+    - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
       with:
         version: "latest"
 

{mycli-2.1.1 → mycli-2.2.0}/.github/workflows/typecheck.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           python-version: '3.14'
 
-      - uses: astral-sh/setup-uv@f98e06938123ccabd21905ea5d0069192241f9f1 # v8.3.1
+      - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           version: 'latest'
 

{mycli-2.1.1 → mycli-2.2.0}/AGENTS.md

@@ -27,8 +27,11 @@ A command line client for MySQL with auto-completion and syntax highlighting.
 ├── mycli/lexer.py                        # extends `MySqlLexer` from Pygments
 ├── mycli/main.py                         # processes CLI arguments
 ├── mycli/main_modes/                     # main execution paths
-├── mycli/main_modes/batch.py             # batch mode execution path
-├── mycli/main_modes/checkup.py           # implementation of `--checkup` mode
+├── mycli/main_modes/batch.py             # `--batch` mode
+├── mycli/main_modes/checkup.py           # `--checkup` mode
+├── mycli/main_modes/execute.py           # `--execute` mode
+├── mycli/main_modes/list_dsn.py          # `--list-dsn` mode
+├── mycli/main_modes/repl.py              # interactive REPL made
 ├── mycli/myclirc                         # project-level configuration file
 ├── mycli/output.py                       # `OutputMixin` mixin for feedback and output of query results
 ├── mycli/packages/                       # application packages
@@ -48,13 +51,14 @@ A command line client for MySQL with auto-completion and syntax highlighting.
 ├── mycli/schema_prefetcher.py            # background prefetcher for multi-schema auto-completion
 ├── mycli/sqlcompleter.py                 # offers SQL completions
 ├── mycli/sqlexecute.py                   # runs SQL queries
+├── mycli/types.py                        # shared types
+├── mycli/vault.py                        # Vault integration
 ├── test/conftest.py                      # pytest configuration
 ├── test/features/                        # behave tests
 ├── test/myclirc                          # mycli configuration used for tests
 ├── test/mylogin.cnf                      # `mylogin.cnf` example used for tests
 ├── test/pytests/                         # pytest tests
-├── test/utils.py                         # shared utilities for tests
-└── types.py                              # shared types
+└── test/utils.py                         # shared utilities for tests
 
 ## Development
 

{mycli-2.1.1/mycli.egg-info → mycli-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mycli
-Version: 2.1.1
+Version: 2.2.0
 Summary: CLI for MySQL Database. With auto-completion and syntax highlighting.
 Author: Mycli Core Team
 License-Expression: BSD-3-Clause

{mycli-2.1.1 → mycli-2.2.0}/changelog.md

@@ -1,3 +1,38 @@
+2.2.0 (2026/07/11)
+==============
+
+Breaking Changes
+---------
+* `ssl` is no longer supported as a DSN parameter.  Use `ssl_mode` instead.
+
+
+Features
+---------
+* Configurable tunnel method for `--ssh-jump`, making UDS usually default.
+* Add `--ssh-options` CLI argument to pass extra options with `--ssh-jump`.
+* Make `ssh_jump` a DSN query parameter.
+* Warn on unknown DSN query parameters.
+* Experimental: reading credentials from Vault using the `vault kv get` CLI.
+
+
+Bug Fixes
+---------
+* Allow `/dsn` command to show correct values with `--ssh-jump`.
+
+
+Documentation
+---------
+* Add `--ssh-jump` to TIPS.
+* Better document `/dsn show`.
+* Improve `ssh_options` commentary.
+
+
+Internal
+---------
+* Make flaky `/watch` test more lenient for CI.
+* Tweak `AGENTS.md` project structure.
+
+
 2.1.1 (2026/07/08)
 ==============
 

{mycli-2.1.1 → mycli-2.2.0}/mycli/TIPS

@@ -40,6 +40,8 @@ the --login-path option lets you work with login-path files!
 
 --keepalive-ticks=<num> sets keepalive pings for a single session!
 
+connect via an SSH tunnel with --ssh-jump!
+
 ###
 ### commands
 ###

{mycli-2.1.1 → mycli-2.2.0}/mycli/cli_runner.py

@@ -9,18 +9,39 @@ from urllib.parse import parse_qs, unquote, urlparse
 import click
 
 from mycli.config import str_to_bool
-from mycli.constants import EMPTY_PASSWORD_FLAG_SENTINEL, ISSUES_URL
+from mycli.constants import EMPTY_PASSWORD_FLAG_SENTINEL
 from mycli.main_modes.batch import main_batch_from_stdin, main_batch_with_progress_bar, main_batch_without_progress_bar
 from mycli.main_modes.checkup import main_checkup
 from mycli.main_modes.execute import main_execute_from_cli
 from mycli.main_modes.list_dsn import main_list_dsn
 from mycli.packages.cli_utils import is_valid_connection_scheme
+from mycli.vault import (
+    DEFAULT_VAULT_EXECUTABLE,
+    DEFAULT_VAULT_PASSWORD_FIELD,
+    DEFAULT_VAULT_USERNAME_FIELD,
+    VaultError,
+    get_field_from_vault,
+)
 
 if TYPE_CHECKING:
     from mycli.main import CliArgs
 
 ClientFactory = Callable[..., Any]
 ENV_VAR_PATTERN = re.compile(r'^\$\{([A-Za-z_][A-Za-z0-9_]*)\}$')
+KNOWN_DSN_QUERY_PARAMS = {
+    'character_set',
+    'keepalive_ticks',
+    'socket',
+    'ssh_jump',
+    'ssl_ca',
+    'ssl_capath',
+    'ssl_cert',
+    'ssl_cipher',
+    'ssl_key',
+    'ssl_mode',
+    'ssl_verify_server_cert',
+    'tls_version',
+}
 
 
 class DsnAliasEnvVarError(ValueError):
@@ -79,7 +100,10 @@ def expand_dsn_alias_env_vars(
     except ValueError as exc:
         raise DsnAliasEnvVarError(f'Port in DSN alias {alias_name} must be an integer.') from exc
 
-    params = {key: [expand_dsn_alias_env_var(value, alias_name) or '' for value in values] for key, values in parse_qs(uri.query).items()}
+    params = {
+        key: [expand_dsn_alias_env_var(value, alias_name) or '' for value in values]
+        for key, values in parse_qs(uri.query, keep_blank_values=True).items()
+    }
 
     return (
         expand_dsn_alias_env_var(unquote(username) if username is not None else None, alias_name),
@@ -200,7 +224,7 @@ def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory) -> Non
             dsn_host = uri.hostname
             dsn_port = uri.port
             dsn_database = uri.path[1:]
-            dsn_params = parse_qs(uri.query) if uri.query else {}
+            dsn_params = parse_qs(uri.query, keep_blank_values=True) if uri.query else {}
 
         if not database:
             database = dsn_database
@@ -214,16 +238,13 @@ def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory) -> Non
         if not cli_args.port:
             cli_args.port = dsn_port
 
-        if params := dsn_params.get('ssl'):
+        if unknown_dsn_params := sorted(set(dsn_params) - KNOWN_DSN_QUERY_PARAMS):
             click.secho(
-                'Warning: The "ssl" DSN URI parameter is deprecated and will be removed in a future release. '
-                'Please use the "ssl_mode" parameter instead. '
-                f'See issue {ISSUES_URL}/1507',
+                f'Warning: Ignored unknown DSN URI query parameters: {", ".join(unknown_dsn_params)}.',
                 err=True,
                 fg='yellow',
             )
-            if params[0].lower() == 'true':
-                cli_args.ssl_mode = 'on'
+
         if params := dsn_params.get('ssl_mode'):
             cli_args.ssl_mode = cli_args.ssl_mode or params[0]
         if params := dsn_params.get('ssl_ca'):
@@ -254,6 +275,8 @@ def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory) -> Non
                 cli_args.keepalive_ticks = int(params[0])
         if params := dsn_params.get('character_set'):
             cli_args.character_set = cli_args.character_set or params[0]
+        if params := dsn_params.get('ssh_jump'):
+            cli_args.ssh_jump = cli_args.ssh_jump or params[0]
 
     keepalive_ticks = cli_args.keepalive_ticks if cli_args.keepalive_ticks is not None else mycli.default_keepalive_ticks
     ssl_mode = cli_args.ssl_mode or mycli.ssl_mode
@@ -326,11 +349,51 @@ def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory) -> Non
         use_keyring = str_to_bool(cli_args.use_keyring)
         reset_keyring = False
 
+    if cli_args.password is None and cli_args.vault_secret:
+        vault_config = mycli.config.get('vault_beta', {})
+        vault_address = cli_args.vault_address or os.environ.get('VAULT_ADDR') or vault_config.get('address') or None
+        vault_mount = cli_args.vault_mount or vault_config.get('default_mount') or None
+        vault_field = cli_args.vault_password_field or vault_config.get('default_password_field') or DEFAULT_VAULT_PASSWORD_FIELD
+        vault_executable = vault_config.get('vault_executable') or DEFAULT_VAULT_EXECUTABLE
+        try:
+            vault_password: str | None = get_field_from_vault(
+                vault_field,
+                cli_args.vault_secret,
+                executable=vault_executable,
+                mount=vault_mount,
+                address=vault_address,
+            )
+        except VaultError as exc:
+            click.secho(f'Error reading password from Vault: {exc}', err=True, fg='red')
+            sys.exit(1)
+    else:
+        vault_password = None
+
+    if cli_args.user is None and cli_args.vault_secret:
+        vault_config = mycli.config.get('vault_beta', {})
+        vault_address = cli_args.vault_address or os.environ.get('VAULT_ADDR') or vault_config.get('address') or None
+        vault_mount = cli_args.vault_mount or vault_config.get('default_mount') or None
+        vault_field = cli_args.vault_username_field or vault_config.get('default_username_field') or DEFAULT_VAULT_USERNAME_FIELD
+        vault_executable = vault_config.get('vault_executable') or DEFAULT_VAULT_EXECUTABLE
+        try:
+            vault_username = get_field_from_vault(
+                vault_field,
+                cli_args.vault_secret,
+                executable=vault_executable,
+                mount=vault_mount,
+                address=vault_address,
+            )
+        except VaultError as exc:
+            click.secho(f'Error reading username from Vault: {exc}', err=True, fg='red')
+            sys.exit(1)
+    else:
+        vault_username = None
+
     try:
         mycli.connect(
             database=database,
-            user=cli_args.user,
-            passwd=cli_args.password,
+            user=vault_username if cli_args.user is None else cli_args.user,
+            passwd=vault_password if cli_args.password is None else cli_args.password,
             host=cli_args.host,
             port=cli_args.port,
             socket=cli_args.socket,
@@ -343,6 +406,7 @@ def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory) -> Non
             reset_keyring=reset_keyring,
             keepalive_ticks=keepalive_ticks,
             ssh_jump=cli_args.ssh_jump,
+            ssh_cli_options=cli_args.ssh_options,
         )
 
         if combined_init_cmd:

{mycli-2.1.1 → mycli-2.2.0}/mycli/client_connection.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import os
 import sys
 import traceback
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Literal
 from urllib.parse import quote as urlquote
 
 import click
@@ -22,6 +22,7 @@ from mycli.constants import (
     ER_MUST_CHANGE_PASSWORD_LOGIN,
 )
 from mycli.packages.filepaths import guess_socket_location
+from mycli.packages.special.utils import format_connection_dsn
 from mycli.sqlexecute import SQLExecute
 from mycli.ssh_tunnel import SshTunnel, SshTunnelError
 
@@ -61,6 +62,7 @@ class ClientConnectionMixin:
         reset_keyring: bool | None = None,
         keepalive_ticks: int | None = None,
         ssh_jump: str | None = None,
+        ssh_cli_options: str | None = None,
     ) -> None:
         mylogin_cnf: dict[str, Any] = self.read_mylogin_cnf(self.mylogin_cnf)
         # Fall back to .mylogin.cnf values only if user did not specify a value.
@@ -83,7 +85,8 @@ class ClientConnectionMixin:
             remote_port = int_port or DEFAULT_PORT
             remote_socket = socket or None
             ssh_executable = self.config.get('ssh', {}).get('ssh_executable', 'ssh') or 'ssh'
-            ssh_options = self.config.get('ssh', {}).get('ssh_options')
+            ssh_config_options = self.config.get('ssh', {}).get('ssh_options')
+            tunnel_method: Literal['auto', 'socket', 'port'] = self.config.get('ssh', {}).get('tunnel_method', 'auto').lower() or 'auto'
             try:
                 self.ssh_tunnel = SshTunnel.from_target(
                     ssh_jump,
@@ -91,7 +94,9 @@ class ClientConnectionMixin:
                     remote_port=int(remote_port),
                     remote_socket=remote_socket,
                     ssh_executable=ssh_executable,
-                    ssh_options=ssh_options,
+                    ssh_config_options=ssh_config_options,
+                    ssh_cli_options=ssh_cli_options,
+                    tunnel_method=tunnel_method,
                 )
                 self.ssh_tunnel.start()
             except (OSError, ValueError, SshTunnelError) as exc:
@@ -161,8 +166,9 @@ class ClientConnectionMixin:
         # 2. --password-file CLI option
         # 3. envvar (MYSQL_PWD)
         # 4. DSN (mysql://user:password)
-        # 5. .mylogin.cnf
-        # 6. keyring
+        # 5. Vault
+        # 6. .mylogin.cnf
+        # 7. keyring
 
         ssh_tunnel_field = urlquote(ssh_jump or '')
         if ssh_tunnel_field:
@@ -184,6 +190,18 @@ class ClientConnectionMixin:
         # should not fail, but will help the typechecker
         assert not isinstance(passwd, int)
 
+        display_dsn = None
+        if self.ssh_tunnel:
+            display_dsn = format_connection_dsn(
+                user=user,
+                host=remote_host,
+                port=remote_port,
+                socket=remote_socket,
+                database=database,
+                character_set=character_set,
+                ssh_jump=ssh_jump,
+            )
+
         connection_info: dict[str, Any] = {
             'database': database,
             'user': user,
@@ -193,8 +211,13 @@ class ClientConnectionMixin:
             'ssl': ssl_config,
             'init_command': init_command,
             'unbuffered': unbuffered,
+            'display_dsn': display_dsn,
         }
-        if self.ssh_tunnel:
+        if self.ssh_tunnel and self.ssh_tunnel.local_socket:
+            connection_info['host'] = None
+            connection_info['port'] = None
+            connection_info['socket'] = self.ssh_tunnel.local_socket
+        elif self.ssh_tunnel:
             connection_info['host'] = self.ssh_tunnel.local_host
             connection_info['port'] = self.ssh_tunnel.local_port
             connection_info['socket'] = None

{mycli-2.1.1 → mycli-2.2.0}/mycli/main.py

@@ -89,6 +89,26 @@ class CliArgs:
         type=click.Path(),
         help='File or FIFO path containing the password to connect to the db if not specified otherwise.',
     )
+    vault_address: str | None = clickdc.option(
+        type=str,
+        help='EXPERIMENTAL "vault kv get" integration: value for $VAULT_ADDR if unset in the environment or ~/.myclirc.',
+    )
+    vault_mount: str | None = clickdc.option(
+        type=str,
+        help='EXPERIMENTAL "vault kv get" integration: value for -mount if unset in ~/.myclirc.',
+    )
+    vault_secret: str | None = clickdc.option(
+        type=str,
+        help='EXPERIMENTAL "vault kv get" integration: secret name.',
+    )
+    vault_password_field: str | None = clickdc.option(
+        type=str,
+        help='EXPERIMENTAL "vault kv get" integration: field containing the password.',
+    )
+    vault_username_field: str | None = clickdc.option(
+        type=str,
+        help='EXPERIMENTAL "vault kv get" integration: field containing the username.',
+    )
     ssl_mode: str = clickdc.option(
         type=click.Choice(['auto', 'on', 'off']),
         help='Set desired SSL behavior. auto=preferred if TCP/IP, on=required, off=off.',
@@ -275,6 +295,10 @@ class CliArgs:
         type=str,
         help='Open an SSH tunnel via [user@]host[:port] and connect to MySQL through it.',
     )
+    ssh_options: str | None = clickdc.option(
+        type=str,
+        help='Extra CLI arguments for SSH with --ssh-jump, placed after options from myclirc.',
+    )
     checkup: bool = clickdc.option(
         is_flag=True,
         help='Run a checkup on your configuration.',

{mycli-2.1.1 → mycli-2.2.0}/mycli/myclirc

@@ -305,6 +305,34 @@ vi_ttimeoutlen = 0.1
 # How long to wait for an Escape key sequence in Emacs mode.
 emacs_ttimeoutlen = 0.5
 
+[ssh]
+# Path to the ssh executable used by --ssh-jump.
+ssh_executable = ssh
+
+# Options to pass to the ssh executable when making a tunnel.
+# The defaults may need to be changed if not using OpenSSH.
+ssh_options = -a -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -o IPQoS=af13 -o LogLevel=FATAL
+
+# Method for establishing the local side of the SSH tunnel: auto, port, socket.
+# auto means: port if on Windows, socket otherwise.
+tunnel_method = auto
+
+[vault_beta]
+# Path to the vault executable used for Vault integration.
+vault_executable = vault
+
+# URL for VAULT_ADDR, if the environment variable is unset.
+address =
+
+# Default mount, which can be overridden by --vault-mount at the CLI.
+default_mount =
+
+# Field/property containing the password, if --vault-password-field is not provided.
+default_password_field = password
+
+# Field/property containing the username, if --vault-username-field is not provided.
+default_username_field = username
+
 # Custom colors for the completion menu, toolbar, etc, with actual support
 # depending on the terminal, and the property being set.
 # Colors: #ffffff, bg:#ffffff, border:#ffffff.
@@ -407,10 +435,3 @@ matching-bracket.other = '#000000 bg:#aacccc'
 [alias_dsn.init-commands]
 # Define one or more SQL statements per alias (semicolon-separated).
 # example_dsn = "SET sql_select_limit=1000; SET time_zone='+00:00'"
-
-[ssh]
-# Path to the ssh executable used by --ssh-jump.
-ssh_executable = ssh
-
-# options to pass to the ssh executable when making a tunnel
-ssh_options = -a -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -o IPQoS=af13 -o LogLevel=FATAL

{mycli-2.1.1 → mycli-2.2.0}/mycli/packages/special/dsn_aliases.py

@@ -11,6 +11,10 @@ directly or by using this command.
 
 Examples:
 
+    # Show a DSN for the current connection
+    mysql> /dsn show
+    mysql://mycli@localhost/mysql
+
     # List all DSN aliases
     mysql> /dsn list
     ┌───────┬───────────────────────────────┐

{mycli-2.1.1 → mycli-2.2.0}/mycli/packages/special/utils.py

@@ -147,21 +147,45 @@ def get_local_timezone() -> str:
     return datetime.datetime.now().astimezone().tzname() or ''
 
 
-def compute_current_dsn(cur: Cursor) -> str:
-    conn = cur.connection
-    user = urlquote(conn.user or '')
-    host = conn.host or 'localhost'
-    port = f':{conn.port}'
-    db = urlquote(conn.db.decode() if isinstance(conn.db, bytes) else (conn.db or ''))
+def format_connection_dsn(
+    *,
+    user: str | None,
+    host: str | None,
+    port: int | None,
+    database: str | None,
+    socket: str | None,
+    character_set: str | None,
+    ssh_jump: str | None = None,
+) -> str:
+    user = urlquote(user or '')
+    host = host or 'localhost'
+    port_part = f':{port}' if port is not None else ''
+    db = urlquote(database or '')
     if db:
         db = f'/{db}'
     query_part = {}
-    if getattr(conn, 'unix_socket', None):
-        query_part['socket'] = conn.unix_socket
-        port = ''
-    if getattr(conn, 'charset', None) and conn.charset != 'utf8mb4':
-        query_part['character_set'] = conn.charset
-    dsn = f'mysql://{user}@{host}{port}{db}'
+    if socket:
+        query_part['socket'] = socket
+        port_part = ''
+    if character_set and character_set != 'utf8mb4':
+        query_part['character_set'] = character_set
+    if ssh_jump:
+        query_part['ssh_jump'] = ssh_jump
+    dsn = f'mysql://{user}@{host}{port_part}{db}'
     if query_part:
         dsn += '?' + urlencode(query_part)
     return dsn
+
+
+def compute_current_dsn(cur: Cursor) -> str:
+    conn = cur.connection
+    if display_dsn := getattr(conn, '_mycli_display_dsn', None):
+        return display_dsn
+    return format_connection_dsn(
+        user=conn.user.decode() if isinstance(conn.user, bytes) else conn.user,
+        host=conn.host,
+        port=conn.port,
+        database=conn.db.decode() if isinstance(conn.db, bytes) else conn.db,
+        socket=getattr(conn, 'unix_socket', None),
+        character_set=getattr(conn, 'charset', None),
+    )

{mycli-2.1.1 → mycli-2.2.0}/mycli/sqlexecute.py

@@ -167,6 +167,7 @@ class SQLExecute:
         ssl: dict[str, Any] | None,
         init_command: str | None = None,
         unbuffered: bool | None = None,
+        display_dsn: str | None = None,
     ) -> None:
         self.dbname = database
         self.user = user
@@ -177,6 +178,7 @@ class SQLExecute:
         self.character_set = character_set
         self.local_infile = local_infile
         self.ssl = ssl
+        self.display_dsn = display_dsn
         self.server_info: ServerInfo | None = None
         self.connection_id: int | None = None
         self.init_command = init_command
@@ -295,6 +297,8 @@ class SQLExecute:
             except pymysql.err.Error:
                 pass
         self.conn = conn
+        if self.display_dsn is not None:
+            self.conn._mycli_display_dsn = self.display_dsn  # type: ignore[attr-defined]
         # Update them after the connection is made to ensure that it was a
         # successful connection.
         self.dbname = db