mycli 2.1.1__tar.gz → 2.3.0__tar.gz

{mycli-2.1.1 → mycli-2.3.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.3.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.3.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.3.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 mode
 ├── 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
-├── test/conftest.py                      # pytest configuration
+├── mycli/types.py                        # shared types
+├── mycli/vault.py                        # Vault integration
 ├── 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/pytests/conftest.py              # pytest configuration
+└── test/utils.py                         # shared utilities for tests
 
 ## Development
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mycli
-Version: 2.1.1
+Version: 2.3.0
 Summary: CLI for MySQL Database. With auto-completion and syntax highlighting.
 Author: Mycli Core Team
 License-Expression: BSD-3-Clause
@@ -89,13 +89,13 @@ You might need `sudo` on Linux.
 pip install --upgrade 'mycli[all]'
 ```
 
-or, only on macOS (`fzf` and `pygments` are optional):
+or, only on macOS (`fzf` and `pygments` are optional but recommended):
 
 ```bash
 brew update && brew install mycli fzf pygments
 ```
 
-or, only on Debian or Ubuntu (`fzf` and `pygments` are optional):
+or, only on Debian or Ubuntu (`fzf` and `pygments` are optional but recommended):
 
 ```bash
 sudo apt-get install mycli fzf python3-pygments
@@ -115,6 +115,7 @@ Features
 * Auto-completion as you type for SQL keywords as well as tables, views,
   columns, enums, and more!
 * Fuzzy history search using [fzf](https://github.com/junegunn/fzf).
+* Output explorer using [fzf](https://github.com/junegunn/fzf) or other tools.
 * Syntax highlighting using [Pygments](https://pygments.org/).
 * Smart-completion (enabled by default) will suggest context-sensitive completion.
     - `SELECT * FROM <tab>` will only show table names.
@@ -158,15 +159,15 @@ These are some alternative ways to install mycli that are not managed by our
 team but provided by OS package maintainers.  OS packages could be somewhat
 out of date.
 
-If present, the `fzf` package can be used for fuzzy history search, and
-`pygemtize` can be used for syntax highlighting within the fuzzy history
-search.  The `less` package is also expected, but almost always already
-installed.
+If present, the `fzf` package can be used for fuzzy history search, and as an
+output "explorer" with the `\x` special command. `pygemtize` can be used for
+syntax highlighting within the fuzzy history search.  The `less` package is
+also expected, but almost always already installed.
 
 ### Arch, Manjaro
 
 You can install the `mycli` package available in the AUR.  `fzf` and
-`python-pygments` are optional:
+`python-pygments` are optional but recommended:
 
 ```bash
 yay -S mycli fzf python-pygments
@@ -175,7 +176,8 @@ yay -S mycli fzf python-pygments
 ### Debian, Ubuntu
 
 On Debian and Ubuntu distributions, you can easily install the mycli package
-using apt.  The `fzf` and `python3-pygments` packages are optional:
+using apt.  The `fzf` and `python3-pygments` packages are optional but
+recommended:
 
 ```bash
 sudo apt-get install mycli fzf python3-pygments
@@ -184,7 +186,7 @@ sudo apt-get install mycli fzf python3-pygments
 ### Fedora
 
 Fedora has a package available for mycli; install it using dnf.  The `fzf` and
-`python-pygments` packages are optional:
+`python-pygments` packages are optional but recommended:
 
 ```bash
 sudo dnf install mycli fzf python-pygments
@@ -196,7 +198,9 @@ sudo dnf install mycli fzf python-pygments
 
 Install the `less` pager, for example by `scoop install less`.
 
-Follow the instructions on this blogpost: https://web.archive.org/web/20221006045208/https://www.codewall.co.uk/installing-using-mycli-on-windows/
+Install the `fzf` fuzzy finder, for example by `scoop install fzf`.
+
+Follow the instructions on this blog post: https://web.archive.org/web/20221006045208/https://www.codewall.co.uk/installing-using-mycli-on-windows/
 
 The libraries used in mycli are Windows-compatible, but there are known
 limitations according to the test suite.  The basics work without any
@@ -209,11 +213,24 @@ PRs to address shortcomings on Windows would be welcome!
 Mycli is more compatible with WSL than with native Windows, though still
 not 100% perfect.  This is a good option for using mycli on Windows.
 
+With WSL, you are probably using an Ubuntu distribution, in which case
+recommended dependencies can be installed by
+
+```bash
+sudo apt-get install fzf python3-pygments
+```
+
+and mycli can be installed by `apt-get` or by `pip` (recommended):
+
+```bash
+pip install --upgrade 'mycli[all]'
+```
+
 PRs to complete WSL support would be welcome!
 
 ### Thanks
 
-This project was funded through kickstarter. Our thanks to the [backers](https://mycli.net/sponsors) who supported the project.
+This project was funded through Kickstarter. Our thanks to the [backers](https://mycli.net/sponsors) who supported the project.
 
 A special thanks to [Jonathan Slenders](https://twitter.com/jonathan_s) for
 creating [Python Prompt Toolkit](https://github.com/jonathanslenders/python-prompt-toolkit),
@@ -241,7 +258,7 @@ following in `~/.myclirc`:
 default_character_set = utf8
 ```
 
-or set `--charset=utf8` when invoking MyCLI.
+or set `--charset=utf8` when invoking mycli
 
 ### Configuration and Usage
 

{mycli-2.1.1 → mycli-2.3.0}/README.md

@@ -32,13 +32,13 @@ You might need `sudo` on Linux.
 pip install --upgrade 'mycli[all]'
 ```
 
-or, only on macOS (`fzf` and `pygments` are optional):
+or, only on macOS (`fzf` and `pygments` are optional but recommended):
 
 ```bash
 brew update && brew install mycli fzf pygments
 ```
 
-or, only on Debian or Ubuntu (`fzf` and `pygments` are optional):
+or, only on Debian or Ubuntu (`fzf` and `pygments` are optional but recommended):
 
 ```bash
 sudo apt-get install mycli fzf python3-pygments
@@ -58,6 +58,7 @@ Features
 * Auto-completion as you type for SQL keywords as well as tables, views,
   columns, enums, and more!
 * Fuzzy history search using [fzf](https://github.com/junegunn/fzf).
+* Output explorer using [fzf](https://github.com/junegunn/fzf) or other tools.
 * Syntax highlighting using [Pygments](https://pygments.org/).
 * Smart-completion (enabled by default) will suggest context-sensitive completion.
     - `SELECT * FROM <tab>` will only show table names.
@@ -101,15 +102,15 @@ These are some alternative ways to install mycli that are not managed by our
 team but provided by OS package maintainers.  OS packages could be somewhat
 out of date.
 
-If present, the `fzf` package can be used for fuzzy history search, and
-`pygemtize` can be used for syntax highlighting within the fuzzy history
-search.  The `less` package is also expected, but almost always already
-installed.
+If present, the `fzf` package can be used for fuzzy history search, and as an
+output "explorer" with the `\x` special command. `pygemtize` can be used for
+syntax highlighting within the fuzzy history search.  The `less` package is
+also expected, but almost always already installed.
 
 ### Arch, Manjaro
 
 You can install the `mycli` package available in the AUR.  `fzf` and
-`python-pygments` are optional:
+`python-pygments` are optional but recommended:
 
 ```bash
 yay -S mycli fzf python-pygments
@@ -118,7 +119,8 @@ yay -S mycli fzf python-pygments
 ### Debian, Ubuntu
 
 On Debian and Ubuntu distributions, you can easily install the mycli package
-using apt.  The `fzf` and `python3-pygments` packages are optional:
+using apt.  The `fzf` and `python3-pygments` packages are optional but
+recommended:
 
 ```bash
 sudo apt-get install mycli fzf python3-pygments
@@ -127,7 +129,7 @@ sudo apt-get install mycli fzf python3-pygments
 ### Fedora
 
 Fedora has a package available for mycli; install it using dnf.  The `fzf` and
-`python-pygments` packages are optional:
+`python-pygments` packages are optional but recommended:
 
 ```bash
 sudo dnf install mycli fzf python-pygments
@@ -139,7 +141,9 @@ sudo dnf install mycli fzf python-pygments
 
 Install the `less` pager, for example by `scoop install less`.
 
-Follow the instructions on this blogpost: https://web.archive.org/web/20221006045208/https://www.codewall.co.uk/installing-using-mycli-on-windows/
+Install the `fzf` fuzzy finder, for example by `scoop install fzf`.
+
+Follow the instructions on this blog post: https://web.archive.org/web/20221006045208/https://www.codewall.co.uk/installing-using-mycli-on-windows/
 
 The libraries used in mycli are Windows-compatible, but there are known
 limitations according to the test suite.  The basics work without any
@@ -152,11 +156,24 @@ PRs to address shortcomings on Windows would be welcome!
 Mycli is more compatible with WSL than with native Windows, though still
 not 100% perfect.  This is a good option for using mycli on Windows.
 
+With WSL, you are probably using an Ubuntu distribution, in which case
+recommended dependencies can be installed by
+
+```bash
+sudo apt-get install fzf python3-pygments
+```
+
+and mycli can be installed by `apt-get` or by `pip` (recommended):
+
+```bash
+pip install --upgrade 'mycli[all]'
+```
+
 PRs to complete WSL support would be welcome!
 
 ### Thanks
 
-This project was funded through kickstarter. Our thanks to the [backers](https://mycli.net/sponsors) who supported the project.
+This project was funded through Kickstarter. Our thanks to the [backers](https://mycli.net/sponsors) who supported the project.
 
 A special thanks to [Jonathan Slenders](https://twitter.com/jonathan_s) for
 creating [Python Prompt Toolkit](https://github.com/jonathanslenders/python-prompt-toolkit),
@@ -184,7 +201,7 @@ following in `~/.myclirc`:
 default_character_set = utf8
 ```
 
-or set `--charset=utf8` when invoking MyCLI.
+or set `--charset=utf8` when invoking mycli
 
 ### Configuration and Usage
 

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

@@ -1,3 +1,55 @@
+2.3.0 (2026/07/16)
+==============
+
+Features
+---------
+* Set minimum times for transient toolbar messages.
+* `editor_command` entry in `~/.myclirc` which overrides environment.
+* Experimental: let Vault properties be set in DSNs.
+* Add a `\x` special command to send output to an explorer rather than a pager.
+
+
+Documentation
+---------
+* Spellcheck myclirc commentary.
+* Better ordering for `/help` table.
+
+
+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.3.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
 ###
@@ -136,7 +138,9 @@ set environment variable MYSQL_DSN to set a default DSN!
 ### general
 ###
 
-display query output vertically using \G at the end of a query!
+display output vertically using \G at the end of a query!
+
+display output in an interactive explorer \x at the end of a query!
 
 run SQL scripts in batch mode using the standard input!
 
@@ -280,6 +284,10 @@ use "min_completion_trigger" in ~/.myclirc to defer completions!
 
 colorize search previews with "highlight_preview" in ~/.myclirc!
 
+set editor_command = "code --wait" in ~/.myclirc to edit queries using VS Code!
+
+set up an interactive output explorer using the "[explorer]" section of ~/.myclirc!
+
 ###
 ### redirection
 ###

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

@@ -9,18 +9,44 @@ 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',
+    'vault_address',
+    'vault_mount',
+    'vault_secret',
+    'vault_password_field',
+    'vault_username_field',
+}
 
 
 class DsnAliasEnvVarError(ValueError):
@@ -79,7 +105,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 +229,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 +243,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 +280,18 @@ 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]
+        if params := dsn_params.get('vault_address'):
+            cli_args.vault_address = cli_args.vault_address or params[0]
+        if params := dsn_params.get('vault_mount'):
+            cli_args.vault_mount = cli_args.vault_mount or params[0]
+        if params := dsn_params.get('vault_secret'):
+            cli_args.vault_secret = cli_args.vault_secret or params[0]
+        if params := dsn_params.get('vault_password_field'):
+            cli_args.vault_password_field = cli_args.vault_password_field or params[0]
+        if params := dsn_params.get('vault_username_field'):
+            cli_args.vault_username_field = cli_args.vault_username_field 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 +364,52 @@ 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
+    vault_username_from_vault = vault_username is not 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 +422,13 @@ 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,
+            vault_address=cli_args.vault_address,
+            vault_mount=cli_args.vault_mount,
+            vault_secret=cli_args.vault_secret,
+            vault_password_field=cli_args.vault_password_field,
+            vault_username_field=cli_args.vault_username_field,
+            vault_username_from_vault=vault_username_from_vault,
         )
 
         if combined_init_cmd:

{mycli-2.1.1 → mycli-2.3.0}/mycli/clibuffer.py

@@ -42,6 +42,7 @@ def _multiline_exception(text: str) -> bool:
             # or ended with certain commands
             "\\g",
             "\\G",
+            "\\x",
             r"\e",
             r"\edit",
             r"\clip",

{mycli-2.1.1 → mycli-2.3.0}/mycli/client.py

@@ -114,10 +114,15 @@ class MyCli(AppStateMixin, OutputMixin, ClientCommandsMixin, ClientConnectionMix
         self.dsn_alias: str | None = None
         self.main_formatter = TabularOutputFormatter(format_name=c["main"]["table_format"])
         self.redirect_formatter = TabularOutputFormatter(format_name=c["main"].get("redirect_format", "csv"))
+        self.explorer_formatter = TabularOutputFormatter(format_name=c['explorer'].get('format', self.main_formatter))
         sql_format.register_new_formatter(self.main_formatter)
         sql_format.register_new_formatter(self.redirect_formatter)
+        sql_format.register_new_formatter(self.explorer_formatter)
         self.main_formatter.mycli = self
         self.redirect_formatter.mycli = self
+        self.explorer_formatter.mycli = self
+        self.explorer_command = c['explorer'].get('explorer_command')
+        self.explorer_trim_footer = c['explorer'].as_bool('trim_footer')
         self.syntax_style = c["main"]["syntax_style"]
         self.verbosity = -1 if c["main"].as_bool("less_chatty") else 0
         if cli_verbosity:
@@ -155,7 +160,7 @@ class MyCli(AppStateMixin, OutputMixin, ClientCommandsMixin, ClientConnectionMix
                 self.echo("Error: Unable to open the audit log file. Your queries will not be logged.", err=True, fg="red")
                 self.logfile = False
 
-        self.completion_refresher = CompletionRefresher()
+        self.completion_refresher = CompletionRefresher(self._invalidate_prompt_session)
         self.prefetch_schemas_mode = c["main"].get("prefetch_schemas_mode", "always") or "always"
         raw_prefetch_list = c["main"].as_list("prefetch_schemas_list") if "prefetch_schemas_list" in c["main"] else []
         self.prefetch_schemas_list = [s.strip() for s in raw_prefetch_list if s and s.strip()]
@@ -201,6 +206,10 @@ class MyCli(AppStateMixin, OutputMixin, ClientCommandsMixin, ClientConnectionMix
         self.destructive_keywords = destructive_keywords_from_config(c)
         special.set_destructive_keywords(self.destructive_keywords)
 
+    def _invalidate_prompt_session(self) -> None:
+        if self.prompt_session:
+            self.prompt_session.app.invalidate()
+
     def close(self) -> None:
         try:
             self.schema_prefetcher.stop()