chriskl Sun May 1 21:46:15 2005 EDT
Modified files:
/phpdoc/en/reference/pgsql constants.xml
/phpdoc/en/reference/pgsql/functions pg-convert.xml
pg-result-status.xml
Log:
- Fix erroneous pg_result_status docs. Document pg_convert
http://cvs.php.net/diff.php/phpdoc/en/reference/pgsql/constants.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/reference/pgsql/constants.xml
diff -u phpdoc/en/reference/pgsql/constants.xml:1.7
phpdoc/en/reference/pgsql/constants.xml:1.8
--- phpdoc/en/reference/pgsql/constants.xml:1.7 Tue Apr 5 01:55:12 2005
+++ phpdoc/en/reference/pgsql/constants.xml Sun May 1 21:46:15 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<section id="pgsql.constants">
&reftitle.constants;
&extension.constants;
@@ -499,6 +499,42 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>
+ <constant>PGSQL_CONV_IGNORE_DEFAULT</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ Passed to <function>pg_convert</function>.
+ Ignore default values in the table during conversion.
+ </simpara>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <constant>PGSQL_CONV_FORCE_NULL</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ Passed to <function>pg_convert</function>.
+ Use SQL <literal>NULL</literal> in place of an empty <type>string</type>.
+ </simpara>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <constant>PGSQL_CONV_IGNORE_DEFAULT</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ Passed to <function>pg_convert</function>.
+ Ignore conversion of &null; into SQL <literal>NOT NULL</literal> columns.
+ </simpara>
+ </listitem>
+ </varlistentry>
</variablelist>
</section>
http://cvs.php.net/diff.php/phpdoc/en/reference/pgsql/functions/pg-convert.xml?r1=1.9&r2=1.10&ty=u
Index: phpdoc/en/reference/pgsql/functions/pg-convert.xml
diff -u phpdoc/en/reference/pgsql/functions/pg-convert.xml:1.9
phpdoc/en/reference/pgsql/functions/pg-convert.xml:1.10
--- phpdoc/en/reference/pgsql/functions/pg-convert.xml:1.9 Fri Mar 11
11:03:25 2005
+++ phpdoc/en/reference/pgsql/functions/pg-convert.xml Sun May 1 21:46:15 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.80 -->
<refentry id='function.pg-convert'>
<refnamediv>
@@ -31,6 +31,55 @@
&warn.experimental.func;
</refsect1>
+ <refsect1 role="parameters">
+ &reftitle.parameters;
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>connection</parameter></term>
+ <listitem>
+ <para>
+ PostgreSQL database connection resource.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>table_name</parameter></term>
+ <listitem>
+ <para>
+ Name of the table against which to convert types.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>assoc_array</parameter></term>
+ <listitem>
+ <para>
+ Data to be converted.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>options</parameter></term>
+ <listitem>
+ <para>
+ Any number of <constant>PGSQL_CONV_IGNORE_DEFAULT</constant>,
+ <constant>PGSQL_CONV_FORCE_NULL</constant> or
+ <constant>PGSQL_CONV_IGNORE_NOT_NULL</constant>, combined.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+ &reftitle.returnvalues;
+ <para>
+ An <type>array</type> of converted values, or &false; on error.
+ </para>
+ </refsect1>
+
<refsect1 role="seealso">
&reftitle.seealso;
<para>
http://cvs.php.net/diff.php/phpdoc/en/reference/pgsql/functions/pg-result-status.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/reference/pgsql/functions/pg-result-status.xml
diff -u phpdoc/en/reference/pgsql/functions/pg-result-status.xml:1.8
phpdoc/en/reference/pgsql/functions/pg-result-status.xml:1.9
--- phpdoc/en/reference/pgsql/functions/pg-result-status.xml:1.8 Mon Apr
25 04:59:03 2005
+++ phpdoc/en/reference/pgsql/functions/pg-result-status.xml Sun May 1
21:46:15 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.58 -->
<refentry id='function.pg-result-status'>
<refnamediv>
@@ -55,8 +55,8 @@
&reftitle.returnvalues;
<para>
Possible return values are <constant>PGSQL_EMPTY_QUERY</constant>,
- <constant>PGSQL_COMMAND_OK</constant>,
<constant>PGSQL_TUPLES_OK</constant>, <constant>PGSQL_COPY_TO</constant>,
- <constant>PGSQL_COPY_FROM</constant>,
<constant>PGSQL_BAD_RESPONSE</constant>,
<constant>PGSQL_NONFATAL_ERROR</constant> and
+ <constant>PGSQL_COMMAND_OK</constant>,
<constant>PGSQL_TUPLES_OK</constant>, <constant>PGSQL_COPY_OUT</constant>,
+ <constant>PGSQL_COPY_IN</constant>,
<constant>PGSQL_BAD_RESPONSE</constant>,
<constant>PGSQL_NONFATAL_ERROR</constant> and
<constant>PGSQL_FATAL_ERROR</constant> if
<constant>PGSQL_STATUS_LONG</constant> is
specified. Otherwise, a <type>string</type> containing the PostgreSQL
command tag is returned.
</para>
@@ -81,7 +81,7 @@
$status = pg_result_status($result);
// Determine status
-if ($status == PGSQL_COPY_FROM)
+if ($status == PGSQL_COPY_IN)
echo "Copy began.";
else
echo "Copy failed.";
