Skip to content

Commit 756ac84

Browse files
sy-recordssy-records
authored
Fix pgsql function signatures (#1043)
1 parent 5159902 commit 756ac84

10 files changed

Lines changed: 36 additions & 28 deletions

File tree

‎reference/math/functions/fmod.xml‎

Lines changed: 2 additions & 1 deletion
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: 761d72245071f89a626903c9bcdc6aaff1252d54 Maintainer: dallas Status: ready -->
3+
<!-- EN-Revision: 54a788ca59d95ff2b4189406437345a21b489435 Maintainer: dallas Status: ready -->
44
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.fmod" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -49,6 +49,7 @@
4949
&reftitle.returnvalues;
5050
<para>
5151
<parameter>num1</parameter>/<parameter>num2</parameter> 的浮点数余数。
52+
如果第二个参数为 0，<constant>NAN</constant> （<type>float</type>）。
5253
</para>
5354
</refsect1>
5455
<refsect1 role="examples">

‎reference/outcontrol/functions/ob-end-clean.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 86b976d5afaf037868174fe5c242e886eb69baa4 Maintainer: mowangjuanzi Status: ready -->
3+
<!-- EN-Revision: 5778b68049cc01810523b09b028398c70115cd56 Maintainer: mowangjuanzi Status: ready -->
4+
<!-- CREDITS: Luffy -->
45
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ob-end-clean">
56
<refnamediv>
67
<refname>ob_end_clean</refname>

‎reference/pdo/constants.fetch-modes.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: 86d3fb841e0206e2588896ad3c21432333535848 Maintainer: mowangjuanzi Status: ready -->
2+
<!-- EN-Revision: 581589d2c4d3183f1c0e67214a65cbd181a5edac Maintainer: mowangjuanzi Status: ready -->
3+
<!-- CREDITS: Luffy -->
34
<section xmlns="http://docbook.org/ns/docbook" xml:id="pdo.constants.fetch-modes">
45
<title>获取模式</title>
56

@@ -641,6 +642,7 @@ stdClass Object
641642
<programlisting role="php">
642643
<![CDATA[
643644
<?php
645+
644646
class TestEntity
645647
{
646648
public $userid;
@@ -1005,10 +1007,12 @@ class TestEntity
10051007
}
10061008
10071009
$obj = new TestEntity();
1008-
$stmt->setFetchMode(\PDO::FETCH_INTO, $obj);
10091010
10101011
$stmt = $db->query("SELECT userid, name, country, referred_by_userid FROM users");
1012+
1013+
$stmt->setFetchMode(\PDO::FETCH_INTO, $obj);
10111014
$result = $stmt->fetch();
1015+
10121016
var_dump($result);
10131017
]]>
10141018
</programlisting>

‎reference/pgsql/functions/pg-escape-bytea.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: c2eca73ef79ebe78cebb34053e41b565af504c4f Maintainer: dallas Status: ready -->
4-
<!-- CREDITS: mowangjuanzi -->
3+
<!-- EN-Revision: c43a3cd9b49627b8d42a4b6ad530e10e26ca30dd Maintainer: dallas Status: ready -->
4+
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id='function.pg-escape-bytea' xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
77
<refname>pg_escape_bytea</refname>
@@ -15,7 +15,7 @@
1515
<methodsynopsis>
1616
<type>string</type><methodname>pg_escape_bytea</methodname>
1717
<methodparam choice="opt"><type>PgSql\Connection</type><parameter>connection</parameter></methodparam>
18-
<methodparam><type>string</type><parameter>data</parameter></methodparam>
18+
<methodparam><type>string</type><parameter>string</parameter></methodparam>
1919
</methodsynopsis>
2020
<para>
2121
<function>pg_escape_bytea</function> 转义 bytea 数据类型的字符串。返回转义后的字符串。
@@ -43,7 +43,7 @@
4343
</listitem>
4444
</varlistentry>
4545
<varlistentry>
46-
<term><parameter>data</parameter></term>
46+
<term><parameter>string</parameter></term>
4747
<listitem>
4848
<para>
4949
包含要插入到 bytea 列中的文本或二进制数据的 <type>string</type>。

‎reference/pgsql/functions/pg-escape-string.xml‎

Lines changed: 3 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: 5f1a92089fa4efe81e9777f87f9ed93f4853898b Maintainer: dallas Status: ready -->
3+
<!-- EN-Revision: c43a3cd9b49627b8d42a4b6ad530e10e26ca30dd Maintainer: dallas Status: ready -->
44
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id='function.pg-escape-string' xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -15,7 +15,7 @@
1515
<methodsynopsis>
1616
<type>string</type><methodname>pg_escape_string</methodname>
1717
<methodparam choice="opt"><type>PgSql\Connection</type><parameter>connection</parameter></methodparam>
18-
<methodparam><type>string</type><parameter>data</parameter></methodparam>
18+
<methodparam><type>string</type><parameter>string</parameter></methodparam>
1919
</methodsynopsis>
2020
<para>
2121
<function>pg_escape_string</function> 转义用于查询数据库的字符串。它返回不带引号的 PostgreSQL 格式的转义字符串。<function>pg_escape_literal</function>
@@ -35,7 +35,7 @@
3535
</listitem>
3636
</varlistentry>
3737
<varlistentry>
38-
<term><parameter>data</parameter></term>
38+
<term><parameter>string</parameter></term>
3939
<listitem>
4040
<para>
4141
包含要转义的 <type>string</type>。

‎reference/pgsql/functions/pg-lo-export.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: c2eca73ef79ebe78cebb34053e41b565af504c4f Maintainer: HonestQiao Status: ready -->
4-
<!-- CREDITS: mowangjuanzi -->
3+
<!-- EN-Revision: c43a3cd9b49627b8d42a4b6ad530e10e26ca30dd Maintainer: HonestQiao Status: ready -->
4+
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.pg-lo-export" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
77
<refname>pg_lo_export</refname>
@@ -14,7 +14,7 @@
1414
<type>bool</type><methodname>pg_lo_export</methodname>
1515
<methodparam choice="opt"><type>PgSql\Connection</type><parameter>connection</parameter></methodparam>
1616
<methodparam><type>int</type><parameter>oid</parameter></methodparam>
17-
<methodparam><type>string</type><parameter>pathname</parameter></methodparam>
17+
<methodparam><type>string</type><parameter>filename</parameter></methodparam>
1818
</methodsynopsis>
1919
<para>
2020
<function>pg_lo_export</function> 在 PostgreSQL 数据库中获取一个大对象并将其内容保存到本地文件系统上的文件中。
@@ -48,7 +48,7 @@
4848
</listitem>
4949
</varlistentry>
5050
<varlistentry>
51-
<term><parameter>pathname</parameter></term>
51+
<term><parameter>filename</parameter></term>
5252
<listitem>
5353
<para>
5454
要导出的数据库里的大型对象的文件在客户端上完整路径和文件名。

‎reference/pgsql/functions/pg-lo-import.xml‎

Lines changed: 7 additions & 7 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: d0ae617680e58bde494f9d58d9c553e0a6944418 Maintainer: HonestQiao Status: ready -->
3+
<!-- EN-Revision: c43a3cd9b49627b8d42a4b6ad530e10e26ca30dd Maintainer: HonestQiao Status: ready -->
44
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.pg-lo-import" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -11,10 +11,10 @@
1111
<refsect1 role="description">
1212
&reftitle.description;
1313
<methodsynopsis>
14-
<type>int|string|false</type><methodname>pg_lo_import</methodname>
14+
<type class="union"><type>int</type><type>string</type><type>false</type></type><methodname>pg_lo_import</methodname>
1515
<methodparam choice="opt"><type>PgSql\Connection</type><parameter>connection</parameter></methodparam>
16-
<methodparam><type>string</type><parameter>pathname</parameter></methodparam>
17-
<methodparam choice="opt"><type>mixed</type><parameter>object_id</parameter></methodparam>
16+
<methodparam><type>string</type><parameter>filename</parameter></methodparam>
17+
<methodparam choice="opt"><type class="union"><type>int</type><type>string</type></type><parameter>oid</parameter></methodparam>
1818
</methodsynopsis>
1919
<para>
2020
<function>pg_lo_import</function> 使用文件系统上的文件作为其数据源从而在数据库中创建新的大对象。
@@ -40,18 +40,18 @@
4040
</listitem>
4141
</varlistentry>
4242
<varlistentry>
43-
<term><parameter>pathname</parameter></term>
43+
<term><parameter>filename</parameter></term>
4444
<listitem>
4545
<para>
4646
在客户端文件系统上读取大对象数据的文件的完整路径和文件名。
4747
</para>
4848
</listitem>
4949
</varlistentry>
5050
<varlistentry>
51-
<term><parameter>object_id</parameter></term>
51+
<term><parameter>oid</parameter></term>
5252
<listitem>
5353
<para>
54-
如果指定了 <parameter>object_id</parameter>，该函数将使用此 id
54+
如果指定了 <parameter>oid</parameter>，该函数将使用此 id
5555
尝试创建大对象，否则服务器将分配空闲对象 id。该参数依赖于 PostgreSQL 8.1 中首次出现的功能。
5656
</para>
5757
</listitem>

‎reference/pgsql/functions/pg-put-line.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: c2eca73ef79ebe78cebb34053e41b565af504c4f Maintainer: HonestQiao Status: ready -->
4-
<!-- CREDITS: mowangjuanzi -->
3+
<!-- EN-Revision: c43a3cd9b49627b8d42a4b6ad530e10e26ca30dd Maintainer: HonestQiao Status: ready -->
4+
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.pg-put-line" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
77
<refname>pg_put_line</refname>
@@ -13,7 +13,7 @@
1313
<methodsynopsis>
1414
<type>bool</type><methodname>pg_put_line</methodname>
1515
<methodparam choice="opt"><type>PgSql\Connection</type><parameter>connection</parameter></methodparam>
16-
<methodparam><type>string</type><parameter>data</parameter></methodparam>
16+
<methodparam><type>string</type><parameter>query</parameter></methodparam>
1717
</methodsynopsis>
1818
<para>
1919
<function>pg_put_line</function> 向 PostgreSQL 后端服务器发送以 NULL 字符结尾的字符串。这需要与 PostgreSQL 的 <literal>COPY FROM</literal> 命令结合使用。
@@ -51,7 +51,7 @@
5151
</listitem>
5252
</varlistentry>
5353
<varlistentry>
54-
<term><parameter>data</parameter></term>
54+
<term><parameter>query</parameter></term>
5555
<listitem>
5656
<para>
5757
要直接发送到 PostgreSQL 后端的一行文本。自动添加 <literal>NULL</literal> 终止符。

‎reference/reflection/propertyhooktype.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: 0cc604f2db478345bff5ade4e191111d5cbfbd90 Maintainer: mowangjuanzi Status: ready -->
2+
<!-- EN-Revision: aeba24a37b237885358909c8d9d50a0a7abe250b Maintainer: mowangjuanzi Status: ready -->
33
<!-- CREDITS: Luffy -->
44
<reference xmlns="http://docbook.org/ns/docbook" xml:id="enum.propertyhooktype" role="enum">
55
<title>PropertyHookType 枚举</title>
@@ -21,13 +21,15 @@
2121

2222
<enumitem>
2323
<enumidentifier>Get</enumidentifier>
24+
<enumvalue>'get'</enumvalue>
2425
<enumitemdescription>
2526
表示 <literal>get</literal> 挂钩。
2627
</enumitemdescription>
2728
</enumitem>
2829

2930
<enumitem>
3031
<enumidentifier>Set</enumidentifier>
32+
<enumvalue>'set'</enumvalue>
3133
<enumitemdescription>
3234
表示 <literal>set</literal> 挂钩。
3335
</enumitemdescription>

‎security/sessions.xml‎

Lines changed: 1 addition & 1 deletion
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: 8782bc734072865ade29b8951bc94d98a53750ef Maintainer: mowangjuanzi Status: ready -->
3+
<!-- EN-Revision: c2face03ee1d79647914a73171a64ee1b67b9918 Maintainer: mowangjuanzi Status: ready -->
44
<chapter xml:id="security.sessions" xmlns="http://docbook.org/ns/docbook">
55
<title>会话（Session）安全</title>
66

0 commit comments

Comments
 (0)