这是indexloc提供的服务，不要输入任何密码
Skip to content

Only read "my" configuration files once, rather than once per call to… #1339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 4, 2025
Merged

Only read "my" configuration files once, rather than once per call to… #1339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
Upcoming (TBD)
==============

Internal
--------
* Only read "my" configuration files once, rather than once per call to read_my_cnf_files


1.38.3 (2025/08/21)
==============

Expand Down
19 changes: 10 additions & 9 deletions mycli/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from cli_helpers.tabular_output import TabularOutputFormatter, preprocessors
from cli_helpers.utils import strip_ansi
import click
from configobj import ConfigObj
from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
from prompt_toolkit.completion import Completion, DynamicCompleter
from prompt_toolkit.document import Document
Expand Down Expand Up @@ -172,9 +173,6 @@ def __init__(
self.logger = logging.getLogger(__name__)
self.initialize_logging()

prompt_cnf = self.read_my_cnf_files(self.cnf_files, ["prompt"])["prompt"]
self.prompt_format = prompt or prompt_cnf or c["main"]["prompt"] or self.default_prompt
self.multiline_continuation_char = c["main"]["prompt_continuation"]
keyword_casing = c["main"].get("keyword_casing", "auto")

self.query_history: list[Query] = []
Expand All @@ -200,6 +198,10 @@ def __init__(
# There was an error reading the login path file.
print("Error: Unable to read login path file.")

self.my_cnf = read_config_files(self.cnf_files, list_values=False)
prompt_cnf = self.read_my_cnf(self.my_cnf, ["prompt"])["prompt"]
self.prompt_format = prompt or prompt_cnf or c["main"]["prompt"] or self.default_prompt
self.multiline_continuation_char = c["main"]["prompt_continuation"]
self.prompt_app = None

def register_special_commands(self) -> None:
Expand Down Expand Up @@ -339,14 +341,13 @@ def initialize_logging(self) -> None:
root_logger.debug("Initializing mycli logging.")
root_logger.debug("Log file %r.", log_file)

def read_my_cnf_files(self, files: list[str | TextIOWrapper], keys: list[str]) -> dict[str, Any]:
def read_my_cnf(self, cnf: ConfigObj, keys: list[str]) -> dict[str, Any]:
"""
Reads a list of config files and merges them. The last one will win.
:param files: list of files to read
Retrieves some keys from a configuration, applies transformations, returns a new configuration.
:param cnf: configuration to read
:param keys: list of keys to retrieve
:returns: tuple, with None for missing keys.
"""
cnf = read_config_files(files, list_values=False)

sections = ["client", "mysqld"]
key_transformations = {
Expand Down Expand Up @@ -433,7 +434,7 @@ def connect(
"ssl-verify-server-cert": None,
}

cnf = self.read_my_cnf_files(self.cnf_files, list(cnf.keys()))
cnf = self.read_my_cnf(self.my_cnf, list(cnf.keys()))

# Fall back to config values only if user did not specify a value.
database = database or cnf["database"]
Expand Down Expand Up @@ -1080,7 +1081,7 @@ def configure_pager(self) -> None:
if not os.environ.get("LESS"):
os.environ["LESS"] = "-RXF"

cnf = self.read_my_cnf_files(self.cnf_files, ["pager", "skip-pager"])
cnf = self.read_my_cnf(self.my_cnf, ["pager", "skip-pager"])
cnf_pager = cnf["pager"] or self.config["main"]["pager"]

# help Windows users who haven't edited the default myclirc
Expand Down