reference/pgsql/functions/pg-client-encoding.xml
ad618eea48c773ff8768d9d27ea986f81a2a2400
ad618eea48c773ff8768d9d27ea986f81a2a2400
...
...
@@ -13,7 +13,7 @@
13
13
&reftitle.description;
14
14
<methodsynopsis>
15
15
<type>string</type><methodname>pg_client_encoding</methodname>
16
-
<methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
16
+
<methodparam choice="opt"><type class="union"><type>PgSql\Connection</type><type>null</type></type><parameter>connection</parameter><initializer>&null;</initializer></methodparam>
17
17
</methodsynopsis>
18
18
<para>
19
19
PostgreSQL supports automatic character set conversion between
...
...
@@ -24,7 +24,7 @@
24
24
</para>
25
25
<note>
26
26
<para>
27
-
This function requires PHP 4.0.3 or higher and PostgreSQL 7.0 or
27
+
This function requires PostgreSQL 7.0 or
28
28
higher. If libpq is compiled without multibyte encoding support,
29
29
<function>pg_client_encoding</function> always returns
30
30
<literal>SQL_ASCII</literal>. Supported encoding depends on PostgreSQL
...
...
@@ -43,12 +43,7 @@
43
43
<varlistentry>
44
44
<term><parameter>connection</parameter></term>
45
45
<listitem>
46
-
<para>
47
-
PostgreSQL database connection resource. When
48
-
<parameter>connection</parameter> is not present, the default connection
49
-
is used. The default connection is the last connection made by
50
-
<function>pg_connect</function> or <function>pg_pconnect</function>.
51
-
</para>
46
+
&pgsql.parameter.connection-with-nullable-default;
52
47
</listitem>
53
48
</varlistentry>
54
49
</variablelist>
...
...
@@ -58,10 +53,33 @@
58
53
<refsect1 role="returnvalues">
59
54
&reftitle.returnvalues;
60
55
<para>
61
-
The client encoding, or &false; on error.
56
+
The client encoding.
62
57
</para>
63
58
</refsect1>
64
59
60
+
<refsect1 role="changelog">
61
+
&reftitle.changelog;
62
+
<informaltable>
63
+
<tgroup cols="2">
64
+
<thead>
65
+
<row>
66
+
<entry>&Version;</entry>
67
+
<entry>&Description;</entry>
68
+
</row>
69
+
</thead>
70
+
<tbody>
71
+
&pgsql.changelog.connection-object;
72
+
<row>
73
+
<entry>8.0.0</entry>
74
+
<entry>
75
+
<parameter>connection</parameter> is now nullable.
76
+
</entry>
77
+
</row>
78
+
</tbody>
79
+
</tgroup>
80
+
</informaltable>
81
+
</refsect1>
82
+
65
83
<refsect1 role="examples">
66
84
&reftitle.examples;
67
85
<para>
...
...
@@ -96,7 +114,6 @@ Client encoding is: ISO-8859-1
96
114
</para>
97
115
</refsect1>
98
116
</refentry>
99
-
100
117
<!-- Keep this comment at the end of the file
101
118
Local variables:
102
119
mode: sgml
103
120