-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Done. Attached.
- --
Jon T Erdman (aka StuckMojo)
    PostgreSQL Zealot

On 01/22/2013 11:17 PM, Phil Sorber wrote:
> On Wed, Jan 23, 2013 at 12:10 AM, Jon Erdman 
> <postgre...@thewickedtribe.net> wrote:
> 
> Updated the patch in commitfest with the doc change, and added a 
> comment to explain the whitespace change (it was to clean up the
> sql indentation). I've also attached the new patch here for
> reference.
> 
>> Docs looks good. Spaces gone.
> 
>> Still need to replace 'definer' and 'invoker' with %s and add
>> the corresponding gettext_noop() calls I think.
> 
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iEYEARECAAYFAlD/dcoACgkQRAk1+p0GhSEKHQCZAW8UNqSjYxBgBvt2nuffrkrV
+9AAn1hChpY5Jg8G8T3XmlIb+3VUSEQ2
=3cFD
-----END PGP SIGNATURE-----
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
new file mode 100644
index c41593c..0eb6b63
*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
*************** testdb=&gt;
*** 1188,1194 ****
          class="parameter">pattern</replaceable> is specified, only
          functions whose names match the pattern are shown.  If the
          form <literal>\df+</literal> is used, additional information
!         about each function, including volatility, language, source
          code and description, is shown.  By default, only user-created
          objects are shown; supply a pattern or the <literal>S</literal>
          modifier to include system objects.
--- 1188,1194 ----
          class="parameter">pattern</replaceable> is specified, only
          functions whose names match the pattern are shown.  If the
          form <literal>\df+</literal> is used, additional information
!         about each function, including security, volatility, language, source
          code and description, is shown.  By default, only user-created
          objects are shown; supply a pattern or the <literal>S</literal>
          modifier to include system objects.
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
new file mode 100644
index 15d02ee..3dadc09
*** a/src/bin/psql/describe.c
--- b/src/bin/psql/describe.c
*************** describeFunctions(const char *functypes,
*** 254,260 ****
  						  "  WHEN p.proiswindow THEN '%s'\n"
  						  "  WHEN p.prorettype = 'pg_catalog.trigger'::pg_catalog.regtype THEN '%s'\n"
  						  "  ELSE '%s'\n"
! 						  "END as \"%s\"",
  						  gettext_noop("Result data type"),
  						  gettext_noop("Argument data types"),
  		/* translator: "agg" is short for "aggregate" */
--- 254,260 ----
  						  "  WHEN p.proiswindow THEN '%s'\n"
  						  "  WHEN p.prorettype = 'pg_catalog.trigger'::pg_catalog.regtype THEN '%s'\n"
  						  "  ELSE '%s'\n"
! 						  " END as \"%s\"",
  						  gettext_noop("Result data type"),
  						  gettext_noop("Argument data types"),
  		/* translator: "agg" is short for "aggregate" */
*************** describeFunctions(const char *functypes,
*** 329,342 ****
  	if (verbose)
  		appendPQExpBuffer(&buf,
  						  ",\n CASE\n"
  						  "  WHEN p.provolatile = 'i' THEN '%s'\n"
  						  "  WHEN p.provolatile = 's' THEN '%s'\n"
  						  "  WHEN p.provolatile = 'v' THEN '%s'\n"
! 						  "END as \"%s\""
  				   ",\n  pg_catalog.pg_get_userbyid(p.proowner) as \"%s\",\n"
  						  "  l.lanname as \"%s\",\n"
  						  "  p.prosrc as \"%s\",\n"
  				  "  pg_catalog.obj_description(p.oid, 'pg_proc') as \"%s\"",
  						  gettext_noop("immutable"),
  						  gettext_noop("stable"),
  						  gettext_noop("volatile"),
--- 329,349 ----
  	if (verbose)
  		appendPQExpBuffer(&buf,
  						  ",\n CASE\n"
+ 						  "  WHEN prosecdef THEN '%s'\n"
+ 						  "  ELSE '%s'\n"
+ 						  " END AS \"%s\""
+ 						  ",\n CASE\n"
  						  "  WHEN p.provolatile = 'i' THEN '%s'\n"
  						  "  WHEN p.provolatile = 's' THEN '%s'\n"
  						  "  WHEN p.provolatile = 'v' THEN '%s'\n"
! 						  " END as \"%s\""
  				   ",\n  pg_catalog.pg_get_userbyid(p.proowner) as \"%s\",\n"
  						  "  l.lanname as \"%s\",\n"
  						  "  p.prosrc as \"%s\",\n"
  				  "  pg_catalog.obj_description(p.oid, 'pg_proc') as \"%s\"",
+ 						  gettext_noop("definer"),
+ 						  gettext_noop("invoker"),
+ 						  gettext_noop("Security"),
  						  gettext_noop("immutable"),
  						  gettext_noop("stable"),
  						  gettext_noop("volatile"),

Attachment: 0x9D068521.asc
Description: application/pgp-keys

-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

Reply via email to