database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Allow invisible PROMPT2 in psql.

Browse Source 
Keep track of the visible width of PROMPT1, and provide %w as a way
for PROMPT2 to generate the same number of spaces.

Author: Thomas Munro, with ideas from others
Reviewed-by: Tom Lane (earlier version)
Discussion: https://postgr.es/m/CA%2BhUKG%2BzGd7RigjWbxwhzGW59gUpf76ydQECeGdEdodH6nd__A%40mail.gmail.com
This commit is contained in:
Thomas Munro
2019-11-19 15:17:15 +13:00
parent cec2edfa78
commit 7f338369ca
2 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doc/src/sgml/ref/psql-ref.sgml
View File

@ -4310,6 +4310,18 @@ testdb=> \set PROMPT1 '%[%033[1;33;40m%]%n@%/%R%[%033[0m%]%# '
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><literal>%w</literal></term>
<listitem>
<para>
Whitespace of the same width as the most recent output of
<varname>PROMPT1</varname>. This can be used as a
<varname>PROMPT2</varname> setting, so that multi-line statements are
aligned with the first line, but there is no visible secondary prompt.
</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
To insert a percent sign into your prompt, write To insert a percent sign into your prompt, write

52
src/bin/psql/prompt.c
View File

@ -39,6 +39,7 @@
* %n - database user name * %n - database user name
* %/ - current database * %/ - current database
* %~ - like %/ but "~" when database name equals user name * %~ - like %/ but "~" when database name equals user name
* %w - whitespace of the same width as the most recent output of PROMPT1
* %# - "#" if superuser, ">" otherwise * %# - "#" if superuser, ">" otherwise
* %R - in prompt1 normally =, or ^ if single line mode, * %R - in prompt1 normally =, or ^ if single line mode,
* or a ! if session is not connected to a database; * or a ! if session is not connected to a database;
@ -74,6 +75,7 @@ get_prompt(promptStatus_t status, ConditionalStack cstack)
bool esc = false; bool esc = false;
const char *p; const char *p;
const char *prompt_string = "? "; const char *prompt_string = "? ";
static size_t last_prompt1_width = 0;
switch (status) switch (status)
{ {
@ -124,6 +126,13 @@ get_prompt(promptStatus_t status, ConditionalStack cstack)
} }
break; break;
/* Whitespace of the same width as the last PROMPT1 */
case 'w':
if (pset.db)
memset(buf, ' ',
Min(last_prompt1_width, sizeof(buf) - 1));
break;
/* DB server hostname (long/short) */ /* DB server hostname (long/short) */
case 'M': case 'M':
case 'm': case 'm':
@ -336,5 +345,48 @@ get_prompt(promptStatus_t status, ConditionalStack cstack)
strlcat(destination, buf, sizeof(destination)); strlcat(destination, buf, sizeof(destination));
} }
/* Compute the visible width of PROMPT1, for PROMPT2's %w */
if (prompt_string == pset.prompt1)
{
char *p = destination;
char *end = p + strlen(p);
bool visible = true;
last_prompt1_width = 0;
while (*p)
{
#if defined(USE_READLINE) && defined(RL_PROMPT_START_IGNORE)
if (*p == RL_PROMPT_START_IGNORE)
{
visible = false;
++p;
}
else if (*p == RL_PROMPT_END_IGNORE)
{
visible = true;
++p;
}
else
#endif
{
int chlen,
chwidth;
chlen = PQmblen(p, pset.encoding);
if (p + chlen > end)
break; /* Invalid string */
if (visible)
{
chwidth = PQdsplen(p, pset.encoding);
if (chwidth > 0)
last_prompt1_width += chwidth;
}
p += chlen;
}
}
}
return destination; return destination;
} }