diff options
| author | Tom Lane | 2020-04-07 21:46:29 +0000 |
|---|---|---|
| committer | Tom Lane | 2020-04-07 21:46:29 +0000 |
| commit | b63c293bcbd7439f883cd4cf748f6755df0fbb3c (patch) | |
| tree | 0852b2e4c0850d0bdd51507f931475e834feadb5 /src/test | |
| parent | 0f5ca02f53ac2b211d8518f0882c49284c0c9610 (diff) | |
Allow psql's \g and \gx commands to transiently change \pset options.
We invented \gx to allow the "\pset expanded" flag to be forced on
for the duration of one command output, but that turns out to not
be nearly enough to satisfy the demand for variant output formats.
Hence, make it possible to change any pset option(s) for the duration
of a single command output, by writing "option=value ..." inside
parentheses, for example
\g (format=csv csv_fieldsep='\t') somefile
\gx can now be understood as a shorthand for including expanded=on
inside the parentheses.
Patch by me, expanding on a proposal by Pavel Stehule
Discussion: https://postgr.es/m/CAFj8pRBx9OnBPRJVtfA5ycUpySge-XootAXAsv_4rrkHxJ8eRg@mail.gmail.com
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/expected/psql.out | 22 | ||||
| -rw-r--r-- | src/test/regress/sql/psql.sql | 7 |
2 files changed, 29 insertions, 0 deletions
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out index 2423ae2f37f..0b990fd814a 100644 --- a/src/test/regress/expected/psql.out +++ b/src/test/regress/expected/psql.out @@ -76,6 +76,28 @@ four | 4 (1 row) \unset FETCH_COUNT +-- \g/\gx with pset options +SELECT 1 as one, 2 as two \g (format=csv csv_fieldsep='\t') +one two +1 2 +\g + one | two +-----+----- + 1 | 2 +(1 row) + +SELECT 1 as one, 2 as two \gx (title='foo bar') +foo bar +-[ RECORD 1 ] +one | 1 +two | 2 + +\g + one | two +-----+----- + 1 | 2 +(1 row) + -- \gset select 10 as test01, 20 as test02, 'Hello' as test03 \gset pref01_ \echo :pref01_test01 :pref01_test02 :pref01_test03 diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql index 3c876d26992..d462c357bd5 100644 --- a/src/test/regress/sql/psql.sql +++ b/src/test/regress/sql/psql.sql @@ -38,6 +38,13 @@ SELECT 3 as three, 4 as four \gx \unset FETCH_COUNT +-- \g/\gx with pset options + +SELECT 1 as one, 2 as two \g (format=csv csv_fieldsep='\t') +\g +SELECT 1 as one, 2 as two \gx (title='foo bar') +\g + -- \gset select 10 as test01, 20 as test02, 'Hello' as test03 \gset pref01_ |