diff options
| -rw-r--r-- | doc/src/sgml/func.sgml | 17 | ||||
| -rw-r--r-- | src/include/catalog/catversion.h | 4 | ||||
| -rw-r--r-- | src/include/catalog/pg_proc.h | 4 |
3 files changed, 19 insertions, 6 deletions
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 24b1931caea..a3baee14489 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.411 2007/11/08 13:13:28 petere Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.412 2007/11/27 18:29:11 tgl Exp $ --> <chapter id="functions"> <title>Functions and Operators</title> @@ -1514,7 +1514,7 @@ </row> <row> - <entry><literal><function>quote_ident</function>(<parameter>string</parameter>)</literal></entry> + <entry><literal><function>quote_ident</function>(<parameter>string</parameter> <type>text</type>)</literal></entry> <entry><type>text</type></entry> <entry> Return the given string suitably quoted to be used as an identifier @@ -1528,7 +1528,7 @@ </row> <row> - <entry><literal><function>quote_literal</function>(<parameter>string</parameter>)</literal></entry> + <entry><literal><function>quote_literal</function>(<parameter>string</parameter> <type>text</type>)</literal></entry> <entry><type>text</type></entry> <entry> Return the given string suitably quoted to be used as a string literal @@ -1540,6 +1540,17 @@ </row> <row> + <entry><literal><function>quote_literal</function>(<parameter>value</parameter> <type>anyelement</type>)</literal></entry> + <entry><type>text</type></entry> + <entry> + Coerce the given value to text and then quote it as a literal. + Embedded single-quotes and backslashes are properly doubled. + </entry> + <entry><literal>quote_literal(42.5)</literal></entry> + <entry><literal>'42.5'</literal></entry> + </row> + + <row> <entry><literal><function>regexp_matches</function>(<parameter>string</parameter> <type>text</type>, <parameter>pattern</parameter> <type>text</type> [, <parameter>flags</parameter> <type>text</type>])</literal></entry> <entry><type>setof text[]</type></entry> <entry> diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 036d004b555..345ce3bced4 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.438 2007/11/27 12:21:05 petere Exp $ + * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.439 2007/11/27 18:29:11 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 200711271 +#define CATALOG_VERSION_NO 200711272 #endif diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 1472437f715..424a8bd2a8e 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.479 2007/11/27 12:21:05 petere Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.480 2007/11/27 18:29:11 tgl Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -2631,6 +2631,8 @@ DATA(insert OID = 1282 ( quote_ident PGNSP PGUID 12 1 0 f f t f i 1 25 "25" DESCR("quote an identifier for usage in a querystring"); DATA(insert OID = 1283 ( quote_literal PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_ quote_literal - _null_ _null_ )); DESCR("quote a literal for usage in a querystring"); +DATA(insert OID = 1285 ( quote_literal PGNSP PGUID 14 1 0 f f t f v 1 25 "2283" _null_ _null_ _null_ "select pg_catalog.quote_literal($1::pg_catalog.text)" - _null_ _null_ )); +DESCR("quote a data value for usage in a querystring"); DATA(insert OID = 1798 ( oidin PGNSP PGUID 12 1 0 f f t f i 1 26 "2275" _null_ _null_ _null_ oidin - _null_ _null_ )); DESCR("I/O"); |