Commit0cdc3e4

committed

psql: Fix \gx when FETCH_COUNT is used

Set expanded output when requested through \gx in ExecQueryUsingCursor()(used when FETCH_COUNT is set).Discussion:https://www.postgresql.org/message-id/CB7A53AA-5645-4BDD-AB07-4D22CD9D8FF1%40gmx.netAuthor: Tobias Bussmann

1 parent6ce6a61 commit0cdc3e4Copy full SHA for 0cdc3e4

File tree

+39

-0

lines changed

+39

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1565,6 +1565,10 @@ ExecQueryUsingCursor(const char query, double elapsed_msec)`
`1565`	`1565`	`"FETCH FORWARD %d FROM _psql_cursor",`
`1566`	`1566`	`fetch_count);`
`1567`	`1567`
	`1568`	`+/* one-shot expanded output requested via \gx */`
	`1569`	`+if (pset.g_expanded)`
	`1570`	`+my_popt.topt.expanded=1;`
	`1571`	`+`
`1568`	`1572`	`/* prepare to write output to \g argument, if any */`
`1569`	`1573`	`if (pset.gfname)`
`1570`	`1574`	`{`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,31 @@ four \| 4`
`51`	`51`	`3 \| 4`
`52`	`52`	`(1 row)`
`53`	`53`
	`54`	`+-- \gx should work in FETCH_COUNT mode too`
	`55`	`+\set FETCH_COUNT 1`
	`56`	`+SELECT 1 as one, 2 as two \g`
	`57`	`+ one \| two`
	`58`	`+-----+-----`
	`59`	`+ 1 \| 2`
	`60`	`+(1 row)`
	`61`	`+`
	`62`	`+\gx`
	`63`	`+-[ RECORD 1 ]`
	`64`	`+one \| 1`
	`65`	`+two \| 2`
	`66`	`+`
	`67`	`+SELECT 3 as three, 4 as four \gx`
	`68`	`+-[ RECORD 1 ]`
	`69`	`+three \| 3`
	`70`	`+four \| 4`
	`71`	`+`
	`72`	`+\g`
	`73`	`+ three \| four`
	`74`	`+-------+------`
	`75`	`+ 3 \| 4`
	`76`	`+(1 row)`
	`77`	`+`
	`78`	`+\unset FETCH_COUNT`
`54`	`79`	`-- \gset`
`55`	`80`	`select 10 as test01, 20 as test02, 'Hello' as test03 \gset pref01_`
`56`	`81`	`\echo :pref01_test01 :pref01_test02 :pref01_test03`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,16 @@ SELECT 1 as one, 2 as two \g`
`28`	`28`	`SELECT3as three,4as four \gx`
`29`	`29`	`\g`
`30`	`30`
	`31`	`+-- \gx should work in FETCH_COUNT mode too`
	`32`	`+\set FETCH_COUNT1`
	`33`	`+`
	`34`	`+SELECT1as one,2as two \g`
	`35`	`+\gx`
	`36`	`+SELECT3as three,4as four \gx`
	`37`	`+\g`
	`38`	`+`
	`39`	`+\unset FETCH_COUNT`
	`40`	`+`
`31`	`41`	`-- \gset`
`32`	`42`
`33`	`43`	`select10as test01,20as test02,'Hello'as test03 \gset pref01_`

Comments

(0)