mycli 2.29.6__tar.gz → 2.30.0__tar.gz

{mycli-2.29.6 → mycli-2.30.0}/.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
-      - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+      - uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
         with:
           version: "latest"
 
@@ -66,7 +66,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
-      - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+      - uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
         with:
           version: "latest"
 
@@ -116,7 +116,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
-      - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+      - uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
         with:
           version: 'latest'
 
@@ -220,7 +220,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
-      - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+      - uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
         with:
           version: "latest"
 

{mycli-2.29.6 → mycli-2.30.0}/.github/workflows/publish.yml

@@ -51,7 +51,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-    - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+    - uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
       with:
         version: "latest"
 
@@ -93,7 +93,7 @@ jobs:
     steps:
     - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
-    - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+    - uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
       with:
         version: "latest"
 
@@ -144,7 +144,7 @@ jobs:
     steps:
     - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
-    - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+    - uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
       with:
         version: 'latest'
 
@@ -248,7 +248,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-    - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+    - uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
       with:
         version: "latest"
 

{mycli-2.29.6/mycli.egg-info → mycli-2.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mycli
-Version: 2.29.6
+Version: 2.30.0
 Summary: Rich MySQL terminal client with autocompletion, syntax highlighting, and dataframes
 Author: Mycli Core Team
 License-Expression: BSD-3-Clause
@@ -38,7 +38,7 @@ Requires-Dist: sqlparse~=0.6.0
 Requires-Dist: sqlglot~=30.23.0
 Requires-Dist: sqlglotc~=30.23.0
 Requires-Dist: configobj~=5.0.9
-Requires-Dist: cli_helpers[styles]~=2.15.1
+Requires-Dist: cli_helpers[styles]~=2.15.2
 Requires-Dist: wcwidth~=0.9.2
 Requires-Dist: pyperclip~=1.11.0
 Requires-Dist: pycryptodomex~=3.24.0
@@ -67,7 +67,7 @@ Requires-Dist: pytest-cov~=7.1.0; extra == "dev"
 Requires-Dist: pytest-random-order~=1.2.0; extra == "dev"
 Requires-Dist: tox~=4.64.9; extra == "dev"
 Requires-Dist: pdbpp~=0.12.1; extra == "dev"
-Requires-Dist: ruff~=0.16.5; extra == "dev"
+Requires-Dist: ruff~=0.17.0; extra == "dev"
 Dynamic: license-file
 
 # mycli

{mycli-2.29.6 → mycli-2.30.0}/changelog.md

@@ -1,3 +1,31 @@
+v2.30.6 (2026/10/17)
+==============
+
+Features
+--------
+* Populate history file in Docker with examples.
+* Faster dynamic completions via faster `--list-dsn`.
+
+
+Bug Fixes
+--------
+* Show the username in the Docker prompt.
+* Show the username in the prompt if a default user was used.
+
+
+Documentation
+--------
+* Dataframe transforms are no longer experimental.
+* Update key bindings doc.
+
+
+Internal
+--------
+* Update `cli_helpers` to v2.15.2, improving vertical output.
+* Update `ruff` to v0.17.0.
+* Complete moving `MyCli` to `client.py`.
+
+
 v2.29.6 (2026/10/15)
 ==============
 

mycli-2.30.0/doc/key_bindings.md

@@ -0,0 +1,155 @@
+# Key Bindings
+
+There are two major editing modes available: Emacs mode and Vi mode.  The mode
+can be changed via the `key_bindings` property in the config file (`~/.myclirc`) or
+toggled via the <kbd>F4</kbd> key.
+
+Emacs mode is the default. In Emacs mode you can type <kbd>Control-a</kbd> to go
+to the beginning of a line, <kbd>Control-e</kbd> to go to the end of a line,
+with many more options for navigation, similar to the defaults of the [readline](https://tiswww.case.edu/php/chet/readline/rluserman.html)
+library.
+
+When Vi mode is enabled you can use vi-style navigation, along with modal
+editing features offered by Vim in the REPL, including text objects.
+
+Most key bindings are simply inherited from [prompt-toolkit](https://python-prompt-toolkit.readthedocs.io/en/master/index.html).
+
+Mycli also adds some custom keybindings which are summarized here along with
+completion navigation.
+
+## The Basics: Custom Bindings and Completion Navigation
+
+### <kbd>F1</kbd>
+
+Open the web documentation index in a browser tab.
+
+### <kbd>F2</kbd>
+
+Toggle smart completions.
+
+### <kbd>F3</kbd>
+
+Toggle multi-line mode.
+
+### <kbd>F4</kbd>
+
+Toggle Emacs/Vi editing modes.
+
+### <kbd>Tab</kbd>
+
+Summon completions + always advance in candidates (configurable).
+
+### <kbd>Control-Space</kbd>
+
+Summon completions or advance in candidates if present (configurable).
+
+### <kbd>Enter</kbd>
+
+Choose a completion candidate.
+
+### <kbd>Esc</kbd>
+
+Cancel the completions popup.
+
+### <kbd>Control-g</kbd>
+
+Cancel the completions popup.
+
+### <kbd>Control-r</kbd>
+
+Search the query history with [fzf](https://github.com/junegunn/fzf) if available, or use
+[prompt-toolkit](https://python-prompt-toolkit.readthedocs.io/en/master/index.html)'s
+`reverse-i-search` as a fallback (configurable).
+
+### <kbd>Alt-Enter</kbd>
+
+Introduce a line break in multi-line mode, or dispatch the current query in
+single-line mode.
+
+The keyboard combination <kbd>Alt-Enter</kbd> usually sends the sequence
+`ESC`,`Enter` on the wire, and it may also be possible to use the <kbd>ESC</kbd>,<kbd>Enter</kbd>
+key sequence.
+
+### Arrow keys
+
+Completion navigation (when popup is present).
+
+### Right-arrow
+
+Accept full-line history suggestion (when suggestion is visible).
+
+### <kbd>Control-d</kbd>
+
+Exit the REPL (configurable).
+
+## In Emacs Mode Only
+
+A comma indicates a sequence of multiple keystrokes.
+
+### <kbd>Control-x</kbd>, <kbd>p</kbd>
+
+Prettify and indent the current statement, usually into multiple lines.
+
+Only works for buffers containing single SQL statements.
+
+### <kbd>Control-x</kbd>, <kbd>u</kbd>
+
+Unprettify and dedent the current statement, usually into one line.
+
+Only works for buffers containing single SQL statements.
+
+### <kbd>Control-o</kbd>, <kbd>d</kbd>
+
+Insert the current literal date at the cursor, as defined by `NOW()` on the
+server.
+
+### <kbd>Control-o</kbd>, <kbd>t</kbd>
+
+Insert the current literal datetime at the cursor, as defined by `NOW()` on
+the server.
+
+### <kbd>Control-o</kbd>, <kbd>Control-d</kbd>
+
+Insert the _quoted_ current literal date at the cursor, as defined by `NOW()`
+on the server.
+
+### <kbd>Control-o</kbd>, <kbd>Control-t</kbd>
+
+Insert the _quoted_ current literal datetime at the cursor, as defined by
+`NOW()` on the server.
+
+### <kbd>Control-o</kbd>, <kbd>u</kbd>
+
+Insert the current literal Unix timestamp at the cursor, in seconds, as defined
+by `time.time()` on the client.
+
+### <kbd>Control-o</kbd>, <kbd>Control-u</kbd>
+
+Insert the current literal Unix timestamp at the cursor, in microseconds, as
+defined by `time.time()` on the client.
+
+### <kbd>Alt-r</kbd>
+
+Search query history with [fzf](https://github.com/junegunn/fzf) even if `~/.myclirc`
+is configured not to use fuzzy search on the default key <kbd>Control-r</kbd>.
+
+## Advanced
+
+Since <kbd>Alt</kbd> key combinations usually work by sending a series of characters
+on the wire, there is sometimes an ambiguity with regard to which characters were
+physically typed.  A timeout heuristic is used to resolve this.
+
+Advanced users, and those on slow connections, may want to consult the following
+settings in `~/.myclirc` to adjust the timeout heuristic.  The threshold is separate
+for Emacs and Vi edit modes:
+
+```ini
+[keys]
+# How long to wait for an Escape key sequence in vi mode.
+# 0.5 seconds is the prompt_toolkit default, but vi users may find that too long.
+# Shorter values mean that "Escape" alone is recognized more quickly.
+vi_ttimeoutlen = 0.1
+
+# How long to wait for an Escape key sequence in Emacs mode.
+emacs_ttimeoutlen = 0.5
+```

{mycli-2.29.6 → mycli-2.30.0}/doc/transforms.md

@@ -2,6 +2,12 @@
 
 ## Installing
 
+### Homebrew
+
+No additional steps needed; Homebrew already comes with dataframe support.
+
+### pip
+
 Install mycli with dataframe support using:
 
 ```bash
@@ -14,18 +20,13 @@ or install these libraries separately:
  * [`altair`](https://pypi.org/project/altair/)
  * [`vl-convert-python`](https://pypi.org/project/vl-convert-python/)
 
-## BETA STATUS
-
-Dataframe transforms and plots are new and experimental.  The interface and
-functionality may still change.
-
-Here are some known limitations:
-
- * composing multiple transform operations is not supported
- * results from `UNION`s may be unable to be transformed
+## Limitations
 
-And there are inherent limitations to the post-processing model: the entire
-SQL result must be transferred from the server and loaded into local memory.
+ * composing multiple transform operations is not supported, though there is no
+   limitation on the code within one operation
+ * results from `UNION`s may not be able to be transformed
+ * the post-processing model means that the entire SQL result must be transferred
+   from the server and loaded into local memory
 
 ## Transforming
 

{mycli-2.29.6 → mycli-2.30.0}/docker/Dockerfile

@@ -13,6 +13,7 @@ RUN apt-get update -qq && \
     rm -rf /var/lib/{apt,dpkg,cache,log}/
 
 COPY . /app
+COPY docker/resources/dot_mycli_history.txt /root/.mycli-history
 
 RUN service mariadb restart && \
     cd /app/docker/resources && \
@@ -24,4 +25,4 @@ RUN service mariadb restart && \
 
 RUN cd /app && pip install --root-user-action=ignore -e .[llm,dataframe]
 
-CMD ["sh", "-c", "service mariadb start && mycli --database employees"]
+CMD ["sh", "-c", "service mariadb start && mycli --user root --database employees"]

mycli-2.30.0/docker/resources/dot_mycli_history.txt

@@ -0,0 +1,26 @@
+# 2026-10-08 07:35:11.242332
++SELECT MAX(salary) AS current_salary FROM salaries GROUP BY emp_no .| df['current_salary'].plot.hist();
+
+# 2026-10-09 07:35:11.242332
++SELECT * FROM salaries .| df.group_by('emp_no').len(name='num_raises').with_columns(pl.col('num_raises') - 1);
+
+# 2026-10-10 07:35:11.242332
++SELECT * FROM salaries LIMIT 10000 .| df.describe();
+
+# 2026-10-11 07:35:11.242332
++SELECT employees.first_name, employees.last_name, MAX(salary) AS current_salary FROM salaries JOIN employees ON salaries.emp_no = employees.emp_no GROUP BY salaries.emp_no;
+
+# 2026-10-12 07:35:11.242332
++SELECT salaries.emp_no, MAX(salary) AS current_salary FROM salaries JOIN employees ON salaries.emp_no = employees.emp_no GROUP BY salaries.emp_no;
+
+# 2026-10-13 07:35:11.242332
++DESCRIBE employees;
+
+# 2026-10-14 07:35:11.242332
++SELECT emp_no, MAX(salary) AS current_salary FROM salaries GROUP BY emp_no;
+
+# 2026-10-15 07:35:11.242332
++SELECT emp_no, salary FROM salaries LIMIT 1000;
+
+# 2026-10-16 07:35:11.242332
++DESCRIBE salaries;

{mycli-2.29.6 → mycli-2.30.0}/docker/resources/test_db-1.0.7.tar.gz

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

{mycli-2.29.6 → mycli-2.30.0}/mycli/cli_runner.py

@@ -14,7 +14,7 @@ __lazy_modules__ = [
     'mycli.main_modes.list_dsn',
     'mycli.packages.credentials.password_sources',
     'mycli.packages.integrations.vault.vault_credentials',
-    'mycli.packages.special_commands.dsn_aliases',
+    'mycli.packages.utils.dsn_utils',
     'mycli.packages.utils.cli_utils',
 ]
 
@@ -32,7 +32,7 @@ from mycli.main_modes.batch import main_batch_from_stdin, main_batch_with_progre
 from mycli.main_modes.checkup import main_checkup
 from mycli.main_modes.completions import main_completions
 from mycli.main_modes.execute import main_execute_from_cli
-from mycli.main_modes.list_dsn import main_list_dsn
+from mycli.main_modes.list_dsn import load_list_dsn_config, main_list_dsn
 from mycli.packages.credentials.password_sources import PasswordCandidates
 from mycli.packages.integrations.vault.vault_credentials import (
     DEFAULT_VAULT_EXECUTABLE,
@@ -41,8 +41,8 @@ from mycli.packages.integrations.vault.vault_credentials import (
     VaultError,
     get_field_from_vault,
 )
-from mycli.packages.special_commands.dsn_aliases import INVALID_DSN_ALIAS_ERROR, is_valid_dsn_alias
 from mycli.packages.utils.cli_utils import is_valid_connection_scheme
+from mycli.packages.utils.dsn_utils import INVALID_DSN_ALIAS_ERROR, is_valid_dsn_alias
 
 if TYPE_CHECKING:
     from mycli.main import CliArgs
@@ -122,7 +122,7 @@ def expand_dsn_alias_env_vars(
     )
 
 
-def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory) -> None:
+def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory | None = None) -> None:
     from mycli import main as main_module
 
     if cli_args.completions:
@@ -131,6 +131,32 @@ def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory) -> Non
 
     cli_verbosity = main_module.preprocess_cli_args(cli_args, is_valid_connection_scheme)
 
+    if not cli_args.checkup:
+        if cli_args.csv and cli_args.format not in [None, 'csv']:
+            click.secho("Conflicting --csv and --format arguments.", err=True, fg="red")
+            sys.exit(1)
+
+        if cli_args.table and cli_args.format not in [None, 'table']:
+            click.secho("Conflicting --table and --format arguments.", err=True, fg="red")
+            sys.exit(1)
+
+        if not cli_args.format:
+            cli_args.format = 'default'
+        if cli_args.csv:
+            cli_args.format = 'csv'
+        if cli_args.table:
+            cli_args.format = 'table'
+
+        if cli_args.list_dsn:
+            config = load_list_dsn_config(cli_args.myclirc)
+            verbosity = cli_verbosity or (-1 if config['main'].as_bool('less_chatty') else 0)
+            sys.exit(main_list_dsn(config, verbosity))
+
+    if client_factory is None:
+        import mycli.client as mycli_client
+
+        client_factory = mycli_client.MyCli
+
     mycli = client_factory(
         prompt=cli_args.prompt,
         toolbar_format=cli_args.toolbar,
@@ -147,26 +173,6 @@ def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory) -> Non
         main_checkup(mycli)
         sys.exit(0)
 
-    if cli_args.csv and cli_args.format not in [None, 'csv']:
-        click.secho("Conflicting --csv and --format arguments.", err=True, fg="red")
-        sys.exit(1)
-
-    if cli_args.table and cli_args.format not in [None, 'table']:
-        click.secho("Conflicting --table and --format arguments.", err=True, fg="red")
-        sys.exit(1)
-
-    if not cli_args.format:
-        cli_args.format = 'default'
-
-    if cli_args.csv:
-        cli_args.format = 'csv'
-
-    if cli_args.table:
-        cli_args.format = 'table'
-
-    if cli_args.list_dsn:
-        sys.exit(main_list_dsn(mycli))
-
     dsn_uri = None
     dsn_password: str | None = None
     database: str | None = ''

{mycli-2.29.6 → mycli-2.30.0}/mycli/client.py

@@ -24,10 +24,13 @@ from mycli.client_commands import ClientCommandsMixin, get_config_property_names
 from mycli.client_connection import ClientConnectionMixin
 from mycli.client_query import ClientQueryMixin
 from mycli.config import (
+    SYSTEM_CONFIG_FILES,
     get_mylogin_cnf_path,
+    get_xdg_config_file,
     open_mylogin_cnf,
     read_config_file,
     read_config_files,
+    resolve_user_config_path,
     write_default_config,
 )
 from mycli.constants import DEFAULT_PROMPT
@@ -61,10 +64,8 @@ class MyCli(AppStateMixin, OutputMixin, ClientCommandsMixin, ClientConnectionMix
 
     # check XDG_CONFIG_HOME exists and not an empty string
     xdg_config_home = os.environ.get("XDG_CONFIG_HOME", "~/.config")
-    xdg_config_file = os.path.join(os.path.expanduser(xdg_config_home), "mycli", "myclirc")
-    system_config_files: list[str | IO[str]] = [
-        "/etc/myclirc",
-    ]
+    xdg_config_file = get_xdg_config_file()
+    system_config_files: list[str | IO[str]] = SYSTEM_CONFIG_FILES
 
     def __init__(
         self,
@@ -92,11 +93,7 @@ class MyCli(AppStateMixin, OutputMixin, ClientCommandsMixin, ClientConnectionMix
         self.sandbox_mode: bool = False
         self.checkpoint: IO | None = None
 
-        if myclirc is None:
-            if os.path.exists(self.xdg_config_file):
-                myclirc = self.xdg_config_file
-            else:
-                myclirc = '~/.myclirc'
+        myclirc = resolve_user_config_path(myclirc, xdg_config_file=self.xdg_config_file)
         self.myclirc_path = os.path.abspath(os.path.expanduser(myclirc))
 
         # Load config.

{mycli-2.29.6 → mycli-2.30.0}/mycli/config.py

@@ -1,3 +1,5 @@
+__lazy_modules__ = ['Cryptodome.Cipher']
+
 from copy import copy
 from importlib import resources
 from io import BytesIO, TextIOWrapper
@@ -12,6 +14,22 @@ from configobj import ConfigObj, ConfigObjError
 from Cryptodome.Cipher import AES
 
 logger = logging.getLogger(__name__)
+SYSTEM_CONFIG_FILES: list[str | IO[str]] = ['/etc/myclirc']
+
+
+def get_xdg_config_file() -> str:
+    return os.path.join(os.path.expanduser(os.environ.get('XDG_CONFIG_HOME', '~/.config')), 'mycli', 'myclirc')
+
+
+def resolve_user_config_path(myclirc: str | None, *, xdg_config_file: str | None = None) -> str:
+    if myclirc is not None:
+        return myclirc
+    xdg_config_file = get_xdg_config_file() if xdg_config_file is None else xdg_config_file
+    return xdg_config_file if os.path.exists(xdg_config_file) else '~/.myclirc'
+
+
+def read_user_config(myclirc: str | None) -> ConfigObj:
+    return read_config_files(SYSTEM_CONFIG_FILES + [resolve_user_config_path(myclirc)])
 
 
 class SQLValuePreservingConfigObj(ConfigObj):

{mycli-2.29.6 → mycli-2.30.0}/mycli/main.py

@@ -23,7 +23,6 @@ import clickdc
 
 import mycli as mycli_package
 from mycli.cli_runner import run_from_cli_args
-from mycli.client import MyCli
 from mycli.constants import (
     DEFAULT_PROMPT,
     EMPTY_PASSWORD_FLAG_SENTINEL,
@@ -482,7 +481,7 @@ def click_entrypoint(
 
     """
 
-    run_from_cli_args(cli_args, client_factory=MyCli)
+    run_from_cli_args(cli_args, client_factory=None)
 
 
 def main() -> int | None:

{mycli-2.29.6 → mycli-2.30.0}/mycli/main_modes/list_dsn.py

@@ -1,18 +1,21 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 import click
+from configobj import ConfigObj
+
+from mycli.config import read_user_config
+from mycli.packages.utils.dsn_utils import is_valid_dsn_alias, merge_shared_dsns
 
-from mycli.packages.special_commands.dsn_aliases import is_valid_dsn_alias
 
-if TYPE_CHECKING:
-    from mycli.client import MyCli
+def load_list_dsn_config(myclirc: str | None) -> ConfigObj:
+    config = read_user_config(myclirc)
+    merge_shared_dsns(config, config['main'].get('shared_dsns_file'))
+    return config
 
 
-def main_list_dsn(mycli: 'MyCli') -> int:
+def main_list_dsn(config: ConfigObj, verbosity: int) -> int:
     try:
-        alias_dsn = mycli.config['alias_dsn']
+        alias_dsn = config['alias_dsn']
     except KeyError:
         click.secho('Invalid DSNs found in the config file. Please check the "[alias_dsn]" section in myclirc.', err=True, fg='red')
         return 1
@@ -22,7 +25,7 @@ def main_list_dsn(mycli: 'MyCli') -> int:
     for alias, value in alias_dsn.items():
         if not is_valid_dsn_alias(alias):
             continue
-        if mycli.verbosity >= 1:
+        if verbosity >= 1:
             click.secho(f'{alias} : {value}')
         else:
             click.secho(alias)

{mycli-2.29.6 → mycli-2.30.0}/mycli/packages/execution/sql_execute.py

@@ -320,7 +320,7 @@ class SQLExecute:
         # Update them after the connection is made to ensure that it was a
         # successful connection.
         self.dbname = db
-        self.user = user
+        self.user = user or (conn.user.decode(conn.encoding) if isinstance(conn.user, bytes) else conn.user)
         self.password = password
         self.host = host
         self.port = port

{mycli-2.29.6 → mycli-2.30.0}/mycli/packages/special_commands/dsn_aliases.py

@@ -1,20 +1,17 @@
 from __future__ import annotations
 
-import logging
 import os
 from typing import TYPE_CHECKING, Any
 from urllib.parse import parse_qsl, urlencode, urlsplit, urlunsplit
 
-from mycli.config import log, read_config_file, str_to_bool
+from mycli.config import read_config_file, str_to_bool
 from mycli.constants import DEFAULT_CHARSET, DEFAULT_PROMPT, KNOWN_DSN_QUERY_PARAMS
-
-logger = logging.getLogger(__name__)
+from mycli.packages.utils.dsn_utils import INVALID_DSN_ALIAS_ERROR, is_valid_dsn_alias, merge_shared_dsns
 
 if TYPE_CHECKING:
     from mycli.client import MyCli
 
 DSN_SUBCOMMANDS = {'help', 'list', 'show', 'save', 'edit', 'delete'}
-INVALID_DSN_ALIAS_ERROR = 'Error: DSN aliases cannot start with a dash.'
 MISSING = object()
 
 SSL_QUERY_PARAMS = {
@@ -29,10 +26,6 @@ SSL_QUERY_PARAMS = {
 }
 
 
-def is_valid_dsn_alias(alias: str) -> bool:
-    return not alias.startswith('-')
-
-
 def _config_bool(value: Any) -> bool:
     try:
         return str_to_bool(value)
@@ -108,35 +101,7 @@ Examples:
         shared_dsns_file: str | None = None,
     ) -> DsnAliases:
         aliases = cls(config, mycli, config_file)
-        if not shared_dsns_file:
-            return aliases
-
-        shared_dsns_file = os.path.expanduser(shared_dsns_file)
-        if not os.path.isabs(shared_dsns_file):
-            log(
-                logger,
-                logging.WARNING,
-                f"Shared DSNs file path must be absolute: '{shared_dsns_file}'.",
-            )
-            return aliases
-
-        if not os.path.isfile(shared_dsns_file):
-            log(
-                logger,
-                logging.WARNING,
-                f"Unable to read shared DSNs file '{shared_dsns_file}'.",
-            )
-            return aliases
-
-        shared_config = read_config_file(shared_dsns_file)
-        if shared_config is None:
-            return aliases
-
-        configured_aliases = config.get(cls.section_name, {})
-        shared_aliases = shared_config.get(cls.section_name, {})
-        config[cls.section_name] = {}
-        config[cls.section_name].update(shared_aliases)
-        config[cls.section_name].update(configured_aliases)
+        merge_shared_dsns(config, shared_dsns_file)
         return aliases
 
     def _config_for_write(self) -> Any: