Skip to content

Commit 48a62a0

Browse files
mumumumumumu
committed
Syn docs with ibm_db2 stubs
* Sync with latest stub * Update db2_statistics() unique param description php/doc-en@871b717
1 parent 398cc9b commit 48a62a0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+145
-202
lines changed

‎reference/ibm_db2/functions/db2-autocommit.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 7c206ea9b06ee55a8b6d9c5f3c7efd7bd9239c91 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 871b71764cdca8238069f27436d96011a6a2cb36 Maintainer: takagi Status: ready -->
44
<refentry xml:id="function.db2-autocommit" xmlns="http://docbook.org/ns/docbook">
55
<refnamediv>
66
<refname>db2_autocommit</refname>
@@ -11,9 +11,9 @@
1111
<refsect1 role="description">
1212
&reftitle.description;
1313
<methodsynopsis>
14-
<type>mixed</type><methodname>db2_autocommit</methodname>
14+
<type class="union"><type>int</type><type>bool</type></type><methodname>db2_autocommit</methodname>
1515
<methodparam><type>resource</type><parameter>connection</parameter></methodparam>
16-
<methodparam choice="opt"><type>bool</type><parameter>value</parameter></methodparam>
16+
<methodparam choice="opt"><type>int</type><parameter>value</parameter></methodparam>
1717
</methodsynopsis>
1818

1919
<para>
@@ -162,7 +162,6 @@ AUTOCOMMIT を有効にしました。
162162
</refsect1>
163163

164164
</refentry>
165-
166165
<!-- Keep this comment at the end of the file
167166
Local variables:
168167
mode: sgml

‎reference/ibm_db2/functions/db2-bind-param.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 59d2ecdcbfb345bd297502389c4a1c55784b812b Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 871b71764cdca8238069f27436d96011a6a2cb36 Maintainer: takagi Status: ready -->
44
<refentry xml:id="function.db2-bind-param" xmlns="http://docbook.org/ns/docbook">
55
<refnamediv>
66
<refname>db2_bind_param</refname>
@@ -15,7 +15,7 @@
1515
<methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
1616
<methodparam><type>int</type><parameter>parameter_number</parameter></methodparam>
1717
<methodparam><type>string</type><parameter>variable_name</parameter></methodparam>
18-
<methodparam choice="opt"><type>int</type><parameter>parameter_type</parameter></methodparam>
18+
<methodparam choice="opt"><type>int</type><parameter>parameter_type</parameter><initializer><constant>DB2_PARAM_IN</constant></initializer></methodparam>
1919
<methodparam choice="opt"><type>int</type><parameter>data_type</parameter><initializer>0</initializer></methodparam>
2020
<methodparam choice="opt"><type>int</type><parameter>precision</parameter><initializer>-1</initializer></methodparam>
2121
<methodparam choice="opt"><type>int</type><parameter>scale</parameter><initializer>0</initializer></methodparam>
@@ -287,7 +287,6 @@ $rc = db2_execute($stmt);
287287
</refsect1>
288288

289289
</refentry>
290-
291290
<!-- Keep this comment at the end of the file
292291
Local variables:
293292
mode: sgml

‎reference/ibm_db2/functions/db2-client-info.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 871b71764cdca8238069f27436d96011a6a2cb36 Maintainer: takagi Status: ready -->
44
<refentry xml:id="function.db2-client-info" xmlns="http://docbook.org/ns/docbook">
55
<refnamediv>
66
<refname>db2_client_info</refname>
@@ -11,7 +11,7 @@
1111
<refsect1 role="description">
1212
&reftitle.description;
1313
<methodsynopsis>
14-
<type>object</type><methodname>db2_client_info</methodname>
14+
<type class="union"><type>stdClass</type><type>false</type></type><methodname>db2_client_info</methodname>
1515
<methodparam><type>resource</type><parameter>connection</parameter></methodparam>
1616
</methodsynopsis>
1717

@@ -147,7 +147,8 @@
147147
<refsect1 role="returnvalues">
148148
&reftitle.returnvalues;
149149
<para>
150-
成功した場合にオブジェクト、失敗した場合に &false; を返します。
150+
成功した場合にオブジェクトを返します。
151+
&return.falseforfailure;
151152
</para>
152153
</refsect1>
153154

@@ -244,7 +245,6 @@ CONN_CODEPAGE: int(819)
244245

245246

246247
</refentry>
247-
248248
<!-- Keep this comment at the end of the file
249249
Local variables:
250250
mode: sgml

‎reference/ibm_db2/functions/db2-column-privileges.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 871b71764cdca8238069f27436d96011a6a2cb36 Maintainer: takagi Status: ready -->
44
<refentry xml:id="function.db2-column-privileges" xmlns="http://docbook.org/ns/docbook">
55
<refnamediv>
66
<refname>db2_column_privileges</refname>
@@ -13,10 +13,10 @@
1313
<methodsynopsis>
1414
<type>resource</type><methodname>db2_column_privileges</methodname>
1515
<methodparam><type>resource</type><parameter>connection</parameter></methodparam>
16-
<methodparam choice="opt"><type>string</type><parameter>qualifier</parameter></methodparam>
17-
<methodparam choice="opt"><type>string</type><parameter>schema</parameter></methodparam>
18-
<methodparam choice="opt"><type>string</type><parameter>table-name</parameter></methodparam>
19-
<methodparam choice="opt"><type>string</type><parameter>column-name</parameter></methodparam>
16+
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>qualifier</parameter><initializer>&null;</initializer></methodparam>
17+
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter><initializer>&null;</initializer></methodparam>
18+
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>table_name</parameter><initializer>&null;</initializer></methodparam>
19+
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>column_name</parameter><initializer>&null;</initializer></methodparam>
2020
</methodsynopsis>
2121

2222

@@ -56,7 +56,7 @@
5656
</listitem>
5757
</varlistentry>
5858
<varlistentry>
59-
<term><parameter>table-name</parameter></term>
59+
<term><parameter>table_name</parameter></term>
6060
<listitem>
6161
<para>
6262
テーブルあるいはビューの名前。データベース内のすべてのテーブルに一致させるには、
@@ -65,7 +65,7 @@
6565
</listitem>
6666
</varlistentry>
6767
<varlistentry>
68-
<term><parameter>column-name</parameter></term>
68+
<term><parameter>column_name</parameter></term>
6969
<listitem>
7070
<para>
7171
カラムの名前。テーブル内のすべてのカラムに一致させるには、
@@ -179,7 +179,6 @@ Use the PEAR Coding Standards
179179
</refsect1>
180180

181181
</refentry>
182-
183182
<!-- Keep this comment at the end of the file
184183
Local variables:
185184
mode: sgml

‎reference/ibm_db2/functions/db2-columns.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 871b71764cdca8238069f27436d96011a6a2cb36 Maintainer: takagi Status: ready -->
44
<refentry xml:id="function.db2-columns" xmlns="http://docbook.org/ns/docbook">
55
<refnamediv>
66
<refname>db2_columns</refname>
@@ -13,10 +13,10 @@
1313
<methodsynopsis>
1414
<type>resource</type><methodname>db2_columns</methodname>
1515
<methodparam><type>resource</type><parameter>connection</parameter></methodparam>
16-
<methodparam choice="opt"><type>string</type><parameter>qualifier</parameter></methodparam>
17-
<methodparam choice="opt"><type>string</type><parameter>schema</parameter></methodparam>
18-
<methodparam choice="opt"><type>string</type><parameter>table-name</parameter></methodparam>
19-
<methodparam choice="opt"><type>string</type><parameter>column-name</parameter></methodparam>
16+
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>qualifier</parameter><initializer>&null;</initializer></methodparam>
17+
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter><initializer>&null;</initializer></methodparam>
18+
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>table_name</parameter><initializer>&null;</initializer></methodparam>
19+
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>column_name</parameter><initializer>&null;</initializer></methodparam>
2020
</methodsynopsis>
2121

2222
<para>
@@ -55,7 +55,7 @@
5555
</listitem>
5656
</varlistentry>
5757
<varlistentry>
58-
<term><parameter>table-name</parameter></term>
58+
<term><parameter>table_name</parameter></term>
5959
<listitem>
6060
<para>
6161
テーブルあるいはビューの名前。データベース内のすべてのテーブルに一致させるには、
@@ -64,7 +64,7 @@
6464
</listitem>
6565
</varlistentry>
6666
<varlistentry>
67-
<term><parameter>column-name</parameter></term>
67+
<term><parameter>column_name</parameter></term>
6868
<listitem>
6969
<para>
7070
カラムの名前。テーブル内のすべてのカラムに一致させるには、
@@ -240,7 +240,6 @@ Use the PEAR Coding Standards
240240
</refsect1>
241241

242242
</refentry>
243-
244243
<!-- Keep this comment at the end of the file
245244
Local variables:
246245
mode: sgml

‎reference/ibm_db2/functions/db2-conn-error.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 871b71764cdca8238069f27436d96011a6a2cb36 Maintainer: takagi Status: ready -->
44
<refentry xml:id="function.db2-conn-error" xmlns="http://docbook.org/ns/docbook">
55
<refnamediv>
66
<refname>db2_conn_error</refname>
@@ -12,7 +12,7 @@
1212
&reftitle.description;
1313
<methodsynopsis>
1414
<type>string</type><methodname>db2_conn_error</methodname>
15-
<methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
15+
<methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>connection</parameter><initializer>&null;</initializer></methodparam>
1616
</methodsynopsis>
1717

1818

@@ -103,7 +103,6 @@ SQLSTATE の値: 08001
103103

104104

105105
</refentry>
106-
107106
<!-- Keep this comment at the end of the file
108107
Local variables:
109108
mode: sgml

‎reference/ibm_db2/functions/db2-conn-errormsg.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 871b71764cdca8238069f27436d96011a6a2cb36 Maintainer: takagi Status: ready -->
44
<refentry xml:id="function.db2-conn-errormsg" xmlns="http://docbook.org/ns/docbook">
55
<refnamediv>
66
<refname>db2_conn_errormsg</refname>
@@ -12,7 +12,7 @@
1212
&reftitle.description;
1313
<methodsynopsis>
1414
<type>string</type><methodname>db2_conn_errormsg</methodname>
15-
<methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
15+
<methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>connection</parameter><initializer>&null;</initializer></methodparam>
1616
</methodsynopsis>
1717

