reference/pgsql/functions/pg-options.xml
c2eca73ef79ebe78cebb34053e41b565af504c4f
c2eca73ef79ebe78cebb34053e41b565af504c4f
...
...
@@ -11,12 +11,12 @@
11
11
&reftitle.description;
12
12
<methodsynopsis>
13
13
<type>string</type><methodname>pg_options</methodname>
14
-
<methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
14
+
<methodparam choice="opt"><type class="union"><type>PgSql\Connection</type><type>null</type></type><parameter>connection</parameter><initializer>&null;</initializer></methodparam>
15
15
</methodsynopsis>
16
16
<para>
17
17
<function>pg_options</function> will return a string containing
18
18
the options specified on the given PostgreSQL
19
-
<parameter>connection</parameter> resource.
19
+
<parameter>connection</parameter> instance.
20
20
</para>
21
21
</refsect1>
22
22
...
...
@@ -27,12 +27,7 @@
27
27
<varlistentry>
28
28
<term><parameter>connection</parameter></term>
29
29
<listitem>
30
-
<para>
31
-
PostgreSQL database connection resource. When
32
-
<parameter>connection</parameter> is not present, the default connection
33
-
is used. The default connection is the last connection made by
34
-
<function>pg_connect</function> or <function>pg_pconnect</function>.
35
-
</para>
30
+
&pgsql.parameter.connection-with-nullable-default;
36
31
</listitem>
37
32
</varlistentry>
38
33
</variablelist>
...
...
@@ -43,10 +38,33 @@
43
38
&reftitle.returnvalues;
44
39
<para>
45
40
A <type>string</type> containing the <parameter>connection</parameter>
46
-
options, or &false; on error.
41
+
options.
47
42
</para>
48
43
</refsect1>
49
44
45
+
<refsect1 role="changelog">
46
+
&reftitle.changelog;
47
+
<informaltable>
48
+
<tgroup cols="2">
49
+
<thead>
50
+
<row>
51
+
<entry>&Version;</entry>
52
+
<entry>&Description;</entry>
53
+
</row>
54
+
</thead>
55
+
<tbody>
56
+
&pgsql.changelog.connection-object;
57
+
<row>
58
+
<entry>8.0.0</entry>
59
+
<entry>
60
+
<parameter>connection</parameter> is now nullable.
61
+
</entry>
62
+
</row>
63
+
</tbody>
64
+
</tgroup>
65
+
</informaltable>
66
+
</refsect1>
67
+
50
68
<refsect1 role="examples">
51
69
&reftitle.examples;
52
70
<para>
...
...
@@ -73,7 +91,6 @@
73
91
</para>
74
92
</refsect1>
75
93
</refentry>
76
-
77
94
<!-- Keep this comment at the end of the file
78
95
Local variables:
79
96
mode: sgml
80
97