NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit1753337

committed

Improve psql's tabular display of wrapped-around data by inserting markers

in the formerly-always-blank columns just to left and right of the data.Different marking is used for a line break caused by a newline in the datathan for a straight wraparound. A newline break is signaled by a "+" in theright margin column in ASCII mode, or a carriage return arrow in UNICODE mode.Wraparound is signaled by a dot in the right margin as well as the followingleft margin in ASCII mode, or an ellipsis symbol in the same places in UNICODEmode. "\pset linestyle old-ascii" is added to make the previous behavioravailable if anyone really wants it.In passing, this commit also cleans up a few regression test files thathad unintended spacing differences from the current actual output.Roger Leigh, reviewed by Gabrielle Roth and other members of PDXPUG.

1 parent93d3bac commit1753337Copy full SHA for 1753337

File tree

19 files changed

+374

-260

lines changed

contrib
- dblink/expected
  - dblink.out
- pgcrypto/expected
- tsearch2/expected
  - tsearch2.out
  - tsearch2_1.out
doc/src/sgml/ref
- psql-ref.sgml
src
- bin/psql
- test/regress/expected

19 files changed

+374

-260

lines changed

`‎contrib/dblink/expected/dblink.out`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -829,51 +829,51 @@ DROP SERVER fdtest;`
`829`	`829`	`DROP FOREIGN DATA WRAPPER postgresql;`
`830`	`830`	`-- test asynchronous notifications`
`831`	`831`	`SELECT dblink_connect('dbname=contrib_regression');`
`832`		`- dblink_connect`
	`832`	`+ dblink_connect`
`833`	`833`	`----------------`
`834`	`834`	`OK`
`835`	`835`	`(1 row)`
`836`	`836`
`837`	`837`	`--should return listen`
`838`	`838`	`SELECT dblink_exec('LISTEN regression');`
`839`		`- dblink_exec`
	`839`	`+ dblink_exec`
`840`	`840`	`-------------`
`841`	`841`	`LISTEN`
`842`	`842`	`(1 row)`
`843`	`843`
`844`	`844`	`--should return listen`
`845`	`845`	`SELECT dblink_exec('LISTEN foobar');`
`846`		`- dblink_exec`
	`846`	`+ dblink_exec`
`847`	`847`	`-------------`
`848`	`848`	`LISTEN`
`849`	`849`	`(1 row)`
`850`	`850`
`851`	`851`	`SELECT dblink_exec('NOTIFY regression');`
`852`		`- dblink_exec`
	`852`	`+ dblink_exec`
`853`	`853`	`-------------`
`854`	`854`	`NOTIFY`
`855`	`855`	`(1 row)`
`856`	`856`
`857`	`857`	`SELECT dblink_exec('NOTIFY foobar');`
`858`		`- dblink_exec`
	`858`	`+ dblink_exec`
`859`	`859`	`-------------`
`860`	`860`	`NOTIFY`
`861`	`861`	`(1 row)`
`862`	`862`
`863`	`863`	`SELECT notify_name, be_pid = (select t.be_pid from dblink('select pg_backend_pid()') as t(be_pid int)) AS is_self_notify, extra from dblink_get_notify();`
`864`		`- notify_name \| is_self_notify \| extra`
	`864`	`+ notify_name \| is_self_notify \| extra`
`865`	`865`	`-------------+----------------+-------`
`866`		`- regression \| t \|`
`867`		`- foobar \| t \|`
	`866`	`+ regression \| t \|`
	`867`	`+ foobar \| t \|`
`868`	`868`	`(2 rows)`
`869`	`869`
`870`	`870`	`SELECT * from dblink_get_notify();`
`871`		`- notify_name \| be_pid \| extra`
	`871`	`+ notify_name \| be_pid \| extra`
`872`	`872`	`-------------+--------+-------`
`873`	`873`	`(0 rows)`
`874`	`874`
`875`	`875`	`SELECT dblink_disconnect();`
`876`		`- dblink_disconnect`
	`876`	`+ dblink_disconnect`
`877`	`877`	`-------------------`
`878`	`878`	`OK`
`879`	`879`	`(1 row)`

`‎contrib/pgcrypto/expected/crypt-blowfish.out`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ CREATE TABLE ctest (data text, res text, salt text);`
`17`	`17`	`INSERT INTO ctest VALUES ('password', '', '');`
`18`	`18`	`UPDATE ctest SET salt = gen_salt('bf', 8);`
`19`	`19`	`UPDATE ctest SET res = crypt(data, salt);`
`20`		`-SELECT res = crypt(data, res) AS "worked"`
	`20`	`+SELECT res = crypt(data, res) AS "worked"`
