NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit61e2c00

committed

Have SHOW ALL include variable descriptions.

Matthias Schmidt

1 parentcf48d8b commit61e2c00Copy full SHA for 61e2c00

File tree

2 files changed

+23

-16

lines changed

doc/src/sgml/ref
- show.sgml
src/backend/utils/misc
- guc.c

2 files changed

+23

-16

lines changed

`‎doc/src/sgml/ref/show.sgml‎`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<!--`
`2`		`-$PostgreSQL: pgsql/doc/src/sgml/ref/show.sgml,v 1.38 2005/04/08 00:59:58 neilc Exp $`
	`2`	`+$PostgreSQL: pgsql/doc/src/sgml/ref/show.sgml,v 1.39 2005/06/14 20:42:52 momjian Exp $`
`3`	`3`	`PostgreSQL documentation`
`4`	`4`	`-->`
`5`	`5`
`@@ -118,7 +118,7 @@ SHOW ALL`
`118`	`118`	`<term><literal>ALL</literal></term>`
`119`	`119`	`<listitem>`
`120`	`120`	`<para>`
`121`		`- Show the values of all configuration parameters.`
	`121`	`+ Show the values of all configuration parameters, with descriptions.`
`122`	`122`	`</para>`
`123`	`123`	`</listitem>`
`124`	`124`	`</varlistentry>`
`@@ -164,17 +164,17 @@ SHOW geqo;`
`164`	`164`	`Show all settings:`
`165`	`165`	`<programlisting>`
`166`	`166`	`SHOW ALL;`
`167`		`- name \|setting`
`168`		`---------------------------------+----------------------------------------------`
`169`		`- add_missing_from \| off`
`170`		`- archive_command \| unset`
`171`		`- australian_timezones \| off`
	`167`	`+ name \|setting \| description`
	`168`	`+--------------------------------+--------------------------------+----------------------------------------------------------------------------------------------`
	`169`	`+ add_missing_from \| off \| Automatically adds missing table references to FROM clauses.`
	`170`	`+ archive_command \| unset \| WAL archiving command.`
	`171`	`+ australian_timezones \| off \| Interprets ACST, CST, EST, and SAT as Australian time zones.`
`172`	`172`	`.`
`173`	`173`	`.`
`174`	`174`	`.`
`175`		`- work_mem \| 1024`
`176`		`- zero_damaged_pages \| off`
`177`		`-(140 rows)`
	`175`	`+ work_mem \| 1024 \| Sets the maximum memory to be used for query workspaces.`
	`176`	`+ zero_damaged_pages \| off \| Continues processing past damaged page headers.`
	`177`	`+(146 rows)`
`178`	`178`	`</programlisting>`
`179`	`179`	`</para>`
`180`	`180`	`</refsect1>`

`‎src/backend/utils/misc/guc.c‎`

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.265 2005/06/1417:43:13 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.266 2005/06/1420:42:53 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -4337,12 +4337,15 @@ GetPGVariableResultDesc(const char *name)`
`4337`	`4337`
`4338`	`4338`	`if (pg_strcasecmp(name,"all")==0)`
`4339`	`4339`	`{`
`4340`		`-/* need a tuple descriptor representingtwo TEXT columns */`
`4341`		`-tupdesc=CreateTemplateTupleDesc(2, false);`
	`4340`	`+/* need a tuple descriptor representingthree TEXT columns */`
	`4341`	`+tupdesc=CreateTemplateTupleDesc(3, false);`
`4342`	`4342`	`TupleDescInitEntry(tupdesc, (AttrNumber)1,"name",`
`4343`	`4343`	`TEXTOID,-1,0);`
`4344`	`4344`	`TupleDescInitEntry(tupdesc, (AttrNumber)2,"setting",`
`4345`	`4345`	`TEXTOID,-1,0);`
	`4346`	`+TupleDescInitEntry(tupdesc, (AttrNumber)3,"description",`
	`4347`	`+TEXTOID,-1,0);`
	`4348`	`+`
`4346`	`4349`	`}`
`4347`	`4350`	`else`
`4348`	`4351`	`{`
`@@ -4415,14 +4418,17 @@ ShowAllGUCConfig(DestReceiver *dest)`
`4415`	`4418`	`inti;`
`4416`	`4419`	`TupOutputState*tstate;`
`4417`	`4420`	`TupleDesctupdesc;`
`4418`		`-char*values[2];`
	`4421`	`+char*values[3];`
`4419`	`4422`
`4420`		`-/* need a tuple descriptor representingtwo TEXT columns */`
`4421`		`-tupdesc=CreateTemplateTupleDesc(2, false);`
	`4423`	`+/* need a tuple descriptor representingthree TEXT columns */`
	`4424`	`+tupdesc=CreateTemplateTupleDesc(3, false);`
`4422`	`4425`	`TupleDescInitEntry(tupdesc, (AttrNumber)1,"name",`
`4423`	`4426`	`TEXTOID,-1,0);`
`4424`	`4427`	`TupleDescInitEntry(tupdesc, (AttrNumber)2,"setting",`
`4425`	`4428`	`TEXTOID,-1,0);`
	`4429`	`+TupleDescInitEntry(tupdesc, (AttrNumber)3,"description",`
	`4430`	`+TEXTOID,-1,0);`
	`4431`	`+`
`4426`	`4432`
`4427`	`4433`	`/* prepare for projection of tuples */`
`4428`	`4434`	`tstate=begin_tup_output_tupdesc(dest,tupdesc);`
`@@ -4438,6 +4444,7 @@ ShowAllGUCConfig(DestReceiver *dest)`
`4438`	`4444`	`/* assign to the values array */`
`4439`	`4445`	`values[0]= (char*)conf->name;`
`4440`	`4446`	`values[1]=_ShowOption(conf);`
	`4447`	`+values[2]= (char*)conf->short_desc;`
`4441`	`4448`
`4442`	`4449`	`/* send it to dest */`
`4443`	`4450`	`do_tup_output(tstate,values);`

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!

Commit61e2c00

File tree

2 files changed

2 files changed

`‎doc/src/sgml/ref/show.sgml‎`

`‎src/backend/utils/misc/guc.c‎`

0 commit comments