mycli 2.2.0__tar.gz → 2.3.0__tar.gz

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

@@ -31,7 +31,7 @@ A command line client for MySQL with auto-completion and syntax highlighting.
 ├── 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/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
@@ -53,11 +53,11 @@ A command line client for MySQL with auto-completion and syntax highlighting.
 ├── 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/pytests/conftest.py              # pytest configuration
 └── test/utils.py                         # shared utilities for tests
 
 ## Development

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mycli
-Version: 2.2.0
+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.2.0 → 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.2.0 → mycli-2.3.0}/changelog.md

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

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

@@ -138,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!
 
@@ -282,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.2.0 → mycli-2.3.0}/mycli/cli_runner.py

@@ -41,6 +41,11 @@ KNOWN_DSN_QUERY_PARAMS = {
     'ssl_mode',
     'ssl_verify_server_cert',
     'tls_version',
+    'vault_address',
+    'vault_mount',
+    'vault_secret',
+    'vault_password_field',
+    'vault_username_field',
 }
 
 
@@ -277,6 +282,16 @@ def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory) -> Non
             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
@@ -388,6 +403,7 @@ def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory) -> Non
             sys.exit(1)
     else:
         vault_username = None
+    vault_username_from_vault = vault_username is not None
 
     try:
         mycli.connect(
@@ -407,6 +423,12 @@ def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory) -> Non
             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.2.0 → 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.2.0 → 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()

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

@@ -63,6 +63,12 @@ class ClientConnectionMixin:
         keepalive_ticks: int | None = None,
         ssh_jump: str | None = None,
         ssh_cli_options: str | None = None,
+        vault_address: str | None = None,
+        vault_mount: str | None = None,
+        vault_secret: str | None = None,
+        vault_password_field: str | None = None,
+        vault_username_field: str | None = None,
+        vault_username_from_vault: bool = False,
     ) -> 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.
@@ -191,15 +197,36 @@ class ClientConnectionMixin:
         assert not isinstance(passwd, int)
 
         display_dsn = None
