diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index da0f305981..5b3bc2496e 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1795,48 +1795,6 @@
- convert
-
- convert(string bytea,
- src_encoding name,
- dest_encoding name)
-
- bytea
-
- Convert string to dest_encoding. The
- original encoding is specified by
- src_encoding. The
- string must be valid in this encoding.
- Conversions can be defined by CREATE CONVERSION.
- Also there are some predefined conversions. See for available conversions.
-
- convert('text_in_utf8', 'UTF8', 'LATIN1')
- text_in_utf8 represented in Latin-1
- encoding (ISO 8859-1)
-
-
-
-
-
- convert_from
-
- convert_from(string bytea,
- src_encoding name)
-
- text
-
- Convert string to the database encoding. The original encoding
- is specified by src_encoding. The
- string must be valid in this encoding.
-
- convert_from('text_in_utf8', 'UTF8')
- text_in_utf8 represented in the current database encoding
-
-
-
-
-
convert_to
convert_to(string text,
@@ -1868,26 +1826,6 @@
-
-
- encode
-
- encode(data bytea,
- format text)
-
- text
-
- Encode binary data into a textual representation. Supported
- formats are: base64, hex, escape.
- escape converts zero bytes and high-bit-set bytes to
- octal sequences (\nnn) and
- doubles backslashes.
-
- encode('123\000\001', 'base64')
- MTIzAAE=
-
-
-
format
@@ -1955,19 +1893,6 @@
- length(string bytea,
- encoding name )
- int
-
- Number of characters in string in the given
- encoding. The string
- must be valid in this encoding.
-
- length('jose', 'UTF8')
- 4
-
-
-
lpad
@@ -2133,18 +2058,6 @@
- quote_nullable(value anyelement)
- text
-
- Coerce the given value to text and then quote it as a literal;
- or, if the argument is null, return NULL.
- Embedded single-quotes and backslashes are properly doubled.
-
- quote_nullable(42.5)
- '42.5'
-
-
-
regexp_match
@@ -2417,22 +2330,6 @@
- to_hex
-
- to_hex(number int
- or bigint)
-
- text
- Convert number to its equivalent hexadecimal
- representation
-
- to_hex(2147483647)
- 7fffffff
-
-
-
-
-
translate
translate(string text,
@@ -3653,47 +3550,72 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
Remove the longest string containing only bytes appearing in
bytes from the start and end of
string
-
+
btrim('\000trim\001'::bytea, '\000\001'::bytea)
trim
-
-
+
+
- decode
+ convert
- decode(string text,
- format text)
-
- bytea
-
- Decode binary data from textual representation in string.
- Options for format are same as in encode.
-
- decode('123\000456', 'escape')
- 123\000456
-
+ convert(string bytea,
+ src_encoding name,
+ dest_encoding name)
+
+ bytea
+
+ Convert string to dest_encoding. The
+ original encoding is specified by
+ src_encoding. The
+ string must be valid in this encoding.
+ Conversions can be defined by CREATE CONVERSION.
+ Also there are some predefined conversions. See for available conversions.
+
+ convert('text_in_utf8', 'UTF8', 'LATIN1')
+ text_in_utf8 represented in Latin-1
+ encoding (ISO 8859-1)
+
-
-
+
+
- encode
+ convert_from
- encode(data bytea,
- format text)
-
- text
-
- Encode binary data into a textual representation. Supported
- formats are: base64, hex, escape.
- escape converts zero bytes and high-bit-set bytes to
- octal sequences (\nnn) and
- doubles backslashes.
-
- encode('123\000456'::bytea, 'escape')
- 123\000456
-
+ convert_from(string bytea,
+ src_encoding name)
+
+ text
+
+ Convert string to the database encoding. The original encoding
+ is specified by src_encoding. The
+ string must be valid in this encoding.
+
+ convert_from('text_in_utf8', 'UTF8')
+ text_in_utf8 represented in the current database encoding
+
+
+
+
+
+ encode
+
+ encode(data bytea,
+ format text)
+
+ text
+
+ Encode binary data into a textual representation. Supported
+ formats are: base64, hex, escape.
+ escape converts zero bytes and high-bit-set bytes to
+ octal sequences (\nnn) and
+ doubles backslashes.
+
+ encode('123\000456'::bytea, 'escape')
+ 123\000456
+
@@ -3725,45 +3647,70 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
109
-
-
-
- length
-
- length(string)
-
- int
-
- Length of binary string
-
- binary string
- length
-
-
- length
- of a binary string
- binary strings, length
-
-
- length('jo\000se'::bytea)
- 5
-
+
+
+
+ length
+
+ length(string)
+
+ int
+
+ Length of binary string
+
+ binary string
+ length
+
+
+ length
+ of a binary string
+ binary strings, length
+
+
+ length('jo\000se'::bytea)
+ 5
+
-
-
-
- md5
-
- md5(string)
-
- text
-
- Calculates the MD5 hash of string,
- returning the result in hexadecimal
-
- md5('Th\000omas'::bytea)
- 8ab2d3c9689aaf18b4958c334c82d8b1
-
+
+ length(string bytea,
+ encoding name )
+ int
+
+ Number of characters in string in the given
+ encoding. The string
+ must be valid in this encoding.
+
+ length('jose', 'UTF8')
+ 4
+
+
+
+
+
+ md5
+
+ md5(string)
+
+ text
+
+ Calculates the MD5 hash of string,
+ returning the result in hexadecimal
+
+ md5('Th\000omas'::bytea)
+ 8ab2d3c9689aaf18b4958c334c82d8b1
+
+
+
+ quote_nullable(value anyelement)
+ text
+
+ Coerce the given value to text and then quote it as a literal;
+ or, if the argument is null, return NULL.
+ Embedded single-quotes and backslashes are properly doubled.
+
+ quote_nullable(42.5)
+ '42.5'
+
@@ -3856,6 +3803,22 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
sha512('abc')
\xddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f
+
+
+
+
+ to_hex
+
+ to_hex(number int
+ or bigint)
+
+ text
+ Convert number to its equivalent hexadecimal
+ representation
+
+ to_hex(2147483647)
+ 7fffffff
+