Honor PSQL_EDITOR when opening the external editor - #1616
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Closes #1398. psql lets you point
\eat a dedicated editor viaPSQL_EDITORso it doesn't have to be whateverEDITOR/VISUALyou use everywhere else, and pgcli didn't respect it.pgcli hands editing off to
pgspecial.open_external_editor, which callsclick.edit()and lets click resolve the editor fromVISUAL/EDITOR. That function already takes aneditor=override, we just weren't passing anything. I added a smallget_editor()helper that mirrors psql's lookup order (PSQL_EDITOR, thenEDITOR, thenVISUAL) and threaded its result through both editor call sites (\e/\ev/\efand\ne). When none of those are set it returnsNone, which keeps click's existing platform-default behaviour, so nobody who wasn't settingPSQL_EDITORsees a change.Test-wise I added
test_get_editor_precedenceassertingPSQL_EDITORwins overEDITOR/VISUAL, that it falls back toEDITORthenVISUAL, and returnsNonewhen the environment is empty. Ranpython -m pytest tests/test_main.py -k "editor or named_query"(2 passed) and the fulltests/test_main.py(60 passed, 10 db skips).ruff checkandruff format --diffare both clean.Checklist
changelog.rst.AUTHORSfile (or it's already there).pip install pre-commit && pre-commit install).