diff options
| author | Michael Paquier <michael@paquier.xyz> | 2020-02-12 13:31:14 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2020-02-12 13:31:14 +0900 |
| commit | dcdbb5a5db09064ac08ff3971c5031281ef2e545 (patch) | |
| tree | 54a28b6847787f095704e72458ae91692a1c38ed | |
| parent | 43e08419708a938236e76cd50de2db512e1c3a0c (diff) | |
| download | postgresql-dcdbb5a5db09064ac08ff3971c5031281ef2e545.tar.gz postgresql-dcdbb5a5db09064ac08ff3971c5031281ef2e545.zip | |
Add %x to default PROMPT1 and PROMPT2 in psql
%d can be used to track if the current connection is in a transaction
block or not, and adding it by default to the prompt has the advantage
to not need a modification of .psqlrc, something not possible depending
on the environment.
This discussion has happened across various sources, and there was a
strong consensus in favor of this change.
Author: Vik Fearing
Reviewed-by: Fabien Coelho
Discussion: https://postgr.es/m/09502c40-cfe1-bb29-10f9-4b3fa7b2bbb2@2ndquadrant.com
| -rw-r--r-- | doc/src/sgml/logicaldecoding.sgml | 6 | ||||
| -rw-r--r-- | doc/src/sgml/ref/psql-ref.sgml | 2 | ||||
| -rw-r--r-- | src/bin/psql/settings.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/sgml/logicaldecoding.sgml b/doc/src/sgml/logicaldecoding.sgml index 8db968641ee..bce6d379bf0 100644 --- a/doc/src/sgml/logicaldecoding.sgml +++ b/doc/src/sgml/logicaldecoding.sgml @@ -92,9 +92,9 @@ postgres=# SELECT * FROM pg_logical_slot_get_changes('regression_slot', NULL, NU (0 rows) postgres=# BEGIN; -postgres=# INSERT INTO data(data) VALUES('1'); -postgres=# INSERT INTO data(data) VALUES('2'); -postgres=# COMMIT; +postgres=*# INSERT INTO data(data) VALUES('1'); +postgres=*# INSERT INTO data(data) VALUES('2'); +postgres=*# COMMIT; postgres=# SELECT * FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL); lsn | xid | data diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 48b081fd58a..20ba1051606 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -4332,7 +4332,7 @@ testdb=> \set PROMPT1 '%[%033[1;33;40m%]%n@%/%R%[%033[0m%]%# ' To insert a percent sign into your prompt, write <literal>%%</literal>. The default prompts are - <literal>'%/%R%# '</literal> for prompts 1 and 2, and + <literal>'%/%R%x%# '</literal> for prompts 1 and 2, and <literal>'>> '</literal> for prompt 3. </para> diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h index d2a9d4836ab..2b384a38a1b 100644 --- a/src/bin/psql/settings.h +++ b/src/bin/psql/settings.h @@ -23,8 +23,8 @@ #define DEFAULT_EDITOR_LINENUMBER_ARG "+" #endif -#define DEFAULT_PROMPT1 "%/%R%# " -#define DEFAULT_PROMPT2 "%/%R%# " +#define DEFAULT_PROMPT1 "%/%R%x%# " +#define DEFAULT_PROMPT2 "%/%R%x%# " #define DEFAULT_PROMPT3 ">> " /* |