`21`	`21`	`FROM ctest;`
`22`	`22`	`worked`
`23`	`23`	`--------`

`‎contrib/pgcrypto/expected/pgp-armor.out`

Lines changed: 15 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,21 @@ SET bytea_output TO escape;`
`6`	`6`	`select armor('');`
`7`	`7`	`armor`
`8`	`8`	`-----------------------------`
`9`		`- -----BEGIN PGP MESSAGE-----`
`10`		`-`
`11`		`- =twTO`
`12`		`- -----END PGP MESSAGE-----`
	`9`	`+ -----BEGIN PGP MESSAGE-----+`
	`10`	`+ +`
	`11`	`+ =twTO +`
	`12`	`+ -----END PGP MESSAGE----- +`
`13`	`13`
`14`	`14`	`(1 row)`
`15`	`15`
`16`	`16`	`select armor('test');`
`17`	`17`	`armor`
`18`	`18`	`-----------------------------`
`19`		`- -----BEGIN PGP MESSAGE-----`
`20`		`-`
`21`		`- dGVzdA==`
`22`		`- =+G7Q`
`23`		`- -----END PGP MESSAGE-----`
	`19`	`+ -----BEGIN PGP MESSAGE-----+`
	`20`	`+ +`
	`21`	`+ dGVzdA== +`
	`22`	`+ =+G7Q +`
	`23`	`+ -----END PGP MESSAGE----- +`
`24`	`24`
`25`	`25`	`(1 row)`
`26`	`26`
`@@ -40,12 +40,12 @@ select armor('0123456789abcdef0123456789abcdef0123456789abcdef`
`40`	`40`	`0123456789abcdef0123456789abcdef0123456789abcdef');`
`41`	`41`	`armor`
`42`	`42`	`------------------------------------------------------------------------------`
`43`		`- -----BEGIN PGP MESSAGE-----`
`44`		`-`
`45`		`- MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmCjAxMjM0NTY3`
`46`		`- ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmMDEyMzQ1Njc4OWFiY2RlZg==`
`47`		`- =JFw5`
`48`		`- -----END PGP MESSAGE-----`
	`43`	`+ -----BEGIN PGP MESSAGE----- +`
	`44`	`+ +`
	`45`	`+ MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmCjAxMjM0NTY3+`
	`46`	`+ ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmMDEyMzQ1Njc4OWFiY2RlZg== +`
	`47`	`+ =JFw5 +`
	`48`	`+ -----END PGP MESSAGE----- +`
`49`	`49`
`50`	`50`	`(1 row)`
`51`	`51`

`‎contrib/pgcrypto/expected/pgp-decrypt.out`

Lines changed: 20 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ yA6Ce1QTMK3KdL2MPfamsTUSAML8huCJMwYQFfE=`
`11`	`11`	`=JcP+`
`12`	`12`	`-----END PGP MESSAGE-----`
`13`	`13`	`'), 'foobar');`
`14`		`-pgp_sym_decrypt`
	`14`	`+ pgp_sym_decrypt`
`15`	`15`	`-----------------`
`16`	`16`	`Secret message.`
`17`	`17`	`(1 row)`
`@@ -25,7 +25,7 @@ UTAsG35A1vYs02VARKzGz6xI2UHwFUirP+brPBg3Ee7muOx8pA==`
`25`	`25`	`=XtrP`
`26`	`26`	`-----END PGP MESSAGE-----`
`27`	`27`	`'), 'foobar');`
`28`		`-pgp_sym_decrypt`
	`28`	`+ pgp_sym_decrypt`
`29`	`29`	`-----------------`
`30`	`30`	`Secret message.`
`31`	`31`	`(1 row)`
`@@ -39,7 +39,7 @@ jA0ECAMCI7YQpWqp3D1g0kQBCjB7GlX7+SQeXNleXeXQ78ZAPNliquGDq9u378zI`
`39`	`39`	`=rCZt`
`40`	`40`	`-----END PGP MESSAGE-----`
`41`	`41`	`'), 'foobar');`
`42`		`-pgp_sym_decrypt`
	`42`	`+ pgp_sym_decrypt`
`43`	`43`	`-----------------`
`44`	`44`	`Secret message.`
`45`	`45`	`(1 row)`
`@@ -53,7 +53,7 @@ lceMfQdbAg6oTFyJpk/wH18GzRDphCofg0X8uLgkAKMrpcmgog==`
`53`	`53`	`=fB6S`
`54`	`54`	`-----END PGP MESSAGE-----`
`55`	`55`	`'), 'foobar');`
`56`		`-pgp_sym_decrypt`
	`56`	`+ pgp_sym_decrypt`
`57`	`57`	`-----------------`
`58`	`58`	`Secret message.`
`59`	`59`	`(1 row)`
`@@ -68,7 +68,7 @@ u9YkgfJfsuRJmgQ9tmo=`
`68`	`68`	`=60ui`
`69`	`69`	`-----END PGP MESSAGE-----`
`70`	`70`	`'), 'foobar');`
`71`		`-pgp_sym_decrypt`
	`71`	`+ pgp_sym_decrypt`
`72`	`72`	`-----------------`
`73`	`73`	`Secret message.`
`74`	`74`	`(1 row)`
`@@ -82,7 +82,7 @@ jA0EBwMCEeP3idNjQ1Bg0kQBf4G0wX+2QNzLh2YNwYkQgQkfYhn/hLXjV4nK9nsE`
`82`	`82`	`=moGf`
`83`	`83`	`-----END PGP MESSAGE-----`
`84`	`84`	`'), 'foobar');`
`85`		`-pgp_sym_decrypt`
	`85`	`+ pgp_sym_decrypt`
`86`	`86`	`-----------------`
`87`	`87`	`Secret message.`
`88`	`88`	`(1 row)`
`@@ -97,7 +97,7 @@ KyRrHf7zEBuZiZ2AG34jNVMOLToj1jJUg5zTSdecUzQVCykWTA==`
`97`	`97`	`=NyLk`
`98`	`98`	`-----END PGP MESSAGE-----`
`99`	`99`	`'), 'foobar');`
`100`		`-pgp_sym_decrypt`
	`100`	`+ pgp_sym_decrypt`
`101`	`101`	`-----------------`
`102`	`102`	`Secret message.`
`103`	`103`	`(1 row)`
`@@ -111,7 +111,7 @@ jA0EBwMCApbdlrURoWJg0kQBzHM/E0o7djY82bNuspjxjAcPFrrtp0uvDdMQ4z2m`
`111`	`111`	`=FxbQ`
`112`	`112`	`-----END PGP MESSAGE-----`
`113`	`113`	`'), 'foobar');`
`114`		`-pgp_sym_decrypt`
	`114`	`+ pgp_sym_decrypt`
`115`	`115`	`-----------------`
`116`	`116`	`Secret message.`
`117`	`117`	`(1 row)`
`@@ -126,7 +126,7 @@ Ah9GXjGS1TVALzTImJbz1uHUZRfhJlFbc5yGQw==`
`126`	`126`	`=YvkV`
`127`	`127`	`-----END PGP MESSAGE-----`
`128`	`128`	`'), 'foobar');`
`129`		`-pgp_sym_decrypt`
	`129`	`+ pgp_sym_decrypt`
`130`	`130`	`-----------------`
`131`	`131`	`Secret message.`
`132`	`132`	`(1 row)`
`@@ -140,7 +140,7 @@ jAwEBwEC/QTByBLI3b/SRAHPxKzI6SZBo5lAEOD+EsvKQWO4adL9tDY+++Iqy1xK`
`140`	`140`	`=dbXm`
`141`	`141`	`-----END PGP MESSAGE-----`
`142`	`142`	`'), 'foobar');`
`143`		`-pgp_sym_decrypt`
	`143`	`+ pgp_sym_decrypt`
`144`	`144`	`-----------------`
`145`	`145`	`Secret message.`
`146`	`146`	`(1 row)`
`@@ -154,7 +154,7 @@ z+9ZaA/XdSx5ZiFnMym8P6r8uY9rLjjNptvvRHlxIReF+p9MNg==`
`154`	`154`	`=VJKg`
`155`	`155`	`-----END PGP MESSAGE-----`
`156`	`156`	`'), 'foobar');`
`157`		`-pgp_sym_decrypt`
	`157`	`+ pgp_sym_decrypt`
`158`	`158`	`-----------------`
`159`	`159`	`Secret message.`
`160`	`160`	`(1 row)`
`@@ -168,7 +168,7 @@ Cr3i2M7TgVZ0M4jp4QL0adG1lpN5iK7aQeOwMw==`
`168`	`168`	`=cg+i`
`169`	`169`	`-----END PGP MESSAGE-----`
`170`	`170`	`'), 'foobar');`
`171`		`-pgp_sym_decrypt`
	`171`	`+ pgp_sym_decrypt`
`172`	`172`	`-----------------`
`173`	`173`	`Secret message.`
`174`	`174`	`(1 row)`
`@@ -182,7 +182,7 @@ jAwECAECruOfyNDFiTnSRAEVoGXm4A9UZKkWljdzjEO/iaE7mIraltIpQMkiqCh9`
`182`	`182`	`=aHmC`
`183`	`183`	`-----END PGP MESSAGE-----`
`184`	`184`	`'), 'foobar');`
`185`		`-pgp_sym_decrypt`
	`185`	`+ pgp_sym_decrypt`
`186`	`186`	`-----------------`
`187`	`187`	`Secret message.`
`188`	`188`	`(1 row)`
`@@ -196,7 +196,7 @@ q6eF6859ZVnli3BFSDSk3a4e/pXhglxmDYCfjAXkozKNYLo6yw==`
`196`	`196`	`=K0LS`
`197`	`197`	`-----END PGP MESSAGE-----`
`198`	`198`	`'), 'foobar');`
`199`		`-pgp_sym_decrypt`
	`199`	`+ pgp_sym_decrypt`
`200`	`200`	`-----------------`
`201`	`201`	`Secret message.`
`202`	`202`	`(1 row)`
`@@ -210,7 +210,7 @@ rQr3WbdKdY9ufjOE5+mXI+EFkSPrF9rL9NCq6w==`
`210`	`210`	`=RGts`
`211`	`211`	`-----END PGP MESSAGE-----`
`212`	`212`	`'), 'foobar');`
`213`		`-pgp_sym_decrypt`
	`213`	`+ pgp_sym_decrypt`
`214`	`214`	`-----------------`
`215`	`215`	`Secret message.`
`216`	`216`	`(1 row)`
`@@ -224,7 +224,7 @@ jAwECQECKHhrou7ZOIXSRAHWIVP+xjVQcjAVBTt+qh9SNzYe248xFTwozkwev3mO`
`224`	`224`	`=SUrU`
`225`	`225`	`-----END PGP MESSAGE-----`
`226`	`226`	`'), 'foobar');`
`227`		`-pgp_sym_decrypt`
	`227`	`+ pgp_sym_decrypt`
`228`	`228`	`-----------------`
`229`	`229`	`Secret message.`
`230`	`230`	`(1 row)`
`@@ -238,7 +238,7 @@ jA0ECQMCjc8lwZu8Fz1g0kQBkEzjImi21liep5jj+3dAJ2aZFfUkohi8b3n9z+7+`
`238`	`238`	`=XZrG`
`239`	`239`	`-----END PGP MESSAGE-----`
`240`	`240`	`'), 'foobar');`
`241`		`-pgp_sym_decrypt`
	`241`	`+ pgp_sym_decrypt`
`242`	`242`	`-----------------`
`243`	`243`	`Secret message.`
`244`	`244`	`(1 row)`
`@@ -253,7 +253,7 @@ tTGup1mMz6Cfh1uDRErUuXpx9A0gdMu7zX0o5XjrL7WGDAZdSw==`
`253`	`253`	`=XKKG`
`254`	`254`	`-----END PGP MESSAGE-----`
`255`	`255`	`'), '0123456789abcdefghij');`
`256`		`-pgp_sym_decrypt`
	`256`	`+ pgp_sym_decrypt`
`257`	`257`	`-----------------`
`258`	`258`	`Secret message.`
`259`	`259`	`(1 row)`
`@@ -267,7 +267,7 @@ CMxFKadf144H/vpoV9GA0f22keQgCl0EsTE4V4lweVOPTKCMJg==`
`267`	`267`	`=gWDh`
`268`	`268`	`-----END PGP MESSAGE-----`
`269`	`269`	`'), '0123456789abcdefghij2jk4h5g2j54khg23h54g2kh54g2khj54g23hj54');`
`270`		`-pgp_sym_decrypt`
	`270`	`+ pgp_sym_decrypt`
`271`	`271`	`-----------------`
`272`	`272`	`Secret message.`
`273`	`273`	`(1 row)`
`@@ -281,7 +281,7 @@ FwsDabdQUz5O7bgNSnxfmyw1OifGF+W2bIn/8W+0rDf8u3+O+Q==`
`281`	`281`	`=OxOF`
`282`	`282`	`-----END PGP MESSAGE-----`
`283`	`283`	`'), 'x');`
`284`		`-pgp_sym_decrypt`
	`284`	`+ pgp_sym_decrypt`
`285`	`285`	`-----------------`
`286`	`286`	`Secret message.`
`287`	`287`	`(1 row)`

`‎contrib/tsearch2/expected/tsearch2.out`

Lines changed: 21 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -742,8 +742,8 @@ select * from parse('default', '345 qwe@efd.r '' http://www.com/ http://aew.werc`
`742`	`742`	`3 \| ewri2`
`743`	`743`	`12 \|`
`744`	`744`	`13 \| <a href="qwe<qwe>">`
`745`		`- 12 \|`
`746`		`-:`
	`745`	`+ 12 \| +`
	`746`	`+\|`
`747`	`747`	`19 \| /usr/local/fff`
`748`	`748`	`12 \|`
`749`	`749`	`19 \| /awdf/dwqe/4325`
`@@ -775,8 +775,8 @@ select * from parse('default', '345 qwe@efd.r '' http://www.com/ http://aew.werc`
`775`	`775`	`20 \| -4.2`
`776`	`776`	`12 \| .`
`777`	`777`	`22 \| 234`
`778`		`- 12 \|`
`779`		`-:`
	`778`	`+ 12 \| +`
	`779`	`+\|`
`780`	`780`	`12 \| <`
`781`	`781`	`1 \| i`
`782`	`782`	`12 \|`
`@@ -2330,8 +2330,8 @@ Upon a woman s face. E. J. Pratt (1882 1964)`
`2330`	`2330`	`', to_tsquery('sea&thousand&years'));`
`2331`	`2331`	`headline`
`2332`	`2332`	`--------------------------------------------`
`2333`		`- <b>sea</b> a <b>thousand</b> <b>years</b>,`
`2334`		`- A <b>thousand</b> <b>years</b> to trace`
	`2333`	`+ <b>sea</b> a <b>thousand</b> <b>years</b>,+`
	`2334`	`+ A <b>thousand</b> <b>years</b> to trace +`
`2335`	`2335`	`The granite features of this cliff`
`2336`	`2336`	`(1 row)`
`2337`	`2337`
`@@ -2347,8 +2347,8 @@ Upon a woman s face. E. J. Pratt (1882 1964)`
`2347`	`2347`	`', to_tsquery('granite&sea'));`
`2348`	`2348`	`headline`
`2349`	`2349`	`-------------------------------------------`
`2350`		`- <b>sea</b> a thousand years,`
`2351`		`- A thousand years to trace`
	`2350`	`+ <b>sea</b> a thousand years, +`
	`2351`	`+ A thousand years to trace +`
`2352`	`2352`	`The <b>granite</b> features of this cliff`
`2353`	`2353`	`(1 row)`
`2354`	`2354`
`@@ -2364,8 +2364,8 @@ Upon a woman s face. E. J. Pratt (1882 1964)`
`2364`	`2364`	`', to_tsquery('sea'));`
`2365`	`2365`	`headline`
`2366`	`2366`	`------------------------------------`
`2367`		`- <b>sea</b> a thousand years,`
`2368`		`- A thousand years to trace`
	`2367`	`+ <b>sea</b> a thousand years, +`
	`2368`	`+ A thousand years to trace +`
`2369`	`2369`	`The granite features of this cliff`
`2370`	`2370`	`(1 row)`
`2371`	`2371`
`@@ -2384,17 +2384,17 @@ ff-bg`
`2384`	`2384`	`to_tsquery('sea&foo'), 'HighlightAll=true');`
`2385`	`2385`	`headline`
`2386`	`2386`	`-----------------------------------------------------------------------------`
`2387`		`-`
`2388`		`- <html>`
`2389`		`- <!-- some comment -->`
`2390`		`- <body>`
`2391`		`- <b>Sea</b> view wow <u><b>foo</b> bar</u> <i>qq</i>`
`2392`		`- <a href="http://www.google.com/foo.bar.html" target="_blank">YES  </a>`
`2393`		`-ff-bg`
`2394`		`- <script>`
`2395`		`- document.write(15);`
`2396`		`- </script>`
`2397`		`- </body>`
	`2387`	`+ +`
	`2388`	`+ <html> +`
	`2389`	`+ <!-- some comment --> +`
	`2390`	`+ <body> +`
	`2391`	`+ <b>Sea</b> view wow <u><b>foo</b> bar</u> <i>qq</i> +`
	`2392`	`+ <a href="http://www.google.com/foo.bar.html" target="_blank">YES  </a>+`
	`2393`	`+ ff-bg +`
	`2394`	`+ <script> +`
	`2395`	`+ document.write(15); +`
	`2396`	`+ </script> +`
	`2397`	`+ </body> +`
`2398`	`2398`	`</html>`
`2399`	`2399`	`(1 row)`
`2400`	`2400`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1753337

File tree

19 files changed

19 files changed

`‎contrib/dblink/expected/dblink.out`

`‎contrib/pgcrypto/expected/crypt-blowfish.out`

`‎contrib/pgcrypto/expected/pgp-armor.out`

`‎contrib/pgcrypto/expected/pgp-decrypt.out`

`‎contrib/tsearch2/expected/tsearch2.out`

0 commit comments