1818
<para>
@@ -98,7 +98,6 @@ or database name "BADNAME" could not be found. SQLSTATE=42705
9898
</refsect1>
9999

100100
</refentry>
101-
102101
<!-- Keep this comment at the end of the file
103102
Local variables:
104103
mode: sgml

‎reference/ibm_db2/functions/db2-connect.xml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 871b71764cdca8238069f27436d96011a6a2cb36 Maintainer: takagi Status: ready -->
44
<refentry xml:id="function.db2-connect" xmlns="http://docbook.org/ns/docbook">
55
<refnamediv>
66
<refname>db2_connect</refname>
@@ -11,11 +11,11 @@
1111
<refsect1 role="description">
1212
&reftitle.description;
1313
<methodsynopsis>
14-
<type>resource</type><methodname>db2_connect</methodname>
14+
<type class="union"><type>resource</type><type>false</type></type><methodname>db2_connect</methodname>
1515
<methodparam><type>string</type><parameter>database</parameter></methodparam>
16-
<methodparam><type>string</type><parameter>username</parameter></methodparam>
17-
<methodparam><type>string</type><parameter>password</parameter></methodparam>
18-
<methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
16+
<methodparam><type class="union"><type>string</type><type>null</type></type><parameter>username</parameter></methodparam>
17+
<methodparam><type class="union"><type>string</type><type>null</type></type><parameter>password</parameter></methodparam>
18+
<methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
1919
</methodsynopsis>
2020

2121
<para>
@@ -577,11 +577,11 @@ else {
577577
<?php
578578
$library = "ADC";
579579
$i5 = db2_connect("", "", "", array("i5_lib"=>"qsys2"));
580-
$result = db2_exec($i5,
580+
$result = db2_exec($i5,
581581
"select * from systables where table_schema = '$library'");
582-
while ($row = db2_fetch_both($result)) {
583-
echo $row['TABLE_NAME']."</br>";
584-
}
582+
while ($row = db2_fetch_both($result)) {
583+
echo $row['TABLE_NAME']."</br>";
584+
}
585585
db2_close($i5);
586586
?>
587587
]]>
@@ -636,7 +636,7 @@ if($tc_conn) {
636636
// 信頼済みユーザーとして何らかの作業をします
637637
638638
if($userBefore != $userAfter) {
639-
echo "User has been switched." . "\n";
639+
echo "User has been switched." . "\n";
640640
}
641641
}
642642
@@ -672,7 +672,6 @@ User has been switched.
672672

673673

674674
</refentry>
675-
676675
<!-- Keep this comment at the end of the file
677676
Local variables:
678677
mode: sgml

‎reference/ibm_db2/functions/db2-exec.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 4754397753fd79f1c846868b66a2448babab1c54 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 871b71764cdca8238069f27436d96011a6a2cb36 Maintainer: takagi Status: ready -->
44
<refentry xml:id="function.db2-exec" xmlns="http://docbook.org/ns/docbook">
55
<refnamediv>
66
<refname>db2_exec</refname>
@@ -11,10 +11,10 @@
1111
<refsect1 role="description">
1212
&reftitle.description;
1313
<methodsynopsis>
14-
<type>resource</type><methodname>db2_exec</methodname>
14+
<type class="union"><type>resource</type><type>false</type></type><methodname>db2_exec</methodname>
1515
<methodparam><type>resource</type><parameter>connection</parameter></methodparam>
1616
<methodparam><type>string</type><parameter>statement</parameter></methodparam>
17-
<methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
17+
<methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
1818
</methodsynopsis>
1919

2020

@@ -359,7 +359,6 @@ db2_close($conn);
359359

360360

361361
</refentry>
362-
363362
<!-- Keep this comment at the end of the file
364363
Local variables:
365364
mode: sgml

‎reference/ibm_db2/functions/db2-execute.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 0640e024d4b8a9400d457143ccd0ea66e5f98ead Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 871b71764cdca8238069f27436d96011a6a2cb36 Maintainer: takagi Status: ready -->
44
<refentry xml:id="function.db2-execute" xmlns="http://docbook.org/ns/docbook">
55
<refnamediv>
66
<refname>db2_execute</refname>
@@ -13,7 +13,7 @@
1313
<methodsynopsis>
1414
<type>bool</type><methodname>db2_execute</methodname>
1515
<methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
16-
<methodparam choice="opt"><type>array</type><parameter>parameters</parameter></methodparam>
16+
<methodparam choice="opt"><type>array</type><parameter>parameters</parameter><initializer>[]</initializer></methodparam>
1717
</methodsynopsis>
1818

1919

@@ -350,7 +350,6 @@ db2_close($conn);
350350

351351

352352
</refentry>
353-
354353
<!-- Keep this comment at the end of the file
355354
Local variables:
356355
mode: sgml

0 commit comments

Comments
 (0)