+        display_dsn_user = None if vault_username_from_vault else user
         if self.ssh_tunnel:
             display_dsn = format_connection_dsn(
-                user=user,
+                user=display_dsn_user,
                 host=remote_host,
                 port=remote_port,
                 socket=remote_socket,
                 database=database,
                 character_set=character_set,
                 ssh_jump=ssh_jump,
+                vault_address=vault_address,
+                vault_mount=vault_mount,
+                vault_secret=vault_secret,
+                vault_password_field=vault_password_field,
+                vault_username_field=vault_username_field,
+            )
+        elif vault_secret:
+            display_dsn = format_connection_dsn(
+                user=display_dsn_user,
+                host=host,
+                port=int_port,
+                socket=socket,
+                database=database,
+                character_set=character_set,
+                ssh_jump=ssh_jump,
+                vault_address=vault_address,
+                vault_mount=vault_mount,
+                vault_secret=vault_secret,
+                vault_password_field=vault_password_field,
+                vault_username_field=vault_username_field,
             )
 
         connection_info: dict[str, Any] = {

{mycli-2.2.0 → mycli-2.3.0}/mycli/client_query.py

@@ -20,6 +20,7 @@ class ClientQueryMixin:
         smart_completion: bool
         main_formatter: Any
         redirect_formatter: Any
+        explorer_formatter: Any
         prompt_session: Any
         null_string: str | None
         numeric_alignment: str | None
@@ -86,6 +87,7 @@ class ClientQueryMixin:
         for result in results:
             self.main_formatter.query = query
             self.redirect_formatter.query = query
+            self.explorer_formatter.query = query
             output = self.format_sqlresult(
                 result,
                 is_expanded=special.is_expanded_output(),

{mycli-2.2.0 → mycli-2.3.0}/mycli/completion_refresher.py

@@ -1,4 +1,5 @@
 import threading
+from time import monotonic
 from typing import Callable
 
 import pymysql
@@ -8,13 +9,18 @@ from mycli.packages.sqlresult import SQLResult
 from mycli.sqlcompleter import SQLCompleter
 from mycli.sqlexecute import ServerSpecies, SQLExecute
 
+MIN_COMPLETION_REFRESH_MESSAGE_SECONDS = 1.0
+
 
 class CompletionRefresher:
     refreshers: dict = {}
 
-    def __init__(self) -> None:
+    def __init__(self, invalidate_app: Callable[[], None] | None = None) -> None:
         self._completer_thread: threading.Thread | None = None
         self._restart_refresh = threading.Event()
+        self._refresh_visible_until = 0.0
+        self._visibility_timer: threading.Timer | None = None
+        self._invalidate_app = invalidate_app
 
     def refresh(
         self,
@@ -36,10 +42,14 @@ class CompletionRefresher:
         if completer_options is None:
             completer_options = {}
 
-        if self.is_refreshing():
+        if self._thread_is_alive():
             self._restart_refresh.set()
             return [SQLResult(status="Auto-completion refresh restarted.")]
         else:
+            if self._visibility_timer is not None:
+                self._visibility_timer.cancel()
+                self._visibility_timer = None
+            self._refresh_visible_until = monotonic() + MIN_COMPLETION_REFRESH_MESSAGE_SECONDS
             self._completer_thread = threading.Thread(
                 target=self._bg_refresh, args=(executor, callbacks, completer_options), name="completion_refresh"
             )
@@ -48,6 +58,9 @@ class CompletionRefresher:
             return [SQLResult(status="Auto-completion refresh started in the background.")]
 
     def is_refreshing(self) -> bool:
+        return self._thread_is_alive() or monotonic() < self._refresh_visible_until
+
+    def _thread_is_alive(self) -> bool:
         return bool(self._completer_thread and self._completer_thread.is_alive())
 
     def _bg_refresh(
@@ -73,31 +86,53 @@ class CompletionRefresher:
                 e.ssl,
             )
         except pymysql.err.OperationalError:
+            self._finish_refreshing()
             return
 
-        # If callbacks is a single function then push it into a list.
-        if callable(callbacks):
-            callbacks = [callbacks]
-
-        while 1:
-            for refresher in self.refreshers.values():
-                refresher(completer, executor)
-                if self._restart_refresh.is_set():
-                    self._restart_refresh.clear()
+        try:
+            # If callbacks is a single function then push it into a list.
+            if callable(callbacks):
+                callbacks = [callbacks]
+
+            while 1:
+                for refresher in self.refreshers.values():
+                    refresher(completer, executor)
+                    if self._restart_refresh.is_set():
+                        self._restart_refresh.clear()
+                        break
+                else:
+                    # Break out of while loop if the for loop finishes natually
+                    # without hitting the break statement.
                     break
-            else:
-                # Break out of while loop if the for loop finishes natually
-                # without hitting the break statement.
-                break
 
-            # Start over the refresh from the beginning if the for loop hit the
-            # break statement.
-            continue
+                # Start over the refresh from the beginning if the for loop hit the
+                # break statement.
+                continue
 
-        for callback in callbacks:
-            callback(completer)
+            for callback in callbacks:
+                callback(completer)
+        finally:
+            executor.close()
+            self._finish_refreshing()
 
-        executor.close()
+    def _finish_refreshing(self) -> None:
+        self._invalidate()
+        remaining = self._refresh_visible_until - monotonic()
+        if remaining <= 0:
+            return
+        if self._visibility_timer is not None:
+            self._visibility_timer.cancel()
+        self._visibility_timer = threading.Timer(remaining, self._invalidate_after_visibility_deadline)
+        self._visibility_timer.daemon = True
+        self._visibility_timer.start()
+
+    def _invalidate_after_visibility_deadline(self) -> None:
+        self._visibility_timer = None
+        self._invalidate()
+
+    def _invalidate(self) -> None:
+        if self._invalidate_app is not None:
+            self._invalidate_app()
 
 
 def refresher(name: str, refreshers: dict = CompletionRefresher.refreshers) -> Callable:

{mycli-2.2.0 → mycli-2.3.0}/mycli/main_modes/execute.py

@@ -24,15 +24,15 @@ def main_execute_from_cli(mycli: 'MyCli', cli_args: 'CliArgs') -> int:
         execute_sql = cli_args.execute
         if cli_args.format == 'csv':
             mycli.main_formatter.format_name = 'csv'
-            if execute_sql.endswith(r'\G'):
+            if execute_sql.endswith((r'\G', r'\g', r'\x')):
                 execute_sql = execute_sql[:-2]
         elif cli_args.format == 'tsv':
             mycli.main_formatter.format_name = 'tsv'
-            if execute_sql.endswith(r'\G'):
+            if execute_sql.endswith((r'\G', r'\g', r'\x')):
                 execute_sql = execute_sql[:-2]
         elif cli_args.format == 'table':
             mycli.main_formatter.format_name = 'ascii'
-            if execute_sql.endswith(r'\G'):
+            if execute_sql.endswith((r'\G', r'\g', r'\x')):
                 execute_sql = execute_sql[:-2]
         else:
             mycli.main_formatter.format_name = 'tsv'

{mycli-2.2.0 → mycli-2.3.0}/mycli/main_modes/repl.py

@@ -9,6 +9,7 @@ from importlib import resources
 import os
 import random
 import re
+import shutil
 import subprocess
 import sys
 import time
@@ -42,6 +43,7 @@ import mycli as mycli_package
 from mycli.clibuffer import cli_is_multiline
 from mycli.clistyle import style_factory_ptoolkit
 from mycli.clitoolbar import create_toolbar_tokens_func
+from mycli.compat import WIN
 from mycli.constants import (
     DEFAULT_HOST,
     DEFAULT_WIDTH,
@@ -613,6 +615,7 @@ def _one_iteration(
 
         special.set_expanded_output(False)
         special.set_forced_horizontal_output(False)
+        special.set_explorer_output(False)
 
         try:
             text = handle_editor_command(
@@ -716,6 +719,7 @@ def _one_iteration(
         results = sqlexecute.run(text)
         mycli.main_formatter.query = text
         mycli.redirect_formatter.query = text
+        mycli.explorer_formatter.query = text
         successful = True
         _output_results(mycli, state, results, start)
         special.unset_once_if_written(mycli.post_redirect_command)
@@ -854,12 +858,25 @@ def _tips_picker() -> str:
     return random.choice(tips) if tips else r'\? or "help" for help!'
 
 
+def _configure_editor(mycli: 'MyCli') -> None:
+    if configured_editor := mycli.config['editor'].get('editor_command'):
+        os.environ['VISUAL'] = configured_editor
+    elif not os.environ.get('VISUAL') and not os.environ.get('EDITOR'):
+        if shutil.which('code'):
+            os.environ['VISUAL'] = 'code --wait'
+        elif WIN:
+            os.environ['VISUAL'] = 'edit'
+        else:
+            os.environ['VISUAL'] = 'vi'
+
+
 def main_repl(mycli: 'MyCli') -> None:
     sqlexecute = mycli.sqlexecute
     assert sqlexecute is not None
     state = ReplState()
 
     mycli.configure_pager()
+    _configure_editor(mycli)
     if mycli.smart_completion and not mycli.sandbox_mode:
         mycli.refresh_completions()