cvs: phpdoc /en/appendices migration51.xml migration52.xml /en/reference/pdo connections.xml error-handling.xml ini.xml lobs.xml pdo.xml
reference.xml transactions.xml /en/reference/pdo/pdo begintransaction.xml commit.xml construct.xml errorcode.xml errorinfo.xml exec.xml
getattribute.xml getavailabledrivers.xml lastinsertid.xml prepare.xml query.xml quote.xml rollback.xml setattribute.xml
/en/reference/pdo/pdostatement bindcolumn.xml bindparam.xml bindvalue.xml closecursor.xml columncount.xml errorcode.xml errorinfo.xml execute.xml
fetch.xml fetchall.xml fetchcolumn.xml fetchobject.xml getattribute.xml getcolumnmeta.xml nextrowset.xml rowcount.xml setattribute.xml
setfetchmode.xml /en/reference/pdo_dblib reference.xml /en/reference/pdo_ibm reference.xml /en/reference/pdo_informix reference.xml
/en/reference/pdo_mysql reference.xml /en/reference/pdo_oci reference.xml /en/reference/pdo_odbc reference.xml /en/reference/pdo_pgsql
reference.xml /en/reference/! pdo_sqlite reference.xml /en/reference/sdodasrel book.xml /en/reference/sqlite setup.xml
| From: | Hannes Magnusson | Date: | Mon, 31 Dec 2007 15:43:39 +0000 |
| Subject: | cvs: phpdoc /en/appendices migration51.xml migration52.xml /en/reference/pdo connections.xml error-handling.xml ini.xml lobs.xml pdo.xml reference.xml transactions.xml /en/reference/pdo/pdo begintransaction.xml commit.xml construct.xml errorcode.xml errorinfo.xml exec.xml getattribute.xml getavailabledrivers.xml lastinsertid.xml prepare.xml query.xml quote.xml rollback.xml setattribute.xml /en/reference/pdo/pdostatement bindcolumn.xml bindparam.xml bindvalue.xml closecursor.xml columncount.xml errorcode.xml errorinfo.xml execute.xml fetch.xml fetchall.xml fetchcolumn.xml fetchobject.xml getattribute.xml getcolumnmeta.xml nextrowset.xml rowcount.xml setattribute.xml setfetchmode.xml /en/reference/pdo_dblib reference.xml /en/reference/pdo_ibm reference.xml /en/reference/pdo_informix reference.xml /en/reference/pdo_mysql reference.xml /en/reference/pdo_oci reference.xml /en/reference/pdo_odbc reference.xml /en/reference/pdo_pgsql reference.xml /en/reference/! pdo_sqlite reference.xml /en/reference/sdodasrel book.xml /en/reference/sqlite setup.xml |
||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-965@lists.php.net to get a copy of this message | ||
bjori Mon Dec 31 15:43:39 2007 UTC
Removed files:
/phpdoc/en/reference/pdo reference.xml
Modified files:
/phpdoc/en/appendices migration51.xml migration52.xml
/phpdoc/en/reference/pdo connections.xml error-handling.xml ini.xml
lobs.xml pdo.xml transactions.xml
/phpdoc/en/reference/pdo/pdo begintransaction.xml commit.xml
construct.xml errorcode.xml
errorinfo.xml exec.xml
getattribute.xml
getavailabledrivers.xml
lastinsertid.xml prepare.xml query.xml
quote.xml rollback.xml
setattribute.xml
/phpdoc/en/reference/pdo/pdostatement bindcolumn.xml bindparam.xml
bindvalue.xml closecursor.xml
columncount.xml errorcode.xml
errorinfo.xml execute.xml
fetch.xml fetchall.xml
fetchcolumn.xml
fetchobject.xml
getattribute.xml
getcolumnmeta.xml
nextrowset.xml rowcount.xml
setattribute.xml
setfetchmode.xml
/phpdoc/en/reference/pdo_dblib reference.xml
/phpdoc/en/reference/pdo_ibm reference.xml
/phpdoc/en/reference/pdo_informix reference.xml
/phpdoc/en/reference/pdo_mysql reference.xml
/phpdoc/en/reference/pdo_oci reference.xml
/phpdoc/en/reference/pdo_odbc reference.xml
/phpdoc/en/reference/pdo_pgsql reference.xml
/phpdoc/en/reference/pdo_sqlite reference.xml
/phpdoc/en/reference/sdodasrel book.xml
/phpdoc/en/reference/sqlite setup.xml
Log:
- Upgrade PDO to the new-oo-style
- Change IDs from function.Cass-MethoName to class.methodname
- Change <xref>s to PDO methods to use <function>s
- Change methodsynopsis to the new style
- Change the ctor to use <constructorsynopsis>
- Remove ref.pdo (old ref.pdo linkends point to intro.pdo now)
http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/migration51.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc/en/appendices/migration51.xml diff -u phpdoc/en/appendices/migration51.xml:1.6 phpdoc/en/appendices/migration51.xml:1.7 --- phpdoc/en/appendices/migration51.xml:1.6 Wed Dec 26 15:09:25 2007 +++ phpdoc/en/appendices/migration51.xml Mon Dec 31 15:43:37 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <appendix xml:id="migration51" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Migrating from PHP 5.0.x to PHP 5.1.x</title> @@ -649,7 +649,7 @@ The Zend Engine 2.1 API allows extension developers to declare class constants in object oriented extensions. New extensions written for PHP 5.1.x, including <link linkend="ref.spl">SPL</link>, - <link linkend="ref.pdo">PDO</link>, + <link linkend="intro.pdo">PDO</link>, <link linkend="book.xmlreader">XMLReader</link> and <link linkend="ref.datetime">date</link>, have their constants in the format <constant>PDO::CLASS_CONSTANT</constant> rather than in the C @@ -732,14 +732,14 @@ <section xml:id="migration51.databases-pdo"> <title>PDO overview</title> <para> - <link linkend="ref.pdo">PHP Data Objects (PDO)</link> were introduced as a + <link linkend="intro.pdo">PHP Data Objects (PDO)</link> were introduced as a PECL extension under PHP 5.0, and became part of the core PHP distribution in PHP 5.1.x. The PDO extension provides a consistent interface for database access, and is used alongside database-specific PDO drivers. Each driver may also have database-specific functions of its own, but basic data access functionality such as issuing queries and fetching data is covered by PDO functions, using the driver named in - <link linkend="function.PDO-construct">PDO::__construct()</link>. + <function>PDO::__construct</function>. </para> <para> Note that the PDO extension, and its drivers, are intended to be built as http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/migration52.xml?r1=1.30&r2=1.31&diff_format=u Index: phpdoc/en/appendices/migration52.xml diff -u phpdoc/en/appendices/migration52.xml:1.30 phpdoc/en/appendices/migration52.xml:1.31 --- phpdoc/en/appendices/migration52.xml:1.30 Thu Dec 27 00:47:48 2007 +++ phpdoc/en/appendices/migration52.xml Mon Dec 31 15:43:37 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.30 $ --> +<!-- $Revision: 1.31 $ --> <appendix xml:id="migration52" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Migrating from PHP 5.1.x to PHP 5.2.x</title> @@ -1797,7 +1797,7 @@ <section xml:id="migration52.class-constants"> <title>New Class Constants</title> - <para><link linkend="ref.pdo">pdo</link>:</para> + <para><link linkend="intro.pdo">pdo</link>:</para> <itemizedlist> <listitem> <simpara> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/connections.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/reference/pdo/connections.xml diff -u phpdoc/en/reference/pdo/connections.xml:1.3 phpdoc/en/reference/pdo/connections.xml:1.4 --- phpdoc/en/reference/pdo/connections.xml:1.3 Sat Dec 29 01:44:39 2007 +++ phpdoc/en/reference/pdo/connections.xml Mon Dec 31 15:43:37 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <chapter xml:id="pdo.connections" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Connections and Connection management</title> @@ -114,7 +114,7 @@ If you wish to use persistent connections, you must set <constant>PDO::ATTR_PERSISTENT</constant> in the array of driver options passed to the PDO constructor. If setting this attribute with - <xref linkend="function.PDO-setAttribute" /> after instantiation of the + <function>PDO::setAttribute</function> after instantiation of the object, the driver will not use persistent connections. </para> </note> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/error-handling.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/pdo/error-handling.xml diff -u phpdoc/en/reference/pdo/error-handling.xml:1.2 phpdoc/en/reference/pdo/error-handling.xml:1.3 --- phpdoc/en/reference/pdo/error-handling.xml:1.2 Wed Dec 26 14:41:04 2007 +++ phpdoc/en/reference/pdo/error-handling.xml Mon Dec 31 15:43:37 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <chapter xml:id="pdo.error-handling" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Errors and error handling</title> @@ -14,12 +14,12 @@ </para> <para> This is the default mode. PDO will simply set the error code for you - to inspect using the <xref linkend="function.PDO-errorCode" /> and - <xref linkend="function.PDO-errorInfo" /> methods on both the + to inspect using the <function>PDO::errorCode</function> and + <function>PDO::errorInfo</function> methods on both the statement and database objects; if the error resulted from a call on a statement object, you would invoke the - <xref linkend="function.PDOStatement-errorCode" /> or - <xref linkend="function.PDOStatement-errorInfo" /> + <function>PDOStatement::errorCode</function> or + <function>PDOStatement::errorInfo</function> method on that object. If the error resulted from a call on the database object, you would invoke those methods on the database object instead. @@ -65,10 +65,10 @@ <para> PDO standardizes on using SQL-92 SQLSTATE error code strings; individual PDO drivers are responsible for mapping their native codes to the - appropriate SQLSTATE codes. The <xref linkend="function.PDO-errorCode" /> + appropriate SQLSTATE codes. The <function>PDO::errorCode</function> method returns a single SQLSTATE code. If you need more specific information about an error, PDO also offers an - <xref linkend="function.PDO-errorInfo" /> method which returns an array + <function>PDO::errorInfo</function> method which returns an array containing the SQLSTATE code, the driver specific error code and driver specific error string. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/ini.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/reference/pdo/ini.xml diff -u phpdoc/en/reference/pdo/ini.xml:1.3 phpdoc/en/reference/pdo/ini.xml:1.4 --- phpdoc/en/reference/pdo/ini.xml:1.3 Wed Jun 20 22:25:12 2007 +++ phpdoc/en/reference/pdo/ini.xml Mon Dec 31 15:43:37 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <section xml:id="pdo.configuration" xmlns="http://docbook.org/ns/docbook"> &reftitle.runtime; &extension.runtime; @@ -39,7 +39,7 @@ </term> <listitem> <para> - Defines DSN alias. See <xref linkend="function.PDO-construct"/> for + Defines DSN alias. See <function>PDO::__construct</function> for thorough explanation. </para> </listitem> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/lobs.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/pdo/lobs.xml diff -u phpdoc/en/reference/pdo/lobs.xml:1.2 phpdoc/en/reference/pdo/lobs.xml:1.3 --- phpdoc/en/reference/pdo/lobs.xml:1.2 Wed Dec 26 14:41:04 2007 +++ phpdoc/en/reference/pdo/lobs.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <chapter xml:id="pdo.lobs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Large Objects (LOBs)</title> @@ -10,8 +10,8 @@ "large". Large objects can be either textual or binary in nature. PDO allows you to work with this large data type by using the <constant>PDO::PARAM_LOB</constant> - type code in your <xref linkend="function.PDOStatement-bindParam" /> or - <xref linkend="function.PDOStatement-bindColumn" /> calls. + type code in your <function>PDOStatement::bindParam</function> or + <function>PDOStatement::bindColumn</function> calls. <constant>PDO::PARAM_LOB</constant> tells PDO to map the data as a stream, so that you can manipulate it using the <link linkend='ref.stream'>PHP Streams API</link>. http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo.xml diff -u phpdoc/en/reference/pdo/pdo.xml:1.1 phpdoc/en/reference/pdo/pdo.xml:1.2 --- phpdoc/en/reference/pdo/pdo.xml:1.1 Mon Dec 31 14:34:04 2007 +++ phpdoc/en/reference/pdo/pdo.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> +<!-- $Revision: 1.2 $ --> <reference xml:id="class.pdo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>The PDO class</title> @@ -31,6 +31,7 @@ </classsynopsisinfo> <!-- }}} --> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])" /> <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" /> <!-- }}} --> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/transactions.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/pdo/transactions.xml diff -u phpdoc/en/reference/pdo/transactions.xml:1.2 phpdoc/en/reference/pdo/transactions.xml:1.3 --- phpdoc/en/reference/pdo/transactions.xml:1.2 Wed Dec 26 14:41:04 2007 +++ phpdoc/en/reference/pdo/transactions.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <chapter xml:id="pdo.transactions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Transactions and auto-commit</title> @@ -27,12 +27,12 @@ connection. Auto-commit mode means that every query that you run has its own implicit transaction, if the database supports it, or no transaction if the database doesn't support transactions. If you need a transaction, - you must use the <xref linkend="function.PDO-beginTransaction" /> method to + you must use the <function>PDO::beginTransaction</function> method to initiate one. If the underlying driver does not support transactions, a PDOException will be thrown (regardless of your error handling settings: this is always a serious error condition). Once you are in a transaction, - you may use <xref linkend="function.PDO-commit" /> or - <xref linkend="function.PDO-rollBack" /> to finish it, depending on the success + you may use <function>PDO::commit</function> or + <function>PDO::rollBack</function> to finish it, depending on the success of the code you run during the transaction. </para> <para> @@ -46,7 +46,7 @@ <warning> <para> The automatic rollback only happens if you initiate the transaction via - <xref linkend="function.PDO-beginTransaction" />. If you manually issue a + <function>PDO::beginTransaction</function>. If you manually issue a query that begins a transaction PDO has no way of knowing about it and thus cannot roll it back if something bad happens. </para> @@ -59,8 +59,8 @@ In addition to entering the basic data for that person, we also need to record their salary. It's pretty simple to make two separate updates, but by enclosing them within the - <xref linkend="function.PDO-beginTransaction" /> and - <xref linkend="function.PDO-commit" /> calls, we are guaranteeing that no one + <function>PDO::beginTransaction</function> and + <function>PDO::commit</function> calls, we are guaranteeing that no one else will be able to see those changes until they are complete. If something goes wrong, the catch block rolls back all changes made since the transaction was started, and then prints out an error http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/begintransaction.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/begintransaction.xml diff -u phpdoc/en/reference/pdo/pdo/begintransaction.xml:1.1 phpdoc/en/reference/pdo/pdo/begintransaction.xml:1.2 --- phpdoc/en/reference/pdo/pdo/begintransaction.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/begintransaction.xml Mon Dec 31 15:43:38 2007 @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-beginTransaction" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.begintransaction" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->beginTransaction()</refname> + <refname>PDO::beginTransaction</refname> <refpurpose> Initiates a transaction </refpurpose> @@ -10,18 +10,15 @@ <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>beginTransaction</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDO::beginTransaction</methodname> + <void/> + </methodsynopsis> <para> Turns off autocommit mode. While autocommit mode is turned off, changes made to the database via the PDO object instance are not committed until - you end the transaction by calling <xref linkend="function.PDO-commit" />. - Calling <xref linkend="function.PDO-rollBack" /> will roll back all changes to + you end the transaction by calling <function>PDO::commit</function>. + Calling <function>PDO::rollBack</function> will roll back all changes to the database and return the connection to autocommit mode. </para> <para> @@ -78,8 +75,8 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-commit" /></member> - <member><xref linkend="function.PDO-rollBack" /></member> + <member><function>PDO::commit</function></member> + <member><function>PDO::rollBack</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/commit.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/commit.xml diff -u phpdoc/en/reference/pdo/pdo/commit.xml:1.1 phpdoc/en/reference/pdo/pdo/commit.xml:1.2 --- phpdoc/en/reference/pdo/pdo/commit.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/commit.xml Mon Dec 31 15:43:38 2007 @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-commit" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.commit" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->commit()</refname> + <refname>PDO::commit</refname> <refpurpose> Commits a transaction </refpurpose> @@ -10,16 +10,13 @@ <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>commit</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDO::commit</methodname> + <void/> + </methodsynopsis> <para> Commits a transaction, returning the database connection to autocommit - mode until the next call to <xref linkend="function.PDO-beginTransaction" /> + mode until the next call to <function>PDO::beginTransaction</function> starts a new transaction. </para> </refsect1> @@ -59,8 +56,8 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-beginTransaction" /></member> - <member><xref linkend="function.PDO-rollBack" /></member> + <member><function>PDO::beginTransaction</function></member> + <member><function>PDO::rollBack</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/construct.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/construct.xml diff -u phpdoc/en/reference/pdo/pdo/construct.xml:1.1 phpdoc/en/reference/pdo/pdo/construct.xml:1.2 --- phpdoc/en/reference/pdo/pdo/construct.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/construct.xml Mon Dec 31 15:43:38 2007 @@ -1,24 +1,21 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-construct" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.--construct" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->__construct()</refname> + <refname>PDO::__construct</refname> <refpurpose> Creates a PDO instance representing a connection to a database </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>PDO</type><methodname>__construct</methodname> - <methodparam><type>string</type><parameter>dsn</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter>username</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>driver_options</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <constructorsynopsis> + <methodname>PDO::__construct</methodname> + <methodparam><type>string</type><parameter>dsn</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>username</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>driver_options</parameter></methodparam> + </constructorsynopsis> <para> Creates a PDO instance to represent a connection to the requested database. @@ -120,7 +117,7 @@ <refsect1 role="errors"> &reftitle.errors; <para> - <xref linkend="function.PDO-construct" /> throws a PDOException if the attempt + <function>PDO::__construct</function> throws a PDOException if the attempt to connect to the requested database fails. </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/errorcode.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/errorcode.xml diff -u phpdoc/en/reference/pdo/pdo/errorcode.xml:1.1 phpdoc/en/reference/pdo/pdo/errorcode.xml:1.2 --- phpdoc/en/reference/pdo/pdo/errorcode.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/errorcode.xml Mon Dec 31 15:43:38 2007 @@ -1,21 +1,18 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-errorCode" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.errorcode" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->errorCode()</refname> + <refname>PDO::errorCode</refname> <refpurpose> Fetch the SQLSTATE associated with the last operation on the database handle </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>string</type><methodname>errorCode</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>string</type><methodname>PDO::errorCode</methodname> + <void/> + </methodsynopsis> </refsect1> @@ -33,12 +30,12 @@ class indicates that there is no subclass for that SQLSTATE. </para> <para> - <xref linkend="function.PDO-errorCode" /> only retrieves error codes for operations + <function>PDO::errorCode</function> only retrieves error codes for operations performed directly on the database handle. If you create a PDOStatement - object through <xref linkend="function.PDO-prepare" /> or - <xref linkend="function.PDO-query" /> and invoke an error on the statement - handle, <xref linkend="function.PDO-errorCode" /> will not reflect that error. - You must call <xref linkend="function.PDOStatement-errorCode" /> to return the error + object through <function>PDO::prepare</function> or + <function>PDO::query</function> and invoke an error on the statement + handle, <function>PDO::errorCode</function> will not reflect that error. + You must call <function>PDOStatement::errorCode</function> to return the error code for an operation performed on a particular statement handle. </para> </refsect1> @@ -72,9 +69,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-errorInfo" /></member> - <member><xref linkend="function.PDOStatement-errorCode" /></member> - <member><xref linkend="function.PDOStatement-errorInfo" /></member> + <member><function>PDO::errorInfo</function></member> + <member><function>PDOStatement::errorCode</function></member> + <member><function>PDOStatement::errorInfo</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/errorinfo.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/errorinfo.xml diff -u phpdoc/en/reference/pdo/pdo/errorinfo.xml:1.1 phpdoc/en/reference/pdo/pdo/errorinfo.xml:1.2 --- phpdoc/en/reference/pdo/pdo/errorinfo.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/errorinfo.xml Mon Dec 31 15:43:38 2007 @@ -1,28 +1,25 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-errorInfo" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.errorinfo" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->errorInfo()</refname> + <refname>PDO::errorInfo</refname> <refpurpose> Fetch extended error information associated with the last operation on the database handle </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>array</type><methodname>errorInfo</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>array</type><methodname>PDO::errorInfo</methodname> + <void/> + </methodsynopsis> </refsect1> <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDO-errorInfo" /> returns an array of error information + <function>PDO::errorInfo</function> returns an array of error information about the last operation performed by this database handle. The array consists of the following fields: <informaltable> @@ -53,13 +50,13 @@ </para> <para> - <xref linkend="function.PDO-errorInfo" /> only retrieves error information for + <function>PDO::errorInfo</function> only retrieves error information for operations performed directly on the database handle. If you create a - PDOStatement object through <xref linkend="function.PDO-prepare" /> or - <xref linkend="function.PDO-query" /> and invoke an error on the statement - handle, <xref linkend="function.PDO-errorInfo" /> will not reflect the error + PDOStatement object through <function>PDO::prepare</function> or + <function>PDO::query</function> and invoke an error on the statement + handle, <function>PDO::errorInfo</function> will not reflect the error from the statement handle. You must call - <xref linkend="function.PDOStatement-errorInfo" /> to return the error + <function>PDOStatement::errorInfo</function> to return the error information for an operation performed on a particular statement handle. </para> </refsect1> @@ -100,9 +97,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-errorCode" /></member> - <member><xref linkend="function.PDOStatement-errorCode" /></member> - <member><xref linkend="function.PDOStatement-errorInfo" /></member> + <member><function>PDO::errorCode</function></member> + <member><function>PDOStatement::errorCode</function></member> + <member><function>PDOStatement::errorInfo</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/exec.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/exec.xml diff -u phpdoc/en/reference/pdo/pdo/exec.xml:1.1 phpdoc/en/reference/pdo/pdo/exec.xml:1.2 --- phpdoc/en/reference/pdo/pdo/exec.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/exec.xml Mon Dec 31 15:43:38 2007 @@ -1,34 +1,31 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-exec" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.exec" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->exec()</refname> + <refname>PDO::exec</refname> <refpurpose> Execute an SQL statement and return the number of affected rows </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>int</type><methodname>exec</methodname> - <methodparam><type>string</type><parameter>statement</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>int</type><methodname>PDO::exec</methodname> + <methodparam><type>string</type><parameter>statement</parameter></methodparam> + </methodsynopsis> <para> - <xref linkend="function.PDO-exec" /> executes an SQL statement in + <function>PDO::exec</function> executes an SQL statement in a single function call, returning the number of rows affected by the statement. </para> <para> - <xref linkend="function.PDO-exec" /> does not return results from a SELECT + <function>PDO::exec</function> does not return results from a SELECT statement. For a SELECT statement that you only need to issue once - during your program, consider issuing <xref linkend="function.PDO-query" />. + during your program, consider issuing <function>PDO::query</function>. For a statement that you need to issue multiple times, prepare - a PDOStatement object with <xref linkend="function.PDO-prepare" /> and issue - the statement with <xref linkend="function.PDOStatement-execute" />. + a PDOStatement object with <function>PDO::prepare</function> and issue + the statement with <function>PDOStatement::execute</function>. </para> </refsect1> @@ -50,15 +47,15 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDO-exec" /> returns the number of rows that were modified + <function>PDO::exec</function> returns the number of rows that were modified or deleted by the SQL statement you issued. If no rows were affected, - <xref linkend="function.PDO-exec" /> returns <literal>0</literal>. + <function>PDO::exec</function> returns <literal>0</literal>. </para> &return.falseproblem; <para> The following example incorrectly relies on the return value of - <xref linkend="function.PDO-exec" />, wherein a statement that affected 0 rows + <function>PDO::exec</function>, wherein a statement that affected 0 rows results in a call to <function>die</function>: <programlisting role="php"> <![CDATA[ @@ -108,9 +105,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDO-query" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDO::query</function></member> + <member><function>PDOStatement::execute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/getattribute.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/getattribute.xml diff -u phpdoc/en/reference/pdo/pdo/getattribute.xml:1.1 phpdoc/en/reference/pdo/pdo/getattribute.xml:1.2 --- phpdoc/en/reference/pdo/pdo/getattribute.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/getattribute.xml Mon Dec 31 15:43:38 2007 @@ -1,26 +1,23 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-getAttribute" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.getattribute" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->getAttribute()</refname> + <refname>PDO::getAttribute</refname> <refpurpose> Retrieve a database connection attribute </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>mixed</type><methodname>getAttribute</methodname> - <methodparam><type>int</type><parameter>attribute</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>mixed</type><methodname>PDO::getAttribute</methodname> + <methodparam><type>int</type><parameter>attribute</parameter></methodparam> + </methodsynopsis> <para> This function returns the value of a database connection attribute. To retrieve PDOStatement attributes, refer to - <xref linkend="function.PDOStatement-getAttribute" />. + <function>PDOStatement::getAttribute</function>. </para> <para> @@ -107,9 +104,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-setAttribute" /></member> - <member><xref linkend="function.PDOStatement-getAttribute" /></member> - <member><xref linkend="function.PDOStatement-setAttribute" /></member> + <member><function>PDO::setAttribute</function></member> + <member><function>PDOStatement::getAttribute</function></member> + <member><function>PDOStatement::setAttribute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/getavailabledrivers.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/getavailabledrivers.xml diff -u phpdoc/en/reference/pdo/pdo/getavailabledrivers.xml:1.1 phpdoc/en/reference/pdo/pdo/getavailabledrivers.xml:1.2 --- phpdoc/en/reference/pdo/pdo/getavailabledrivers.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/getavailabledrivers.xml Mon Dec 31 15:43:38 2007 @@ -1,32 +1,29 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-getAvailableDrivers" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.getavailabledrivers" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->getAvailableDrivers()</refname> + <refname>PDO::getAvailableDrivers</refname> <refpurpose> Return an array of available PDO drivers </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>array</type><methodname>getAvailableDrivers</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>array</type><methodname>PDO::getAvailableDrivers</methodname> + <void/> + </methodsynopsis> <para> This function returns all currently available PDO drivers which can be used in <parameter>DSN</parameter> parameter of - <xref linkend="function.PDO-construct" />. This is a static method. + <function>PDO::__construct</function>. This is a static method. </para> </refsect1> <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDO-getAvailableDrivers" /> returns an array of PDO driver names. If + <function>PDO::getAvailableDrivers</function> returns an array of PDO driver names. If no drivers are available, it returns an empty array. </para> </refsect1> @@ -35,7 +32,7 @@ &reftitle.examples; <para> <example> - <title>A <xref linkend="function.PDO-getAvailableDrivers" /> example</title> + <title>A <function>PDO::getAvailableDrivers</function> example</title> <programlisting role="php"> <![CDATA[ <?php http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/lastinsertid.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/lastinsertid.xml diff -u phpdoc/en/reference/pdo/pdo/lastinsertid.xml:1.1 phpdoc/en/reference/pdo/pdo/lastinsertid.xml:1.2 --- phpdoc/en/reference/pdo/pdo/lastinsertid.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/lastinsertid.xml Mon Dec 31 15:43:38 2007 @@ -1,21 +1,18 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-lastInsertId" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.lastinsertid" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->lastInsertId()</refname> + <refname>PDO::lastInsertId</refname> <refpurpose> Returns the ID of the last inserted row or sequence value </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>string</type><methodname>lastInsertId</methodname> - <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>string</type><methodname>PDO::lastInsertId</methodname> + <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam> + </methodsynopsis> <para> Returns the ID of the last inserted row, or the last value from a @@ -52,19 +49,19 @@ &reftitle.returnvalues; <para> If a sequence name was not specified for the <parameter>name</parameter> - parameter, <xref linkend="function.PDO-lastInsertId" /> returns a + parameter, <function>PDO::lastInsertId</function> returns a string representing the row ID of the last row that was inserted into the database. </para> <para> If a sequence name was specified for the <parameter>name</parameter> - parameter, <xref linkend="function.PDO-lastInsertId" /> returns a + parameter, <function>PDO::lastInsertId</function> returns a string representing the last value retrieved from the specified sequence object. </para> <para> If the PDO driver does not support this capability, - <xref linkend="function.PDO-lastInsertId" /> triggers an + <function>PDO::lastInsertId</function> triggers an <literal>IM001</literal> SQLSTATE. </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/prepare.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/prepare.xml diff -u phpdoc/en/reference/pdo/pdo/prepare.xml:1.1 phpdoc/en/reference/pdo/pdo/prepare.xml:1.2 --- phpdoc/en/reference/pdo/pdo/prepare.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/prepare.xml Mon Dec 31 15:43:38 2007 @@ -1,26 +1,23 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-prepare" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.prepare" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->prepare()</refname> + <refname>PDO::prepare</refname> <refpurpose> Prepares a statement for execution and returns a statement object </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>PDOStatement</type><methodname>prepare</methodname> - <methodparam><type>string</type><parameter>statement</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>driver_options</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>PDOStatement</type><methodname>PDO::prepare</methodname> + <methodparam><type>string</type><parameter>statement</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>driver_options</parameter></methodparam> + </methodsynopsis> <para> Prepares an SQL statement to be executed by the - <xref linkend="function.PDOStatement-execute" /> method. The SQL statement can + <function>PDOStatement::execute</function> method. The SQL statement can contain zero or more named (:name) or question mark (?) parameter markers for which real values will be substituted when the statement is executed. You cannot use both named and question mark parameter markers within the same @@ -28,14 +25,14 @@ </para> <para> You must include a unique parameter marker for each value you wish to pass - in to the statement when you call <xref linkend="function.PDOStatement-execute" />. + in to the statement when you call <function>PDOStatement::execute</function>. You cannot use a named parameter marker of the same name twice in a prepared statement. You cannot bind multiple values to a single named parameter in, for example, the IN() clause of an SQL statement. </para> <para> - Calling <xref linkend="function.PDO-prepare" /> and - <xref linkend="function.PDOStatement-execute" /> for statements that will be + Calling <function>PDO::prepare</function> and + <function>PDOStatement::execute</function> for statements that will be issued multiple times with different parameter values optimizes the performance of your application by allowing the driver to negotiate client and/or server side caching of the query plan and meta information, @@ -83,9 +80,9 @@ &reftitle.returnvalues; <para> If the database server successfully prepares the statement, - <xref linkend="function.PDO-prepare" /> returns a PDOStatement object. + <function>PDO::prepare</function> returns a PDOStatement object. If the database server cannot successfully prepare the statement, - <xref linkend="function.PDO-prepare" /> returns &false;. + <function>PDO::prepare</function> returns &false;. </para> </refsect1> @@ -133,9 +130,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-exec" /></member> - <member><xref linkend="function.PDO-query" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> + <member><function>PDO::exec</function></member> + <member><function>PDO::query</function></member> + <member><function>PDOStatement::execute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/query.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/query.xml diff -u phpdoc/en/reference/pdo/pdo/query.xml:1.1 phpdoc/en/reference/pdo/pdo/query.xml:1.2 --- phpdoc/en/reference/pdo/pdo/query.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/query.xml Mon Dec 31 15:43:38 2007 @@ -1,70 +1,58 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-query" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.query" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->query()</refname> + <refname>PDO::query</refname> <refpurpose> Executes an SQL statement, returning a result set as a PDOStatement object </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>PDOStatement</type><methodname>query</methodname> - <methodparam><type>string</type><parameter>statement</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>PDOStatement</type><methodname>query</methodname> - <methodparam><type>string</type><parameter>statement</parameter></methodparam> - <methodparam><type>int</type><parameter>PDO::FETCH_COLUMN</parameter></methodparam> - <methodparam><type>int</type><parameter>colno</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>PDOStatement</type><methodname>query</methodname> - <methodparam><type>string</type><parameter>statement</parameter></methodparam> - <methodparam><type>int</type><parameter>PDO::FETCH_CLASS</parameter></methodparam> - <methodparam><type>string</type><parameter>classname</parameter></methodparam> - <methodparam><type>array</type><parameter>ctorargs</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>PDOStatement</type><methodname>query</methodname> - <methodparam><type>string</type><parameter>statement</parameter></methodparam> - <methodparam><type>int</type><parameter>PDO::FETCH_INTO</parameter></methodparam> - <methodparam><type>object</type><parameter>object</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>PDOStatement</type><methodname>PDO::query</methodname> + <methodparam><type>string</type><parameter>statement</parameter></methodparam> + </methodsynopsis> + + <methodsynopsis> + <type>PDOStatement</type><methodname>PDO::query</methodname> + <methodparam><type>string</type><parameter>statement</parameter></methodparam> + <methodparam><type>int</type><parameter>PDO::FETCH_COLUMN</parameter></methodparam> + <methodparam><type>int</type><parameter>colno</parameter></methodparam> + </methodsynopsis> + + <methodsynopsis> + <type>PDOStatement</type><methodname>PDO::query</methodname> + <methodparam><type>string</type><parameter>statement</parameter></methodparam> + <methodparam><type>int</type><parameter>PDO::FETCH_CLASS</parameter></methodparam> + <methodparam><type>string</type><parameter>classname</parameter></methodparam> + <methodparam><type>array</type><parameter>ctorargs</parameter></methodparam> + </methodsynopsis> + + <methodsynopsis> + <type>PDOStatement</type><methodname>PDO::query</methodname> + <methodparam><type>string</type><parameter>statement</parameter></methodparam> + <methodparam><type>int</type><parameter>PDO::FETCH_INTO</parameter></methodparam> + <methodparam><type>object</type><parameter>object</parameter></methodparam> + </methodsynopsis> <para> - <xref linkend="function.PDO-query" /> executes an SQL statement in + <function>PDO::query</function> executes an SQL statement in a single function call, returning the result set (if any) returned by the statement as a PDOStatement object. </para> <para> For a query that you need to issue multiple times, you will realize better performance if you prepare a PDOStatement object using - <xref linkend="function.PDO-prepare" /> and issue the statement with multiple - calls to <xref linkend="function.PDOStatement-execute" />. + <function>PDO::prepare</function> and issue the statement with multiple + calls to <function>PDOStatement::execute</function>. </para> <para> If you do not fetch all of the data in a result set before issuing your - next call to <xref linkend="function.PDO-query" />, your call may fail. Call - <xref linkend="function.PDOStatement-closeCursor" /> to release the database + next call to <function>PDO::query</function>, your call may fail. Call + <function>PDOStatement::closeCursor</function> to release the database resources associated with the PDOStatement object before issuing your - next call to <xref linkend="function.PDO-query" />. + next call to <function>PDO::query</function>. </para> <note> @@ -72,7 +60,7 @@ Although this function is only documented as having a single parameter, you may pass additional arguments to this function. They will be treated as though you called - <xref linkend="function.PDOStatement-setFetchMode" /> on the resultant statement + <function>PDOStatement::setFetchMode</function> on the resultant statement object. </para> </note> @@ -96,7 +84,7 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDO-query" /> returns a PDOStatement object. + <function>PDO::query</function> returns a PDOStatement object. </para> </refsect1> @@ -106,7 +94,7 @@ <example> <title>Demonstrate PDO::query</title> <para> - A nice feature of <xref linkend="function.PDO-query" /> is that it + A nice feature of <function>PDO::query</function> is that it enables you to iterate over the rowset returned by a successfully executed SELECT statement. </para> @@ -145,9 +133,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-exec" /></member> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> + <member><function>PDO::exec</function></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::execute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/quote.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/quote.xml diff -u phpdoc/en/reference/pdo/pdo/quote.xml:1.1 phpdoc/en/reference/pdo/pdo/quote.xml:1.2 --- phpdoc/en/reference/pdo/pdo/quote.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/quote.xml Mon Dec 31 15:43:38 2007 @@ -1,33 +1,30 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-quote" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.quote" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->quote()</refname> + <refname>PDO::quote</refname> <refpurpose> Quotes a string for use in a query. </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>string</type><methodname>quote</methodname> - <methodparam><type>string</type><parameter>string</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>parameter_type</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>string</type><methodname>PDO::quote</methodname> + <methodparam><type>string</type><parameter>string</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>parameter_type</parameter></methodparam> + </methodsynopsis> <para> - <xref linkend="function.PDO-quote" /> places quotes around the input string (if + <function>PDO::quote</function> places quotes around the input string (if required) and escapes special characters within the input string, using a quoting style appropriate to the underlying driver. </para> <para> If you are using this function to build SQL statements, you are <emphasis>strongly</emphasis> recommended to use - <xref linkend="function.PDO-prepare" /> to prepare SQL statements with bound - parameters instead of using <xref linkend="function.PDO-quote" /> to interpolate + <function>PDO::prepare</function> to prepare SQL statements with bound + parameters instead of using <function>PDO::quote</function> to interpolate user input into a SQL statement. Prepared statements with bound parameters are not only more portable, more convenient, immune to SQL injection, but are often much faster to execute than interpolated queries, as both the @@ -156,8 +153,8 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::execute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/rollback.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/rollback.xml diff -u phpdoc/en/reference/pdo/pdo/rollback.xml:1.1 phpdoc/en/reference/pdo/pdo/rollback.xml:1.2 --- phpdoc/en/reference/pdo/pdo/rollback.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/rollback.xml Mon Dec 31 15:43:38 2007 @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-rollBack" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.rollback" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->rollBack()</refname> + <refname>PDO::rollBack</refname> <refpurpose> Rolls back a transaction </refpurpose> @@ -10,17 +10,14 @@ <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>rollBack</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDO::rollBack</methodname> + <void/> + </methodsynopsis> <para> Rolls back the current transaction, as initiated by - <xref linkend="function.PDO-beginTransaction" />. It is an error to call this + <function>PDO::beginTransaction</function>. It is an error to call this method if no transaction is active. </para> <para> @@ -80,8 +77,8 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-beginTransaction" /></member> - <member><xref linkend="function.PDO-commit" /></member> + <member><function>PDO::beginTransaction</function></member> + <member><function>PDO::commit</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/setattribute.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/setattribute.xml diff -u phpdoc/en/reference/pdo/pdo/setattribute.xml:1.1 phpdoc/en/reference/pdo/pdo/setattribute.xml:1.2 --- phpdoc/en/reference/pdo/pdo/setattribute.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/setattribute.xml Mon Dec 31 15:43:38 2007 @@ -1,22 +1,19 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-setAttribute" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.setattribute" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->setAttribute()</refname> + <refname>PDO::setAttribute</refname> <refpurpose> Set an attribute </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>setAttribute</methodname> - <methodparam><type>int</type><parameter>attribute</parameter></methodparam> - <methodparam><type>mixed</type><parameter>value</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDO::setAttribute</methodname> + <methodparam><type>int</type><parameter>attribute</parameter></methodparam> + <methodparam><type>mixed</type><parameter>value</parameter></methodparam> + </methodsynopsis> <para> Sets an attribute on the database handle. Some of the available generic http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/bindcolumn.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/bindcolumn.xml diff -u phpdoc/en/reference/pdo/pdostatement/bindcolumn.xml:1.1 phpdoc/en/reference/pdo/pdostatement/bindcolumn.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/bindcolumn.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/bindcolumn.xml Mon Dec 31 15:43:38 2007 @@ -1,36 +1,33 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-bindColumn" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.bindcolumn" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->bindColumn()</refname> + <refname>PDOStatement->bindColumn</refname> <refpurpose> Bind a column to a PHP variable </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> <methodsynopsis> - <type>bool</type><methodname>bindColumn</methodname> + <type>bool</type><methodname>PDOStatement::bindColumn</methodname> <methodparam><type>mixed</type><parameter>column</parameter></methodparam> <methodparam><type>mixed</type><parameter role="reference">param</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>type</parameter></methodparam> </methodsynopsis> - </classsynopsis> <para> - <xref linkend="function.PDOStatement-bindColumn" /> arranges to have a + <function>PDOStatement::bindColumn</function> arranges to have a particular variable bound to a given column in the result-set from a - query. Each call to <xref linkend="function.PDOStatement-fetch" /> or - <xref linkend="function.PDOStatement-fetchAll" /> will update all the variables + query. Each call to <function>PDOStatement::fetch</function> or + <function>PDOStatement::fetchAll</function> will update all the variables that are bound to columns. </para> <note> <para> Since information about the columns is not always available to PDO until the statement is executed, portable applications should call this - function <emphasis>after</emphasis> <xref linkend="function.PDOStatement-execute" />. + function <emphasis>after</emphasis> <function>PDOStatement::execute</function>. </para> </note> </refsect1> @@ -136,10 +133,10 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDOStatement-execute" /></member> - <member><xref linkend="function.PDOStatement-fetch" /></member> - <member><xref linkend="function.PDOStatement-fetchAll" /></member> - <member><xref linkend="function.PDOStatement-fetchColumn" /></member> + <member><function>PDOStatement::execute</function></member> + <member><function>PDOStatement::fetch</function></member> + <member><function>PDOStatement::fetchAll</function></member> + <member><function>PDOStatement::fetchColumn</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/bindparam.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/bindparam.xml diff -u phpdoc/en/reference/pdo/pdostatement/bindparam.xml:1.1 phpdoc/en/reference/pdo/pdostatement/bindparam.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/bindparam.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/bindparam.xml Mon Dec 31 15:43:38 2007 @@ -1,31 +1,28 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-bindParam" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.bindparam" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->bindParam()</refname> + <refname>PDOStatement->bindParam</refname> <refpurpose> Binds a parameter to the specified variable name </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>bindParam</methodname> - <methodparam><type>mixed</type><parameter>parameter</parameter></methodparam> - <methodparam><type>mixed</type><parameter role="reference">variable</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>data_type</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam> - <methodparam choice="opt"><type>mixed</type><parameter>driver_options</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::bindParam</methodname> + <methodparam><type>mixed</type><parameter>parameter</parameter></methodparam> + <methodparam><type>mixed</type><parameter role="reference">variable</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>data_type</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam> + <methodparam choice="opt"><type>mixed</type><parameter>driver_options</parameter></methodparam> + </methodsynopsis> <para> Binds a PHP variable to a corresponding named or question mark placeholder in the SQL statement that was use to prepare the statement. Unlike - <xref linkend="function.PDOStatement-bindValue" />, the variable is bound as a + <function>PDOStatement::bindValue</function>, the variable is bound as a reference and will only be evaluated at the time that - <xref linkend="function.PDOStatement-execute" /> is called. + <function>PDOStatement::execute</function> is called. </para> <para> Most parameters are input parameters, that is, parameters that are used @@ -184,9 +181,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> - <member><xref linkend="function.PDOStatement-bindValue" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::execute</function></member> + <member><function>PDOStatement::bindValue</function></member> </simplelist> </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/bindvalue.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/bindvalue.xml diff -u phpdoc/en/reference/pdo/pdostatement/bindvalue.xml:1.1 phpdoc/en/reference/pdo/pdostatement/bindvalue.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/bindvalue.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/bindvalue.xml Mon Dec 31 15:43:38 2007 @@ -1,23 +1,20 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-bindValue" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.bindvalue" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->bindValue()</refname> + <refname>PDOStatement->bindValue</refname> <refpurpose> Binds a value to a parameter </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>bindValue</methodname> - <methodparam><type>mixed</type><parameter>parameter</parameter></methodparam> - <methodparam><type>mixed</type><parameter>value</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>data_type</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::bindValue</methodname> + <methodparam><type>mixed</type><parameter>parameter</parameter></methodparam> + <methodparam><type>mixed</type><parameter>value</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>data_type</parameter></methodparam> + </methodsynopsis> <para> Binds a value to a corresponding named or question mark placeholder in the SQL statement that was use to prepare the statement. @@ -114,9 +111,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> - <member><xref linkend="function.PDOStatement-bindParam" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::execute</function></member> + <member><function>PDOStatement::bindParam</function></member> </simplelist> </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/closecursor.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/closecursor.xml diff -u phpdoc/en/reference/pdo/pdostatement/closecursor.xml:1.1 phpdoc/en/reference/pdo/pdostatement/closecursor.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/closecursor.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/closecursor.xml Mon Dec 31 15:43:38 2007 @@ -1,24 +1,21 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-closeCursor" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.closecursor" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->closeCursor()</refname> + <refname>PDOStatement->closeCursor</refname> <refpurpose> Closes the cursor, enabling the statement to be executed again. </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>closeCursor</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::closeCursor</methodname> + <void/> + </methodsynopsis> <para> - <xref linkend="function.PDOStatement-closeCursor" /> frees up the connection + <function>PDOStatement::closeCursor</function> frees up the connection to the server so that other SQL statements may be issued, but leaves the statement in a state that enables it to be executed again. </para> @@ -29,7 +26,7 @@ the problem may manifest itself in an out-of-sequence error. </para> <para> - <xref linkend="function.PDOStatement-closeCursor" /> is implemented either as an + <function>PDOStatement::closeCursor</function> is implemented either as an optional driver specific method (allowing for maximum efficiency), or as the generic PDO fallback if no driver specific function is installed. The PDO generic fallback is semantically the same as writing the following @@ -61,13 +58,13 @@ &reftitle.examples; <para> <example> - <title>A <xref linkend="function.PDOStatement-closeCursor" /> example</title> + <title>A <function>PDOStatement::closeCursor</function> example</title> <para> In the following example, the <varname>$stmt</varname> PDOStatement object returns multiple rows but the application fetches only the first row, leaving the PDOStatement object in a state of having unfetched rows. To ensure that the application will work with all database drivers, the - author inserts a call to <xref linkend="function.PDOStatement-closeCursor" /> + author inserts a call to <function>PDOStatement::closeCursor</function> on <varname>$stmt</varname> before executing the <varname>$otherStmt</varname> PDOStatement object. </para> @@ -102,7 +99,7 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDOStatement-execute" /></member> + <member><function>PDOStatement::execute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/columncount.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/columncount.xml diff -u phpdoc/en/reference/pdo/pdostatement/columncount.xml:1.1 phpdoc/en/reference/pdo/pdostatement/columncount.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/columncount.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/columncount.xml Mon Dec 31 15:43:38 2007 @@ -1,34 +1,31 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-columnCount" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.columncount" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->columnCount()</refname> + <refname>PDOStatement->columnCount</refname> <refpurpose> Returns the number of columns in the result set </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>int</type><methodname>columnCount</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>int</type><methodname>PDOStatement::columnCount</methodname> + <void/> + </methodsynopsis> <para> - Use <xref linkend="function.PDOStatement-columnCount" /> to return the number + Use <function>PDOStatement::columnCount</function> to return the number of columns in the result set represented by the PDOStatement object. </para> <para> - If the PDOStatement object was returned from <xref linkend="function.PDO-query" />, + If the PDOStatement object was returned from <function>PDO::query</function>, the column count is immediately available. </para> <para> If the PDOStatement object was returned from - <xref linkend="function.PDO-prepare" />, an accurate column count will not be - available until you invoke <xref linkend="function.PDOStatement-execute" />. + <function>PDO::prepare</function>, an accurate column count will not be + available until you invoke <function>PDOStatement::execute</function>. </para> </refsect1> @@ -37,7 +34,7 @@ <para> Returns the number of columns in the result set represented by the PDOStatement object. If there is no result set, - <xref linkend="function.PDOStatement-columnCount" /> returns <literal>0</literal>. + <function>PDOStatement::columnCount</function> returns <literal>0</literal>. </para> </refsect1> @@ -47,7 +44,7 @@ <example> <title>Counting columns</title> <para> - This example demonstrates how <xref linkend="function.PDOStatement-columnCount" /> + This example demonstrates how <function>PDOStatement::columnCount</function> operates with and without a result set. </para> <programlisting role="php"> @@ -86,9 +83,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> - <member><xref linkend="function.PDOStatement-rowCount" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::execute</function></member> + <member><function>PDOStatement::rowCount</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/errorcode.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/errorcode.xml diff -u phpdoc/en/reference/pdo/pdostatement/errorcode.xml:1.1 phpdoc/en/reference/pdo/pdostatement/errorcode.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/errorcode.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/errorcode.xml Mon Dec 31 15:43:38 2007 @@ -1,28 +1,25 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-errorCode" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.errorcode" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->errorCode()</refname> + <refname>PDOStatement->errorCode</refname> <refpurpose> Fetch the SQLSTATE associated with the last operation on the statement handle </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>string</type><methodname>errorCode</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>string</type><methodname>PDOStatement::errorCode</methodname> + <void/> + </methodsynopsis> </refsect1> <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - Identical to <xref linkend="function.PDO-errorCode" />, except that - <xref linkend="function.PDOStatement-errorCode" /> only retrieves error codes + Identical to <function>PDO::errorCode</function>, except that + <function>PDOStatement::errorCode</function> only retrieves error codes for operations performed with PDOStatement objects. </para> </refsect1> @@ -57,9 +54,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-errorCode" /></member> - <member><xref linkend="function.PDO-errorInfo" /></member> - <member><xref linkend="function.PDOStatement-errorInfo" /></member> + <member><function>PDO::errorCode</function></member> + <member><function>PDO::errorInfo</function></member> + <member><function>PDOStatement::errorInfo</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/errorinfo.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/errorinfo.xml diff -u phpdoc/en/reference/pdo/pdostatement/errorinfo.xml:1.1 phpdoc/en/reference/pdo/pdostatement/errorinfo.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/errorinfo.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/errorinfo.xml Mon Dec 31 15:43:38 2007 @@ -1,28 +1,25 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-errorInfo" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.errorinfo" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->errorInfo()</refname> + <refname>PDOStatement->errorInfo</refname> <refpurpose> Fetch extended error information associated with the last operation on the statement handle </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>array</type><methodname>errorInfo</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>array</type><methodname>PDOStatement::errorInfo</methodname> + <void/> + </methodsynopsis> </refsect1> <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDOStatement-errorInfo" /> returns an array of + <function>PDOStatement::errorInfo</function> returns an array of error information about the last operation performed by this statement handle. The array consists of the following fields: <informaltable> @@ -91,9 +88,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-errorCode" /></member> - <member><xref linkend="function.PDO-errorInfo" /></member> - <member><xref linkend="function.PDOStatement-errorCode" /></member> + <member><function>PDO::errorCode</function></member> + <member><function>PDO::errorInfo</function></member> + <member><function>PDOStatement::errorCode</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/execute.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/execute.xml diff -u phpdoc/en/reference/pdo/pdostatement/execute.xml:1.1 phpdoc/en/reference/pdo/pdostatement/execute.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/execute.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/execute.xml Mon Dec 31 15:43:38 2007 @@ -1,26 +1,23 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-execute" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.execute" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->execute()</refname> + <refname>PDOStatement->execute</refname> <refpurpose> Executes a prepared statement </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>execute</methodname> - <methodparam choice="opt"><type>array</type><parameter>input_parameters</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::execute</methodname> + <methodparam choice="opt"><type>array</type><parameter>input_parameters</parameter></methodparam> + </methodsynopsis> <para> Execute the prepared statement. If the prepared statement included parameter markers, you must either: <itemizedlist> - <listitem><para>call <xref linkend="function.PDOStatement-bindParam" /> to bind PHP variables + <listitem><para>call <function>PDOStatement::bindParam</function> to bind PHP variables to the parameter markers: bound variables pass their value as input and receive the output value, if any, of their associated parameter markers</para></listitem> <listitem><para>or pass an array of input-only parameter values</para></listitem> @@ -133,11 +130,11 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-bindParam" /></member> - <member><xref linkend="function.PDOStatement-fetch" /></member> - <member><xref linkend="function.PDOStatement-fetchAll" /></member> - <member><xref linkend="function.PDOStatement-fetchColumn" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::bindParam</function></member> + <member><function>PDOStatement::fetch</function></member> + <member><function>PDOStatement::fetchAll</function></member> + <member><function>PDOStatement::fetchColumn</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/fetch.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/fetch.xml diff -u phpdoc/en/reference/pdo/pdostatement/fetch.xml:1.1 phpdoc/en/reference/pdo/pdostatement/fetch.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/fetch.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/fetch.xml Mon Dec 31 15:43:38 2007 @@ -1,23 +1,20 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-fetch" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.fetch" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->fetch()</refname> + <refname>PDOStatement->fetch</refname> <refpurpose> Fetches the next row from a result set </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>mixed</type><methodname>fetch</methodname> - <methodparam choice="opt"><type>int</type><parameter>fetch_style</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>cursor_orientation</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>cursor_offset</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>mixed</type><methodname>PDOStatement::fetch</methodname> + <methodparam choice="opt"><type>int</type><parameter>fetch_style</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>cursor_orientation</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>cursor_offset</parameter></methodparam> + </methodsynopsis> <para> Fetches a row from a result set associated with a PDOStatement object. The @@ -50,7 +47,7 @@ <listitem><para> <literal>PDO::FETCH_BOUND</literal>: returns &true; and assigns the values of the columns in your result set to the PHP variables to which - they were bound with the <xref linkend="function.PDOStatement-bindColumn" /> + they were bound with the <function>PDOStatement::bindColumn</function> method </para></listitem> <listitem><para> @@ -95,7 +92,7 @@ scrollable cursor for your PDOStatement object, you must set the <literal>PDO::ATTR_CURSOR</literal> attribute to <literal>PDO::CURSOR_SCROLL</literal> when you prepare the SQL - statement with <xref linkend="function.PDO-prepare" />. + statement with <function>PDO::prepare</function>. </para> </listitem> </varlistentry> @@ -113,7 +110,7 @@ the <literal>cursor_orientation</literal> parameter is set to <literal>PDO::FETCH_ORI_REL</literal>, this value specifies the row to fetch relative to the cursor position before - <xref linkend="function.PDOStatement-fetch" /> was called. + <function>PDOStatement::fetch</function> was called. </para> </listitem> </varlistentry> @@ -264,12 +261,12 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> - <member><xref linkend="function.PDOStatement-fetchAll" /></member> - <member><xref linkend="function.PDOStatement-fetchColumn" /></member> - <member><xref linkend="function.PDOStatement-fetchObject" /></member> - <member><xref linkend="function.PDOStatement-setFetchMode" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::execute</function></member> + <member><function>PDOStatement::fetchAll</function></member> + <member><function>PDOStatement::fetchColumn</function></member> + <member><function>PDOStatement::fetchObject</function></member> + <member><function>PDOStatement::setFetchMode</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/fetchall.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/fetchall.xml diff -u phpdoc/en/reference/pdo/pdostatement/fetchall.xml:1.1 phpdoc/en/reference/pdo/pdostatement/fetchall.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/fetchall.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/fetchall.xml Mon Dec 31 15:43:38 2007 @@ -1,23 +1,20 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-fetchAll" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.fetchall" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->fetchAll()</refname> + <refname>PDOStatement->fetchAll</refname> <refpurpose> Returns an array containing all of the result set rows </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>array</type><methodname>fetchAll</methodname> - <methodparam choice="opt"><type>int</type><parameter>fetch_style</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>column_index</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>ctor_args</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>array</type><methodname>PDOStatement::fetchAll</methodname> + <methodparam choice="opt"><type>int</type><parameter>fetch_style</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>column_index</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>ctor_args</parameter></methodparam> + </methodsynopsis> </refsect1> @@ -30,7 +27,7 @@ <listitem> <para> Controls the contents of the returned array as documented in - <xref linkend="function.PDOStatement-fetch" />. Defaults to + <function>PDOStatement::fetch</function>. Defaults to <literal>PDO::FETCH_BOTH</literal>. </para> <para> @@ -76,7 +73,7 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDOStatement-fetchAll" /> returns an array containing + <function>PDOStatement::fetchAll</function> returns an array containing all of the remaining rows in the result set. The array represents each row as either an array of column values or an object with properties corresponding to each column name. @@ -227,11 +224,11 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-query" /></member> - <member><xref linkend="function.PDOStatement-fetch" /></member> - <member><xref linkend="function.PDOStatement-fetchColumn" /></member> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-setFetchMode" /></member> + <member><function>PDO::query</function></member> + <member><function>PDOStatement::fetch</function></member> + <member><function>PDOStatement::fetchColumn</function></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::setFetchMode</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/fetchcolumn.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/fetchcolumn.xml diff -u phpdoc/en/reference/pdo/pdostatement/fetchcolumn.xml:1.1 phpdoc/en/reference/pdo/pdostatement/fetchcolumn.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/fetchcolumn.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/fetchcolumn.xml Mon Dec 31 15:43:38 2007 @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-fetchColumn" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.fetchcolumn" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->fetchColumn()</refname> + <refname>PDOStatement->fetchColumn</refname> <refpurpose> Returns a single column from the next row of a result set </refpurpose> @@ -10,13 +10,10 @@ <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>string</type><methodname>fetchColumn</methodname> - <methodparam choice="opt"><type>int</type><parameter>column_number</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>string</type><methodname>PDOStatement::fetchColumn</methodname> + <methodparam choice="opt"><type>int</type><parameter>column_number</parameter></methodparam> + </methodsynopsis> <para> Returns a single column from the next row of a result set or &false; if @@ -33,7 +30,7 @@ <listitem> <para> 0-indexed number of the column you wish to retrieve from the row. If - no value is supplied, <xref linkend="function.PDOStatement-fetchColumn" /> + no value is supplied, <function>PDOStatement::fetchColumn</function> fetches the first column. </para> </listitem> @@ -45,13 +42,13 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDOStatement-fetchColumn" /> returns a single column + <function>PDOStatement::fetchColumn</function> returns a single column in the next row of a result set. </para> <warning> <para> There is no way to return another column from the same row if you - use <xref linkend="function.PDOStatement-fetchColumn" /> to retrieve data. + use <function>PDOStatement::fetchColumn</function> to retrieve data. </para> </warning> </refsect1> @@ -94,11 +91,11 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-query" /></member> - <member><xref linkend="function.PDOStatement-fetch" /></member> - <member><xref linkend="function.PDOStatement-fetchAll" /></member> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-setFetchMode" /></member> + <member><function>PDO::query</function></member> + <member><function>PDOStatement::fetch</function></member> + <member><function>PDOStatement::fetchAll</function></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::setFetchMode</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/fetchobject.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/fetchobject.xml diff -u phpdoc/en/reference/pdo/pdostatement/fetchobject.xml:1.1 phpdoc/en/reference/pdo/pdostatement/fetchobject.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/fetchobject.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/fetchobject.xml Mon Dec 31 15:43:38 2007 @@ -1,24 +1,21 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-fetchObject" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.fetchobject" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->fetchObject()</refname> + <refname>PDOStatement->fetchObject</refname> <refpurpose>Fetches the next row and returns it as an object.</refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>mixed</type><methodname>fetchObject</methodname> - <methodparam choice="opt"><type>string</type><parameter>class_name</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>ctor_args</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>mixed</type><methodname>PDOStatement::fetchObject</methodname> + <methodparam choice="opt"><type>string</type><parameter>class_name</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>ctor_args</parameter></methodparam> + </methodsynopsis> <para> Fetches the next row and returns it as an object. This function is an - alternative to <xref linkend="function.PDOStatement-fetch" /> with + alternative to <function>PDOStatement::fetch</function> with <constant>PDO::FETCH_CLASS</constant> or <constant>PDO::FETCH_OBJ</constant> style. </para> @@ -59,7 +56,7 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDOStatement-fetch" /></member> + <member><function>PDOStatement::fetch</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/getattribute.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/getattribute.xml diff -u phpdoc/en/reference/pdo/pdostatement/getattribute.xml:1.1 phpdoc/en/reference/pdo/pdostatement/getattribute.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/getattribute.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/getattribute.xml Mon Dec 31 15:43:38 2007 @@ -1,21 +1,18 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-getAttribute" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.getattribute" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->getAttribute()</refname> + <refname>PDOStatement->getAttribute</refname> <refpurpose> Retrieve a statement attribute </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>mixed</type><methodname>getAttribute</methodname> - <methodparam><type>int</type><parameter>attribute</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>mixed</type><methodname>PDOStatement::getAttribute</methodname> + <methodparam><type>int</type><parameter>attribute</parameter></methodparam> + </methodsynopsis> <para> Gets an attribute of the statement. Currently, no generic attributes exist but only driver specific: @@ -40,9 +37,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-getAttribute" /></member> - <member><xref linkend="function.PDO-setAttribute" /></member> - <member><xref linkend="function.PDOStatement-setAttribute" /></member> + <member><function>PDO::getAttribute</function></member> + <member><function>PDO::setAttribute</function></member> + <member><function>PDOStatement::setAttribute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/getcolumnmeta.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/getcolumnmeta.xml diff -u phpdoc/en/reference/pdo/pdostatement/getcolumnmeta.xml:1.1 phpdoc/en/reference/pdo/pdostatement/getcolumnmeta.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/getcolumnmeta.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/getcolumnmeta.xml Mon Dec 31 15:43:38 2007 @@ -1,21 +1,18 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-getColumnMeta" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.getcolumnmeta" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->getColumnMeta()</refname> + <refname>PDOStatement->getColumnMeta</refname> <refpurpose> Returns metadata for a column in a result set </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>array</type><methodname>getColumnMeta</methodname> - <methodparam><type>int</type><parameter>column</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>array</type><methodname>PDOStatement::getColumnMeta</methodname> + <methodparam><type>int</type><parameter>column</parameter></methodparam> + </methodsynopsis> &warn.experimental.func; <para> @@ -25,7 +22,7 @@ <warning> <simpara> Not all PDO drivers support - <xref linkend="function.PDOStatement-getColumnMeta" />. + <function>PDOStatement::getColumnMeta</function>. </simpara> </warning> @@ -72,7 +69,7 @@ <entry><literal>driver:decl_type</literal></entry> <entry>The SQL type used to represent the column value in the database. If the column in the result set is the result of a function, this value - is not returned by <xref linkend="function.PDOStatement-getColumnMeta" />. + is not returned by <function>PDOStatement::getColumnMeta</function>. </entry> </row> <row> @@ -190,8 +187,8 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDOStatement-columnCount" /></member> - <member><xref linkend="function.PDOStatement-rowCount" /></member> + <member><function>PDOStatement::columnCount</function></member> + <member><function>PDOStatement::rowCount</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/nextrowset.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/nextrowset.xml diff -u phpdoc/en/reference/pdo/pdostatement/nextrowset.xml:1.1 phpdoc/en/reference/pdo/pdostatement/nextrowset.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/nextrowset.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/nextrowset.xml Mon Dec 31 15:43:38 2007 @@ -1,26 +1,23 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-nextRowset" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.nextrowset" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->nextRowset()</refname> + <refname>PDOStatement->nextRowset</refname> <refpurpose> Advances to the next rowset in a multi-rowset statement handle </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>nextRowset</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::nextRowset</methodname> + <void/> + </methodsynopsis> <para> Some database servers support stored procedures that return more than one rowset (also known as a result set). - <xref linkend="function.PDOStatement-nextRowset" /> enables you to access the + <function>PDOStatement::nextRowset</function> enables you to access the second and subsequent rowsets associated with a PDOStatement object. Each rowset can have a different set of columns from the preceding rowset. </para> @@ -41,7 +38,7 @@ <para> The following example shows how to call a stored procedure, MULTIPLE_ROWSETS, that returns three rowsets. We use a do / while loop to - loop over the <xref linkend="function.PDOStatement-nextRowset" /> method, which + loop over the <function>PDOStatement::nextRowset</function> method, which returns false and terminates the loop when no more rowsets can be returned. </para> <programlisting role="php"> @@ -96,10 +93,10 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDOStatement-columnCount" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> - <member><xref linkend="function.PDOStatement-getColumnMeta" /></member> - <member><xref linkend="function.PDO-query" /></member> + <member><function>PDOStatement::columnCount</function></member> + <member><function>PDOStatement::execute</function></member> + <member><function>PDOStatement::getColumnMeta</function></member> + <member><function>PDO::query</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/rowcount.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/rowcount.xml diff -u phpdoc/en/reference/pdo/pdostatement/rowcount.xml:1.1 phpdoc/en/reference/pdo/pdostatement/rowcount.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/rowcount.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/rowcount.xml Mon Dec 31 15:43:38 2007 @@ -1,24 +1,21 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-rowCount" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.rowcount" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->rowCount()</refname> + <refname>PDOStatement->rowCount</refname> <refpurpose> Returns the number of rows affected by the last SQL statement </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>int</type><methodname>rowCount</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>int</type><methodname>PDOStatement::rowCount</methodname> + <void/> + </methodsynopsis> <para> - <xref linkend="function.PDOStatement-rowCount" /> returns the number of + <function>PDOStatement::rowCount</function> returns the number of rows affected by the last DELETE, INSERT, or UPDATE statement executed by the corresponding <literal>PDOStatement</literal> object. </para> @@ -44,7 +41,7 @@ <example> <title>Return the number of deleted rows</title> <para> - <xref linkend="function.PDOStatement-rowCount" /> returns the number of + <function>PDOStatement::rowCount</function> returns the number of rows affected by a DELETE, INSERT, or UPDATE statement. </para> <programlisting role="php"> @@ -71,11 +68,11 @@ <example> <title>Counting rows returned by a SELECT statement</title> <para> - For most databases, <xref linkend="function.PDOStatement-rowCount" /> does not + For most databases, <function>PDOStatement::rowCount</function> does not return the number of rows affected by a SELECT statement. Instead, use - <xref linkend="function.PDO-query" /> to issue a SELECT COUNT(*) statement + <function>PDO::query</function> to issue a SELECT COUNT(*) statement with the same predicates as your intended SELECT statement, then use - <xref linkend="function.PDOStatement-fetchColumn" /> to retrieve the number + <function>PDOStatement::fetchColumn</function> to retrieve the number of rows that will be returned. Your application can then perform the correct action. </para> @@ -122,9 +119,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDOStatement-columnCount" /></member> - <member><xref linkend="function.PDOStatement-fetchColumn" /></member> - <member><xref linkend="function.PDO-query" /></member> + <member><function>PDOStatement::columnCount</function></member> + <member><function>PDOStatement::fetchColumn</function></member> + <member><function>PDO::query</function></member> </simplelist> </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/setattribute.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/setattribute.xml diff -u phpdoc/en/reference/pdo/pdostatement/setattribute.xml:1.1 phpdoc/en/reference/pdo/pdostatement/setattribute.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/setattribute.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/setattribute.xml Mon Dec 31 15:43:38 2007 @@ -1,22 +1,19 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-setAttribute" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.setattribute" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->setAttribute()</refname> + <refname>PDOStatement->setAttribute</refname> <refpurpose> Set a statement attribute </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>setAttribute</methodname> - <methodparam><type>int</type><parameter>attribute</parameter></methodparam> - <methodparam><type>mixed</type><parameter>value</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::setAttribute</methodname> + <methodparam><type>int</type><parameter>attribute</parameter></methodparam> + <methodparam><type>mixed</type><parameter>value</parameter></methodparam> + </methodsynopsis> <para> Sets an attribute on the statement. Currently, no generic attributes are set but only driver specific: @@ -41,9 +38,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-getAttribute" /></member> - <member><xref linkend="function.PDO-setAttribute" /></member> - <member><xref linkend="function.PDOStatement-getAttribute" /></member> + <member><function>PDO::getAttribute</function></member> + <member><function>PDO::setAttribute</function></member> + <member><function>PDOStatement::getAttribute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/setfetchmode.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/setfetchmode.xml diff -u phpdoc/en/reference/pdo/pdostatement/setfetchmode.xml:1.1 phpdoc/en/reference/pdo/pdostatement/setfetchmode.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/setfetchmode.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/setfetchmode.xml Mon Dec 31 15:43:38 2007 @@ -1,49 +1,37 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-setFetchMode" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.setfetchmode" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->setFetchMode()</refname> + <refname>PDOStatement->setFetchMode</refname> <refpurpose> Set the default fetch mode for this statement </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>setFetchMode</methodname> - <methodparam><type>int</type><parameter>mode</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>setFetchMode</methodname> - <methodparam><type>int</type><parameter>PDO::FETCH_COLUMN</parameter></methodparam> - <methodparam><type>int</type><parameter>colno</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>setFetchMode</methodname> - <methodparam><type>int</type><parameter>PDO::FETCH_CLASS</parameter></methodparam> - <methodparam><type>string</type><parameter>classname</parameter></methodparam> - <methodparam><type>array</type><parameter>ctorargs</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>setFetchMode</methodname> - <methodparam><type>int</type><parameter>PDO::FETCH_INTO</parameter></methodparam> - <methodparam><type>object</type><parameter>object</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::setFetchMode</methodname> + <methodparam><type>int</type><parameter>mode</parameter></methodparam> + </methodsynopsis> + + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::setFetchMode</methodname> + <methodparam><type>int</type><parameter>PDO::FETCH_COLUMN</parameter></methodparam> + <methodparam><type>int</type><parameter>colno</parameter></methodparam> + </methodsynopsis> + + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::setFetchMode</methodname> + <methodparam><type>int</type><parameter>PDO::FETCH_CLASS</parameter></methodparam> + <methodparam><type>string</type><parameter>classname</parameter></methodparam> + <methodparam><type>array</type><parameter>ctorargs</parameter></methodparam> + </methodsynopsis> + + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::setFetchMode</methodname> + <methodparam><type>int</type><parameter>PDO::FETCH_INTO</parameter></methodparam> + <methodparam><type>object</type><parameter>object</parameter></methodparam> + </methodsynopsis> </refsect1> <refsect1 role="parameters"> @@ -76,7 +64,7 @@ <title>Setting the fetch mode</title> <para> The following example demonstrates how - <xref linkend="function.PDOStatement-setFetchMode" /> changes the default fetch + <function>PDOStatement::setFetchMode</function> changes the default fetch mode for a PDOStatement object. </para> <programlisting role="php"> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_dblib/reference.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc/en/reference/pdo_dblib/reference.xml diff -u phpdoc/en/reference/pdo_dblib/reference.xml:1.7 phpdoc/en/reference/pdo_dblib/reference.xml:1.8 --- phpdoc/en/reference/pdo_dblib/reference.xml:1.7 Wed Jun 20 22:25:12 2007 +++ phpdoc/en/reference/pdo_dblib/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external, pecl --> <!-- State: experimental --> @@ -13,7 +13,7 @@ &reftitle.intro; <para> &warn.experimental; - PDO_DBLIB is a driver that implements the <link linkend="ref.pdo">PHP + PDO_DBLIB is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO) interface</link> to enable access from PHP to Microsoft SQL Server and Sybase databases through the FreeTDS libary. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_ibm/reference.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/reference/pdo_ibm/reference.xml diff -u phpdoc/en/reference/pdo_ibm/reference.xml:1.3 phpdoc/en/reference/pdo_ibm/reference.xml:1.4 --- phpdoc/en/reference/pdo_ibm/reference.xml:1.3 Thu Nov 1 16:40:40 2007 +++ phpdoc/en/reference/pdo_ibm/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- Purpose: database.vendors --> <!-- Membership: external, pecl --> @@ -11,7 +11,7 @@ <section xml:id="pdo-ibm.intro"> &reftitle.intro; <para> - PDO_IBM is a driver that implements the <link linkend="ref.pdo">PHP Data + PDO_IBM is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO)</link> interface to enable access from PHP to IBM databases. </para> </section> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_informix/reference.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc/en/reference/pdo_informix/reference.xml diff -u phpdoc/en/reference/pdo_informix/reference.xml:1.4 phpdoc/en/reference/pdo_informix/reference.xml:1.5 --- phpdoc/en/reference/pdo_informix/reference.xml:1.4 Wed Jun 20 22:25:12 2007 +++ phpdoc/en/reference/pdo_informix/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- Purpose: database.vendors --> <!-- Membership: external, pecl --> @@ -11,7 +11,7 @@ <section xml:id="pdo-informix.intro"> &reftitle.intro; <para> - PDO_INFORMIX is a driver that implements the <link linkend="ref.pdo">PHP Data + PDO_INFORMIX is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO)</link> interface to enable access from PHP to Informix databases. </para> </section> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_mysql/reference.xml?r1=1.11&r2=1.12&diff_format=u Index: phpdoc/en/reference/pdo_mysql/reference.xml diff -u phpdoc/en/reference/pdo_mysql/reference.xml:1.11 phpdoc/en/reference/pdo_mysql/reference.xml:1.12 --- phpdoc/en/reference/pdo_mysql/reference.xml:1.11 Wed Jun 20 22:25:12 2007 +++ phpdoc/en/reference/pdo_mysql/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.11 $ --> +<!-- $Revision: 1.12 $ --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external, pecl --> @@ -11,7 +11,7 @@ <section xml:id="pdo-mysql.intro"> &reftitle.intro; <para> - PDO_MYSQL is a driver that implements the <link linkend="ref.pdo">PHP + PDO_MYSQL is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO) interface</link> to enable access from PHP to MySQL 3.x, 4.x and 5.x databases. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_oci/reference.xml?r1=1.9&r2=1.10&diff_format=u Index: phpdoc/en/reference/pdo_oci/reference.xml diff -u phpdoc/en/reference/pdo_oci/reference.xml:1.9 phpdoc/en/reference/pdo_oci/reference.xml:1.10 --- phpdoc/en/reference/pdo_oci/reference.xml:1.9 Wed Jun 20 22:25:12 2007 +++ phpdoc/en/reference/pdo_oci/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.9 $ --> +<!-- $Revision: 1.10 $ --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external, pecl --> <!-- State: experimental --> @@ -13,7 +13,7 @@ &reftitle.intro; <para> &warn.experimental; - PDO_OCI is a driver that implements the <link linkend="ref.pdo">PHP Data + PDO_OCI is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO) interface</link> to enable access from PHP to Oracle databases through the OCI library. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_odbc/reference.xml?r1=1.12&r2=1.13&diff_format=u Index: phpdoc/en/reference/pdo_odbc/reference.xml diff -u phpdoc/en/reference/pdo_odbc/reference.xml:1.12 phpdoc/en/reference/pdo_odbc/reference.xml:1.13 --- phpdoc/en/reference/pdo_odbc/reference.xml:1.12 Wed Jun 20 22:25:12 2007 +++ phpdoc/en/reference/pdo_odbc/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.12 $ --> +<!-- $Revision: 1.13 $ --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external, pecl --> @@ -11,7 +11,7 @@ <section xml:id="pdo-odbc.intro"> &reftitle.intro; <para> - PDO_ODBC is a driver that implements the <link linkend="ref.pdo">PHP Data + PDO_ODBC is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO) interface</link> to enable access from PHP to databases through ODBC drivers or through the IBM DB2 Call Level Interface (DB2 CLI) library. PDO_ODBC currently supports http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_pgsql/reference.xml?r1=1.11&r2=1.12&diff_format=u Index: phpdoc/en/reference/pdo_pgsql/reference.xml diff -u phpdoc/en/reference/pdo_pgsql/reference.xml:1.11 phpdoc/en/reference/pdo_pgsql/reference.xml:1.12 --- phpdoc/en/reference/pdo_pgsql/reference.xml:1.11 Mon Dec 10 17:06:08 2007 +++ phpdoc/en/reference/pdo_pgsql/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.11 $ --> +<!-- $Revision: 1.12 $ --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external, pecl --> @@ -11,7 +11,7 @@ <section xml:id="pdo-pgsql.intro"> &reftitle.intro; <para> - PDO_PGSQL is a driver that implements the <link linkend="ref.pdo">PHP + PDO_PGSQL is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO) interface</link> to enable access from PHP to PostgreSQL databases. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_sqlite/reference.xml?r1=1.14&r2=1.15&diff_format=u Index: phpdoc/en/reference/pdo_sqlite/reference.xml diff -u phpdoc/en/reference/pdo_sqlite/reference.xml:1.14 phpdoc/en/reference/pdo_sqlite/reference.xml:1.15 --- phpdoc/en/reference/pdo_sqlite/reference.xml:1.14 Thu Dec 27 02:37:10 2007 +++ phpdoc/en/reference/pdo_sqlite/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.14 $ --> +<!-- $Revision: 1.15 $ --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, pecl --> @@ -11,7 +11,7 @@ <section xml:id="pdo-sqlite.intro"> &reftitle.intro; <para> - PDO_SQLITE is a driver that implements the <link linkend="ref.pdo">PHP + PDO_SQLITE is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO) interface</link> to enable access to SQLite 3 databases. </para> <para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sdodasrel/book.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/sdodasrel/book.xml diff -u phpdoc/en/reference/sdodasrel/book.xml:1.2 phpdoc/en/reference/sdodasrel/book.xml:1.3 --- phpdoc/en/reference/sdodasrel/book.xml:1.2 Wed Dec 26 00:07:08 2007 +++ phpdoc/en/reference/sdodasrel/book.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- Purpose: database.abstract --> <!-- Membership: pecl --> <!-- State: experimental --> @@ -27,7 +27,7 @@ In order to use the Relational DAS you will need to be able to create and pass a PDO database connection; for this reason you might also want to take a look at - <link linkend='ref.pdo'>the section on PDO</link>. + <link linkend="intro.pdo">the section on PDO</link>. </para> <para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sqlite/setup.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/sqlite/setup.xml diff -u phpdoc/en/reference/sqlite/setup.xml:1.2 phpdoc/en/reference/sqlite/setup.xml:1.3 --- phpdoc/en/reference/sqlite/setup.xml:1.2 Fri Dec 21 18:01:02 2007 +++ phpdoc/en/reference/sqlite/setup.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <chapter xml:id="sqlite.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.setup; @@ -33,7 +33,7 @@ compiled by default. However, since PHP 5.1.0 you need to manually activate the extension in &php.ini; (because it is now bundled as shared). Moreover, since PHP 5.1.0 SQLite depends on <link - linkend="ref.pdo">PDO</link> it must be enabled too, by adding the + linkend="intro.pdo">PDO</link> it must be enabled too, by adding the following lines to &php.ini; (in order): <informalexample> <programlisting role="ini">
http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/migration51.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc/en/appendices/migration51.xml diff -u phpdoc/en/appendices/migration51.xml:1.6 phpdoc/en/appendices/migration51.xml:1.7 --- phpdoc/en/appendices/migration51.xml:1.6 Wed Dec 26 15:09:25 2007 +++ phpdoc/en/appendices/migration51.xml Mon Dec 31 15:43:37 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <appendix xml:id="migration51" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Migrating from PHP 5.0.x to PHP 5.1.x</title> @@ -649,7 +649,7 @@ The Zend Engine 2.1 API allows extension developers to declare class constants in object oriented extensions. New extensions written for PHP 5.1.x, including <link linkend="ref.spl">SPL</link>, - <link linkend="ref.pdo">PDO</link>, + <link linkend="intro.pdo">PDO</link>, <link linkend="book.xmlreader">XMLReader</link> and <link linkend="ref.datetime">date</link>, have their constants in the format <constant>PDO::CLASS_CONSTANT</constant> rather than in the C @@ -732,14 +732,14 @@ <section xml:id="migration51.databases-pdo"> <title>PDO overview</title> <para> - <link linkend="ref.pdo">PHP Data Objects (PDO)</link> were introduced as a + <link linkend="intro.pdo">PHP Data Objects (PDO)</link> were introduced as a PECL extension under PHP 5.0, and became part of the core PHP distribution in PHP 5.1.x. The PDO extension provides a consistent interface for database access, and is used alongside database-specific PDO drivers. Each driver may also have database-specific functions of its own, but basic data access functionality such as issuing queries and fetching data is covered by PDO functions, using the driver named in - <link linkend="function.PDO-construct">PDO::__construct()</link>. + <function>PDO::__construct</function>. </para> <para> Note that the PDO extension, and its drivers, are intended to be built as http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/migration52.xml?r1=1.30&r2=1.31&diff_format=u Index: phpdoc/en/appendices/migration52.xml diff -u phpdoc/en/appendices/migration52.xml:1.30 phpdoc/en/appendices/migration52.xml:1.31 --- phpdoc/en/appendices/migration52.xml:1.30 Thu Dec 27 00:47:48 2007 +++ phpdoc/en/appendices/migration52.xml Mon Dec 31 15:43:37 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.30 $ --> +<!-- $Revision: 1.31 $ --> <appendix xml:id="migration52" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Migrating from PHP 5.1.x to PHP 5.2.x</title> @@ -1797,7 +1797,7 @@ <section xml:id="migration52.class-constants"> <title>New Class Constants</title> - <para><link linkend="ref.pdo">pdo</link>:</para> + <para><link linkend="intro.pdo">pdo</link>:</para> <itemizedlist> <listitem> <simpara> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/connections.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/reference/pdo/connections.xml diff -u phpdoc/en/reference/pdo/connections.xml:1.3 phpdoc/en/reference/pdo/connections.xml:1.4 --- phpdoc/en/reference/pdo/connections.xml:1.3 Sat Dec 29 01:44:39 2007 +++ phpdoc/en/reference/pdo/connections.xml Mon Dec 31 15:43:37 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <chapter xml:id="pdo.connections" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Connections and Connection management</title> @@ -114,7 +114,7 @@ If you wish to use persistent connections, you must set <constant>PDO::ATTR_PERSISTENT</constant> in the array of driver options passed to the PDO constructor. If setting this attribute with - <xref linkend="function.PDO-setAttribute" /> after instantiation of the + <function>PDO::setAttribute</function> after instantiation of the object, the driver will not use persistent connections. </para> </note> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/error-handling.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/pdo/error-handling.xml diff -u phpdoc/en/reference/pdo/error-handling.xml:1.2 phpdoc/en/reference/pdo/error-handling.xml:1.3 --- phpdoc/en/reference/pdo/error-handling.xml:1.2 Wed Dec 26 14:41:04 2007 +++ phpdoc/en/reference/pdo/error-handling.xml Mon Dec 31 15:43:37 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <chapter xml:id="pdo.error-handling" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Errors and error handling</title> @@ -14,12 +14,12 @@ </para> <para> This is the default mode. PDO will simply set the error code for you - to inspect using the <xref linkend="function.PDO-errorCode" /> and - <xref linkend="function.PDO-errorInfo" /> methods on both the + to inspect using the <function>PDO::errorCode</function> and + <function>PDO::errorInfo</function> methods on both the statement and database objects; if the error resulted from a call on a statement object, you would invoke the - <xref linkend="function.PDOStatement-errorCode" /> or - <xref linkend="function.PDOStatement-errorInfo" /> + <function>PDOStatement::errorCode</function> or + <function>PDOStatement::errorInfo</function> method on that object. If the error resulted from a call on the database object, you would invoke those methods on the database object instead. @@ -65,10 +65,10 @@ <para> PDO standardizes on using SQL-92 SQLSTATE error code strings; individual PDO drivers are responsible for mapping their native codes to the - appropriate SQLSTATE codes. The <xref linkend="function.PDO-errorCode" /> + appropriate SQLSTATE codes. The <function>PDO::errorCode</function> method returns a single SQLSTATE code. If you need more specific information about an error, PDO also offers an - <xref linkend="function.PDO-errorInfo" /> method which returns an array + <function>PDO::errorInfo</function> method which returns an array containing the SQLSTATE code, the driver specific error code and driver specific error string. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/ini.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/reference/pdo/ini.xml diff -u phpdoc/en/reference/pdo/ini.xml:1.3 phpdoc/en/reference/pdo/ini.xml:1.4 --- phpdoc/en/reference/pdo/ini.xml:1.3 Wed Jun 20 22:25:12 2007 +++ phpdoc/en/reference/pdo/ini.xml Mon Dec 31 15:43:37 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <section xml:id="pdo.configuration" xmlns="http://docbook.org/ns/docbook"> &reftitle.runtime; &extension.runtime; @@ -39,7 +39,7 @@ </term> <listitem> <para> - Defines DSN alias. See <xref linkend="function.PDO-construct"/> for + Defines DSN alias. See <function>PDO::__construct</function> for thorough explanation. </para> </listitem> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/lobs.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/pdo/lobs.xml diff -u phpdoc/en/reference/pdo/lobs.xml:1.2 phpdoc/en/reference/pdo/lobs.xml:1.3 --- phpdoc/en/reference/pdo/lobs.xml:1.2 Wed Dec 26 14:41:04 2007 +++ phpdoc/en/reference/pdo/lobs.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <chapter xml:id="pdo.lobs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Large Objects (LOBs)</title> @@ -10,8 +10,8 @@ "large". Large objects can be either textual or binary in nature. PDO allows you to work with this large data type by using the <constant>PDO::PARAM_LOB</constant> - type code in your <xref linkend="function.PDOStatement-bindParam" /> or - <xref linkend="function.PDOStatement-bindColumn" /> calls. + type code in your <function>PDOStatement::bindParam</function> or + <function>PDOStatement::bindColumn</function> calls. <constant>PDO::PARAM_LOB</constant> tells PDO to map the data as a stream, so that you can manipulate it using the <link linkend='ref.stream'>PHP Streams API</link>. http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo.xml diff -u phpdoc/en/reference/pdo/pdo.xml:1.1 phpdoc/en/reference/pdo/pdo.xml:1.2 --- phpdoc/en/reference/pdo/pdo.xml:1.1 Mon Dec 31 14:34:04 2007 +++ phpdoc/en/reference/pdo/pdo.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> +<!-- $Revision: 1.2 $ --> <reference xml:id="class.pdo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>The PDO class</title> @@ -31,6 +31,7 @@ </classsynopsisinfo> <!-- }}} --> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])" /> <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" /> <!-- }}} --> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/transactions.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/pdo/transactions.xml diff -u phpdoc/en/reference/pdo/transactions.xml:1.2 phpdoc/en/reference/pdo/transactions.xml:1.3 --- phpdoc/en/reference/pdo/transactions.xml:1.2 Wed Dec 26 14:41:04 2007 +++ phpdoc/en/reference/pdo/transactions.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <chapter xml:id="pdo.transactions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Transactions and auto-commit</title> @@ -27,12 +27,12 @@ connection. Auto-commit mode means that every query that you run has its own implicit transaction, if the database supports it, or no transaction if the database doesn't support transactions. If you need a transaction, - you must use the <xref linkend="function.PDO-beginTransaction" /> method to + you must use the <function>PDO::beginTransaction</function> method to initiate one. If the underlying driver does not support transactions, a PDOException will be thrown (regardless of your error handling settings: this is always a serious error condition). Once you are in a transaction, - you may use <xref linkend="function.PDO-commit" /> or - <xref linkend="function.PDO-rollBack" /> to finish it, depending on the success + you may use <function>PDO::commit</function> or + <function>PDO::rollBack</function> to finish it, depending on the success of the code you run during the transaction. </para> <para> @@ -46,7 +46,7 @@ <warning> <para> The automatic rollback only happens if you initiate the transaction via - <xref linkend="function.PDO-beginTransaction" />. If you manually issue a + <function>PDO::beginTransaction</function>. If you manually issue a query that begins a transaction PDO has no way of knowing about it and thus cannot roll it back if something bad happens. </para> @@ -59,8 +59,8 @@ In addition to entering the basic data for that person, we also need to record their salary. It's pretty simple to make two separate updates, but by enclosing them within the - <xref linkend="function.PDO-beginTransaction" /> and - <xref linkend="function.PDO-commit" /> calls, we are guaranteeing that no one + <function>PDO::beginTransaction</function> and + <function>PDO::commit</function> calls, we are guaranteeing that no one else will be able to see those changes until they are complete. If something goes wrong, the catch block rolls back all changes made since the transaction was started, and then prints out an error http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/begintransaction.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/begintransaction.xml diff -u phpdoc/en/reference/pdo/pdo/begintransaction.xml:1.1 phpdoc/en/reference/pdo/pdo/begintransaction.xml:1.2 --- phpdoc/en/reference/pdo/pdo/begintransaction.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/begintransaction.xml Mon Dec 31 15:43:38 2007 @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-beginTransaction" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.begintransaction" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->beginTransaction()</refname> + <refname>PDO::beginTransaction</refname> <refpurpose> Initiates a transaction </refpurpose> @@ -10,18 +10,15 @@ <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>beginTransaction</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDO::beginTransaction</methodname> + <void/> + </methodsynopsis> <para> Turns off autocommit mode. While autocommit mode is turned off, changes made to the database via the PDO object instance are not committed until - you end the transaction by calling <xref linkend="function.PDO-commit" />. - Calling <xref linkend="function.PDO-rollBack" /> will roll back all changes to + you end the transaction by calling <function>PDO::commit</function>. + Calling <function>PDO::rollBack</function> will roll back all changes to the database and return the connection to autocommit mode. </para> <para> @@ -78,8 +75,8 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-commit" /></member> - <member><xref linkend="function.PDO-rollBack" /></member> + <member><function>PDO::commit</function></member> + <member><function>PDO::rollBack</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/commit.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/commit.xml diff -u phpdoc/en/reference/pdo/pdo/commit.xml:1.1 phpdoc/en/reference/pdo/pdo/commit.xml:1.2 --- phpdoc/en/reference/pdo/pdo/commit.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/commit.xml Mon Dec 31 15:43:38 2007 @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-commit" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.commit" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->commit()</refname> + <refname>PDO::commit</refname> <refpurpose> Commits a transaction </refpurpose> @@ -10,16 +10,13 @@ <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>commit</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDO::commit</methodname> + <void/> + </methodsynopsis> <para> Commits a transaction, returning the database connection to autocommit - mode until the next call to <xref linkend="function.PDO-beginTransaction" /> + mode until the next call to <function>PDO::beginTransaction</function> starts a new transaction. </para> </refsect1> @@ -59,8 +56,8 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-beginTransaction" /></member> - <member><xref linkend="function.PDO-rollBack" /></member> + <member><function>PDO::beginTransaction</function></member> + <member><function>PDO::rollBack</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/construct.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/construct.xml diff -u phpdoc/en/reference/pdo/pdo/construct.xml:1.1 phpdoc/en/reference/pdo/pdo/construct.xml:1.2 --- phpdoc/en/reference/pdo/pdo/construct.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/construct.xml Mon Dec 31 15:43:38 2007 @@ -1,24 +1,21 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-construct" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.--construct" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->__construct()</refname> + <refname>PDO::__construct</refname> <refpurpose> Creates a PDO instance representing a connection to a database </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>PDO</type><methodname>__construct</methodname> - <methodparam><type>string</type><parameter>dsn</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter>username</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>driver_options</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <constructorsynopsis> + <methodname>PDO::__construct</methodname> + <methodparam><type>string</type><parameter>dsn</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>username</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>driver_options</parameter></methodparam> + </constructorsynopsis> <para> Creates a PDO instance to represent a connection to the requested database. @@ -120,7 +117,7 @@ <refsect1 role="errors"> &reftitle.errors; <para> - <xref linkend="function.PDO-construct" /> throws a PDOException if the attempt + <function>PDO::__construct</function> throws a PDOException if the attempt to connect to the requested database fails. </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/errorcode.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/errorcode.xml diff -u phpdoc/en/reference/pdo/pdo/errorcode.xml:1.1 phpdoc/en/reference/pdo/pdo/errorcode.xml:1.2 --- phpdoc/en/reference/pdo/pdo/errorcode.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/errorcode.xml Mon Dec 31 15:43:38 2007 @@ -1,21 +1,18 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-errorCode" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.errorcode" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->errorCode()</refname> + <refname>PDO::errorCode</refname> <refpurpose> Fetch the SQLSTATE associated with the last operation on the database handle </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>string</type><methodname>errorCode</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>string</type><methodname>PDO::errorCode</methodname> + <void/> + </methodsynopsis> </refsect1> @@ -33,12 +30,12 @@ class indicates that there is no subclass for that SQLSTATE. </para> <para> - <xref linkend="function.PDO-errorCode" /> only retrieves error codes for operations + <function>PDO::errorCode</function> only retrieves error codes for operations performed directly on the database handle. If you create a PDOStatement - object through <xref linkend="function.PDO-prepare" /> or - <xref linkend="function.PDO-query" /> and invoke an error on the statement - handle, <xref linkend="function.PDO-errorCode" /> will not reflect that error. - You must call <xref linkend="function.PDOStatement-errorCode" /> to return the error + object through <function>PDO::prepare</function> or + <function>PDO::query</function> and invoke an error on the statement + handle, <function>PDO::errorCode</function> will not reflect that error. + You must call <function>PDOStatement::errorCode</function> to return the error code for an operation performed on a particular statement handle. </para> </refsect1> @@ -72,9 +69,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-errorInfo" /></member> - <member><xref linkend="function.PDOStatement-errorCode" /></member> - <member><xref linkend="function.PDOStatement-errorInfo" /></member> + <member><function>PDO::errorInfo</function></member> + <member><function>PDOStatement::errorCode</function></member> + <member><function>PDOStatement::errorInfo</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/errorinfo.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/errorinfo.xml diff -u phpdoc/en/reference/pdo/pdo/errorinfo.xml:1.1 phpdoc/en/reference/pdo/pdo/errorinfo.xml:1.2 --- phpdoc/en/reference/pdo/pdo/errorinfo.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/errorinfo.xml Mon Dec 31 15:43:38 2007 @@ -1,28 +1,25 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-errorInfo" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.errorinfo" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->errorInfo()</refname> + <refname>PDO::errorInfo</refname> <refpurpose> Fetch extended error information associated with the last operation on the database handle </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>array</type><methodname>errorInfo</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>array</type><methodname>PDO::errorInfo</methodname> + <void/> + </methodsynopsis> </refsect1> <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDO-errorInfo" /> returns an array of error information + <function>PDO::errorInfo</function> returns an array of error information about the last operation performed by this database handle. The array consists of the following fields: <informaltable> @@ -53,13 +50,13 @@ </para> <para> - <xref linkend="function.PDO-errorInfo" /> only retrieves error information for + <function>PDO::errorInfo</function> only retrieves error information for operations performed directly on the database handle. If you create a - PDOStatement object through <xref linkend="function.PDO-prepare" /> or - <xref linkend="function.PDO-query" /> and invoke an error on the statement - handle, <xref linkend="function.PDO-errorInfo" /> will not reflect the error + PDOStatement object through <function>PDO::prepare</function> or + <function>PDO::query</function> and invoke an error on the statement + handle, <function>PDO::errorInfo</function> will not reflect the error from the statement handle. You must call - <xref linkend="function.PDOStatement-errorInfo" /> to return the error + <function>PDOStatement::errorInfo</function> to return the error information for an operation performed on a particular statement handle. </para> </refsect1> @@ -100,9 +97,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-errorCode" /></member> - <member><xref linkend="function.PDOStatement-errorCode" /></member> - <member><xref linkend="function.PDOStatement-errorInfo" /></member> + <member><function>PDO::errorCode</function></member> + <member><function>PDOStatement::errorCode</function></member> + <member><function>PDOStatement::errorInfo</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/exec.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/exec.xml diff -u phpdoc/en/reference/pdo/pdo/exec.xml:1.1 phpdoc/en/reference/pdo/pdo/exec.xml:1.2 --- phpdoc/en/reference/pdo/pdo/exec.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/exec.xml Mon Dec 31 15:43:38 2007 @@ -1,34 +1,31 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-exec" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.exec" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->exec()</refname> + <refname>PDO::exec</refname> <refpurpose> Execute an SQL statement and return the number of affected rows </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>int</type><methodname>exec</methodname> - <methodparam><type>string</type><parameter>statement</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>int</type><methodname>PDO::exec</methodname> + <methodparam><type>string</type><parameter>statement</parameter></methodparam> + </methodsynopsis> <para> - <xref linkend="function.PDO-exec" /> executes an SQL statement in + <function>PDO::exec</function> executes an SQL statement in a single function call, returning the number of rows affected by the statement. </para> <para> - <xref linkend="function.PDO-exec" /> does not return results from a SELECT + <function>PDO::exec</function> does not return results from a SELECT statement. For a SELECT statement that you only need to issue once - during your program, consider issuing <xref linkend="function.PDO-query" />. + during your program, consider issuing <function>PDO::query</function>. For a statement that you need to issue multiple times, prepare - a PDOStatement object with <xref linkend="function.PDO-prepare" /> and issue - the statement with <xref linkend="function.PDOStatement-execute" />. + a PDOStatement object with <function>PDO::prepare</function> and issue + the statement with <function>PDOStatement::execute</function>. </para> </refsect1> @@ -50,15 +47,15 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDO-exec" /> returns the number of rows that were modified + <function>PDO::exec</function> returns the number of rows that were modified or deleted by the SQL statement you issued. If no rows were affected, - <xref linkend="function.PDO-exec" /> returns <literal>0</literal>. + <function>PDO::exec</function> returns <literal>0</literal>. </para> &return.falseproblem; <para> The following example incorrectly relies on the return value of - <xref linkend="function.PDO-exec" />, wherein a statement that affected 0 rows + <function>PDO::exec</function>, wherein a statement that affected 0 rows results in a call to <function>die</function>: <programlisting role="php"> <![CDATA[ @@ -108,9 +105,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDO-query" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDO::query</function></member> + <member><function>PDOStatement::execute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/getattribute.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/getattribute.xml diff -u phpdoc/en/reference/pdo/pdo/getattribute.xml:1.1 phpdoc/en/reference/pdo/pdo/getattribute.xml:1.2 --- phpdoc/en/reference/pdo/pdo/getattribute.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/getattribute.xml Mon Dec 31 15:43:38 2007 @@ -1,26 +1,23 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-getAttribute" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.getattribute" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->getAttribute()</refname> + <refname>PDO::getAttribute</refname> <refpurpose> Retrieve a database connection attribute </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>mixed</type><methodname>getAttribute</methodname> - <methodparam><type>int</type><parameter>attribute</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>mixed</type><methodname>PDO::getAttribute</methodname> + <methodparam><type>int</type><parameter>attribute</parameter></methodparam> + </methodsynopsis> <para> This function returns the value of a database connection attribute. To retrieve PDOStatement attributes, refer to - <xref linkend="function.PDOStatement-getAttribute" />. + <function>PDOStatement::getAttribute</function>. </para> <para> @@ -107,9 +104,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-setAttribute" /></member> - <member><xref linkend="function.PDOStatement-getAttribute" /></member> - <member><xref linkend="function.PDOStatement-setAttribute" /></member> + <member><function>PDO::setAttribute</function></member> + <member><function>PDOStatement::getAttribute</function></member> + <member><function>PDOStatement::setAttribute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/getavailabledrivers.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/getavailabledrivers.xml diff -u phpdoc/en/reference/pdo/pdo/getavailabledrivers.xml:1.1 phpdoc/en/reference/pdo/pdo/getavailabledrivers.xml:1.2 --- phpdoc/en/reference/pdo/pdo/getavailabledrivers.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/getavailabledrivers.xml Mon Dec 31 15:43:38 2007 @@ -1,32 +1,29 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-getAvailableDrivers" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.getavailabledrivers" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->getAvailableDrivers()</refname> + <refname>PDO::getAvailableDrivers</refname> <refpurpose> Return an array of available PDO drivers </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>array</type><methodname>getAvailableDrivers</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>array</type><methodname>PDO::getAvailableDrivers</methodname> + <void/> + </methodsynopsis> <para> This function returns all currently available PDO drivers which can be used in <parameter>DSN</parameter> parameter of - <xref linkend="function.PDO-construct" />. This is a static method. + <function>PDO::__construct</function>. This is a static method. </para> </refsect1> <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDO-getAvailableDrivers" /> returns an array of PDO driver names. If + <function>PDO::getAvailableDrivers</function> returns an array of PDO driver names. If no drivers are available, it returns an empty array. </para> </refsect1> @@ -35,7 +32,7 @@ &reftitle.examples; <para> <example> - <title>A <xref linkend="function.PDO-getAvailableDrivers" /> example</title> + <title>A <function>PDO::getAvailableDrivers</function> example</title> <programlisting role="php"> <![CDATA[ <?php http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/lastinsertid.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/lastinsertid.xml diff -u phpdoc/en/reference/pdo/pdo/lastinsertid.xml:1.1 phpdoc/en/reference/pdo/pdo/lastinsertid.xml:1.2 --- phpdoc/en/reference/pdo/pdo/lastinsertid.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/lastinsertid.xml Mon Dec 31 15:43:38 2007 @@ -1,21 +1,18 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-lastInsertId" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.lastinsertid" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->lastInsertId()</refname> + <refname>PDO::lastInsertId</refname> <refpurpose> Returns the ID of the last inserted row or sequence value </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>string</type><methodname>lastInsertId</methodname> - <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>string</type><methodname>PDO::lastInsertId</methodname> + <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam> + </methodsynopsis> <para> Returns the ID of the last inserted row, or the last value from a @@ -52,19 +49,19 @@ &reftitle.returnvalues; <para> If a sequence name was not specified for the <parameter>name</parameter> - parameter, <xref linkend="function.PDO-lastInsertId" /> returns a + parameter, <function>PDO::lastInsertId</function> returns a string representing the row ID of the last row that was inserted into the database. </para> <para> If a sequence name was specified for the <parameter>name</parameter> - parameter, <xref linkend="function.PDO-lastInsertId" /> returns a + parameter, <function>PDO::lastInsertId</function> returns a string representing the last value retrieved from the specified sequence object. </para> <para> If the PDO driver does not support this capability, - <xref linkend="function.PDO-lastInsertId" /> triggers an + <function>PDO::lastInsertId</function> triggers an <literal>IM001</literal> SQLSTATE. </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/prepare.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/prepare.xml diff -u phpdoc/en/reference/pdo/pdo/prepare.xml:1.1 phpdoc/en/reference/pdo/pdo/prepare.xml:1.2 --- phpdoc/en/reference/pdo/pdo/prepare.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/prepare.xml Mon Dec 31 15:43:38 2007 @@ -1,26 +1,23 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-prepare" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.prepare" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->prepare()</refname> + <refname>PDO::prepare</refname> <refpurpose> Prepares a statement for execution and returns a statement object </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>PDOStatement</type><methodname>prepare</methodname> - <methodparam><type>string</type><parameter>statement</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>driver_options</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>PDOStatement</type><methodname>PDO::prepare</methodname> + <methodparam><type>string</type><parameter>statement</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>driver_options</parameter></methodparam> + </methodsynopsis> <para> Prepares an SQL statement to be executed by the - <xref linkend="function.PDOStatement-execute" /> method. The SQL statement can + <function>PDOStatement::execute</function> method. The SQL statement can contain zero or more named (:name) or question mark (?) parameter markers for which real values will be substituted when the statement is executed. You cannot use both named and question mark parameter markers within the same @@ -28,14 +25,14 @@ </para> <para> You must include a unique parameter marker for each value you wish to pass - in to the statement when you call <xref linkend="function.PDOStatement-execute" />. + in to the statement when you call <function>PDOStatement::execute</function>. You cannot use a named parameter marker of the same name twice in a prepared statement. You cannot bind multiple values to a single named parameter in, for example, the IN() clause of an SQL statement. </para> <para> - Calling <xref linkend="function.PDO-prepare" /> and - <xref linkend="function.PDOStatement-execute" /> for statements that will be + Calling <function>PDO::prepare</function> and + <function>PDOStatement::execute</function> for statements that will be issued multiple times with different parameter values optimizes the performance of your application by allowing the driver to negotiate client and/or server side caching of the query plan and meta information, @@ -83,9 +80,9 @@ &reftitle.returnvalues; <para> If the database server successfully prepares the statement, - <xref linkend="function.PDO-prepare" /> returns a PDOStatement object. + <function>PDO::prepare</function> returns a PDOStatement object. If the database server cannot successfully prepare the statement, - <xref linkend="function.PDO-prepare" /> returns &false;. + <function>PDO::prepare</function> returns &false;. </para> </refsect1> @@ -133,9 +130,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-exec" /></member> - <member><xref linkend="function.PDO-query" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> + <member><function>PDO::exec</function></member> + <member><function>PDO::query</function></member> + <member><function>PDOStatement::execute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/query.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/query.xml diff -u phpdoc/en/reference/pdo/pdo/query.xml:1.1 phpdoc/en/reference/pdo/pdo/query.xml:1.2 --- phpdoc/en/reference/pdo/pdo/query.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/query.xml Mon Dec 31 15:43:38 2007 @@ -1,70 +1,58 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-query" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.query" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->query()</refname> + <refname>PDO::query</refname> <refpurpose> Executes an SQL statement, returning a result set as a PDOStatement object </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>PDOStatement</type><methodname>query</methodname> - <methodparam><type>string</type><parameter>statement</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>PDOStatement</type><methodname>query</methodname> - <methodparam><type>string</type><parameter>statement</parameter></methodparam> - <methodparam><type>int</type><parameter>PDO::FETCH_COLUMN</parameter></methodparam> - <methodparam><type>int</type><parameter>colno</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>PDOStatement</type><methodname>query</methodname> - <methodparam><type>string</type><parameter>statement</parameter></methodparam> - <methodparam><type>int</type><parameter>PDO::FETCH_CLASS</parameter></methodparam> - <methodparam><type>string</type><parameter>classname</parameter></methodparam> - <methodparam><type>array</type><parameter>ctorargs</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>PDOStatement</type><methodname>query</methodname> - <methodparam><type>string</type><parameter>statement</parameter></methodparam> - <methodparam><type>int</type><parameter>PDO::FETCH_INTO</parameter></methodparam> - <methodparam><type>object</type><parameter>object</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>PDOStatement</type><methodname>PDO::query</methodname> + <methodparam><type>string</type><parameter>statement</parameter></methodparam> + </methodsynopsis> + + <methodsynopsis> + <type>PDOStatement</type><methodname>PDO::query</methodname> + <methodparam><type>string</type><parameter>statement</parameter></methodparam> + <methodparam><type>int</type><parameter>PDO::FETCH_COLUMN</parameter></methodparam> + <methodparam><type>int</type><parameter>colno</parameter></methodparam> + </methodsynopsis> + + <methodsynopsis> + <type>PDOStatement</type><methodname>PDO::query</methodname> + <methodparam><type>string</type><parameter>statement</parameter></methodparam> + <methodparam><type>int</type><parameter>PDO::FETCH_CLASS</parameter></methodparam> + <methodparam><type>string</type><parameter>classname</parameter></methodparam> + <methodparam><type>array</type><parameter>ctorargs</parameter></methodparam> + </methodsynopsis> + + <methodsynopsis> + <type>PDOStatement</type><methodname>PDO::query</methodname> + <methodparam><type>string</type><parameter>statement</parameter></methodparam> + <methodparam><type>int</type><parameter>PDO::FETCH_INTO</parameter></methodparam> + <methodparam><type>object</type><parameter>object</parameter></methodparam> + </methodsynopsis> <para> - <xref linkend="function.PDO-query" /> executes an SQL statement in + <function>PDO::query</function> executes an SQL statement in a single function call, returning the result set (if any) returned by the statement as a PDOStatement object. </para> <para> For a query that you need to issue multiple times, you will realize better performance if you prepare a PDOStatement object using - <xref linkend="function.PDO-prepare" /> and issue the statement with multiple - calls to <xref linkend="function.PDOStatement-execute" />. + <function>PDO::prepare</function> and issue the statement with multiple + calls to <function>PDOStatement::execute</function>. </para> <para> If you do not fetch all of the data in a result set before issuing your - next call to <xref linkend="function.PDO-query" />, your call may fail. Call - <xref linkend="function.PDOStatement-closeCursor" /> to release the database + next call to <function>PDO::query</function>, your call may fail. Call + <function>PDOStatement::closeCursor</function> to release the database resources associated with the PDOStatement object before issuing your - next call to <xref linkend="function.PDO-query" />. + next call to <function>PDO::query</function>. </para> <note> @@ -72,7 +60,7 @@ Although this function is only documented as having a single parameter, you may pass additional arguments to this function. They will be treated as though you called - <xref linkend="function.PDOStatement-setFetchMode" /> on the resultant statement + <function>PDOStatement::setFetchMode</function> on the resultant statement object. </para> </note> @@ -96,7 +84,7 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDO-query" /> returns a PDOStatement object. + <function>PDO::query</function> returns a PDOStatement object. </para> </refsect1> @@ -106,7 +94,7 @@ <example> <title>Demonstrate PDO::query</title> <para> - A nice feature of <xref linkend="function.PDO-query" /> is that it + A nice feature of <function>PDO::query</function> is that it enables you to iterate over the rowset returned by a successfully executed SELECT statement. </para> @@ -145,9 +133,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-exec" /></member> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> + <member><function>PDO::exec</function></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::execute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/quote.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/quote.xml diff -u phpdoc/en/reference/pdo/pdo/quote.xml:1.1 phpdoc/en/reference/pdo/pdo/quote.xml:1.2 --- phpdoc/en/reference/pdo/pdo/quote.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/quote.xml Mon Dec 31 15:43:38 2007 @@ -1,33 +1,30 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-quote" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.quote" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->quote()</refname> + <refname>PDO::quote</refname> <refpurpose> Quotes a string for use in a query. </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>string</type><methodname>quote</methodname> - <methodparam><type>string</type><parameter>string</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>parameter_type</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>string</type><methodname>PDO::quote</methodname> + <methodparam><type>string</type><parameter>string</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>parameter_type</parameter></methodparam> + </methodsynopsis> <para> - <xref linkend="function.PDO-quote" /> places quotes around the input string (if + <function>PDO::quote</function> places quotes around the input string (if required) and escapes special characters within the input string, using a quoting style appropriate to the underlying driver. </para> <para> If you are using this function to build SQL statements, you are <emphasis>strongly</emphasis> recommended to use - <xref linkend="function.PDO-prepare" /> to prepare SQL statements with bound - parameters instead of using <xref linkend="function.PDO-quote" /> to interpolate + <function>PDO::prepare</function> to prepare SQL statements with bound + parameters instead of using <function>PDO::quote</function> to interpolate user input into a SQL statement. Prepared statements with bound parameters are not only more portable, more convenient, immune to SQL injection, but are often much faster to execute than interpolated queries, as both the @@ -156,8 +153,8 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::execute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/rollback.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/rollback.xml diff -u phpdoc/en/reference/pdo/pdo/rollback.xml:1.1 phpdoc/en/reference/pdo/pdo/rollback.xml:1.2 --- phpdoc/en/reference/pdo/pdo/rollback.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/rollback.xml Mon Dec 31 15:43:38 2007 @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-rollBack" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.rollback" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->rollBack()</refname> + <refname>PDO::rollBack</refname> <refpurpose> Rolls back a transaction </refpurpose> @@ -10,17 +10,14 @@ <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>rollBack</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDO::rollBack</methodname> + <void/> + </methodsynopsis> <para> Rolls back the current transaction, as initiated by - <xref linkend="function.PDO-beginTransaction" />. It is an error to call this + <function>PDO::beginTransaction</function>. It is an error to call this method if no transaction is active. </para> <para> @@ -80,8 +77,8 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-beginTransaction" /></member> - <member><xref linkend="function.PDO-commit" /></member> + <member><function>PDO::beginTransaction</function></member> + <member><function>PDO::commit</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdo/setattribute.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdo/setattribute.xml diff -u phpdoc/en/reference/pdo/pdo/setattribute.xml:1.1 phpdoc/en/reference/pdo/pdo/setattribute.xml:1.2 --- phpdoc/en/reference/pdo/pdo/setattribute.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdo/setattribute.xml Mon Dec 31 15:43:38 2007 @@ -1,22 +1,19 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDO-setAttribute" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdo.setattribute" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDO->setAttribute()</refname> + <refname>PDO::setAttribute</refname> <refpurpose> Set an attribute </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDO</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>setAttribute</methodname> - <methodparam><type>int</type><parameter>attribute</parameter></methodparam> - <methodparam><type>mixed</type><parameter>value</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDO::setAttribute</methodname> + <methodparam><type>int</type><parameter>attribute</parameter></methodparam> + <methodparam><type>mixed</type><parameter>value</parameter></methodparam> + </methodsynopsis> <para> Sets an attribute on the database handle. Some of the available generic http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/bindcolumn.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/bindcolumn.xml diff -u phpdoc/en/reference/pdo/pdostatement/bindcolumn.xml:1.1 phpdoc/en/reference/pdo/pdostatement/bindcolumn.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/bindcolumn.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/bindcolumn.xml Mon Dec 31 15:43:38 2007 @@ -1,36 +1,33 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-bindColumn" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.bindcolumn" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->bindColumn()</refname> + <refname>PDOStatement->bindColumn</refname> <refpurpose> Bind a column to a PHP variable </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> <methodsynopsis> - <type>bool</type><methodname>bindColumn</methodname> + <type>bool</type><methodname>PDOStatement::bindColumn</methodname> <methodparam><type>mixed</type><parameter>column</parameter></methodparam> <methodparam><type>mixed</type><parameter role="reference">param</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>type</parameter></methodparam> </methodsynopsis> - </classsynopsis> <para> - <xref linkend="function.PDOStatement-bindColumn" /> arranges to have a + <function>PDOStatement::bindColumn</function> arranges to have a particular variable bound to a given column in the result-set from a - query. Each call to <xref linkend="function.PDOStatement-fetch" /> or - <xref linkend="function.PDOStatement-fetchAll" /> will update all the variables + query. Each call to <function>PDOStatement::fetch</function> or + <function>PDOStatement::fetchAll</function> will update all the variables that are bound to columns. </para> <note> <para> Since information about the columns is not always available to PDO until the statement is executed, portable applications should call this - function <emphasis>after</emphasis> <xref linkend="function.PDOStatement-execute" />. + function <emphasis>after</emphasis> <function>PDOStatement::execute</function>. </para> </note> </refsect1> @@ -136,10 +133,10 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDOStatement-execute" /></member> - <member><xref linkend="function.PDOStatement-fetch" /></member> - <member><xref linkend="function.PDOStatement-fetchAll" /></member> - <member><xref linkend="function.PDOStatement-fetchColumn" /></member> + <member><function>PDOStatement::execute</function></member> + <member><function>PDOStatement::fetch</function></member> + <member><function>PDOStatement::fetchAll</function></member> + <member><function>PDOStatement::fetchColumn</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/bindparam.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/bindparam.xml diff -u phpdoc/en/reference/pdo/pdostatement/bindparam.xml:1.1 phpdoc/en/reference/pdo/pdostatement/bindparam.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/bindparam.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/bindparam.xml Mon Dec 31 15:43:38 2007 @@ -1,31 +1,28 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-bindParam" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.bindparam" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->bindParam()</refname> + <refname>PDOStatement->bindParam</refname> <refpurpose> Binds a parameter to the specified variable name </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>bindParam</methodname> - <methodparam><type>mixed</type><parameter>parameter</parameter></methodparam> - <methodparam><type>mixed</type><parameter role="reference">variable</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>data_type</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam> - <methodparam choice="opt"><type>mixed</type><parameter>driver_options</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::bindParam</methodname> + <methodparam><type>mixed</type><parameter>parameter</parameter></methodparam> + <methodparam><type>mixed</type><parameter role="reference">variable</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>data_type</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam> + <methodparam choice="opt"><type>mixed</type><parameter>driver_options</parameter></methodparam> + </methodsynopsis> <para> Binds a PHP variable to a corresponding named or question mark placeholder in the SQL statement that was use to prepare the statement. Unlike - <xref linkend="function.PDOStatement-bindValue" />, the variable is bound as a + <function>PDOStatement::bindValue</function>, the variable is bound as a reference and will only be evaluated at the time that - <xref linkend="function.PDOStatement-execute" /> is called. + <function>PDOStatement::execute</function> is called. </para> <para> Most parameters are input parameters, that is, parameters that are used @@ -184,9 +181,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> - <member><xref linkend="function.PDOStatement-bindValue" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::execute</function></member> + <member><function>PDOStatement::bindValue</function></member> </simplelist> </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/bindvalue.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/bindvalue.xml diff -u phpdoc/en/reference/pdo/pdostatement/bindvalue.xml:1.1 phpdoc/en/reference/pdo/pdostatement/bindvalue.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/bindvalue.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/bindvalue.xml Mon Dec 31 15:43:38 2007 @@ -1,23 +1,20 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-bindValue" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.bindvalue" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->bindValue()</refname> + <refname>PDOStatement->bindValue</refname> <refpurpose> Binds a value to a parameter </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>bindValue</methodname> - <methodparam><type>mixed</type><parameter>parameter</parameter></methodparam> - <methodparam><type>mixed</type><parameter>value</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>data_type</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::bindValue</methodname> + <methodparam><type>mixed</type><parameter>parameter</parameter></methodparam> + <methodparam><type>mixed</type><parameter>value</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>data_type</parameter></methodparam> + </methodsynopsis> <para> Binds a value to a corresponding named or question mark placeholder in the SQL statement that was use to prepare the statement. @@ -114,9 +111,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> - <member><xref linkend="function.PDOStatement-bindParam" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::execute</function></member> + <member><function>PDOStatement::bindParam</function></member> </simplelist> </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/closecursor.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/closecursor.xml diff -u phpdoc/en/reference/pdo/pdostatement/closecursor.xml:1.1 phpdoc/en/reference/pdo/pdostatement/closecursor.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/closecursor.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/closecursor.xml Mon Dec 31 15:43:38 2007 @@ -1,24 +1,21 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-closeCursor" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.closecursor" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->closeCursor()</refname> + <refname>PDOStatement->closeCursor</refname> <refpurpose> Closes the cursor, enabling the statement to be executed again. </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>closeCursor</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::closeCursor</methodname> + <void/> + </methodsynopsis> <para> - <xref linkend="function.PDOStatement-closeCursor" /> frees up the connection + <function>PDOStatement::closeCursor</function> frees up the connection to the server so that other SQL statements may be issued, but leaves the statement in a state that enables it to be executed again. </para> @@ -29,7 +26,7 @@ the problem may manifest itself in an out-of-sequence error. </para> <para> - <xref linkend="function.PDOStatement-closeCursor" /> is implemented either as an + <function>PDOStatement::closeCursor</function> is implemented either as an optional driver specific method (allowing for maximum efficiency), or as the generic PDO fallback if no driver specific function is installed. The PDO generic fallback is semantically the same as writing the following @@ -61,13 +58,13 @@ &reftitle.examples; <para> <example> - <title>A <xref linkend="function.PDOStatement-closeCursor" /> example</title> + <title>A <function>PDOStatement::closeCursor</function> example</title> <para> In the following example, the <varname>$stmt</varname> PDOStatement object returns multiple rows but the application fetches only the first row, leaving the PDOStatement object in a state of having unfetched rows. To ensure that the application will work with all database drivers, the - author inserts a call to <xref linkend="function.PDOStatement-closeCursor" /> + author inserts a call to <function>PDOStatement::closeCursor</function> on <varname>$stmt</varname> before executing the <varname>$otherStmt</varname> PDOStatement object. </para> @@ -102,7 +99,7 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDOStatement-execute" /></member> + <member><function>PDOStatement::execute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/columncount.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/columncount.xml diff -u phpdoc/en/reference/pdo/pdostatement/columncount.xml:1.1 phpdoc/en/reference/pdo/pdostatement/columncount.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/columncount.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/columncount.xml Mon Dec 31 15:43:38 2007 @@ -1,34 +1,31 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-columnCount" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.columncount" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->columnCount()</refname> + <refname>PDOStatement->columnCount</refname> <refpurpose> Returns the number of columns in the result set </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>int</type><methodname>columnCount</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>int</type><methodname>PDOStatement::columnCount</methodname> + <void/> + </methodsynopsis> <para> - Use <xref linkend="function.PDOStatement-columnCount" /> to return the number + Use <function>PDOStatement::columnCount</function> to return the number of columns in the result set represented by the PDOStatement object. </para> <para> - If the PDOStatement object was returned from <xref linkend="function.PDO-query" />, + If the PDOStatement object was returned from <function>PDO::query</function>, the column count is immediately available. </para> <para> If the PDOStatement object was returned from - <xref linkend="function.PDO-prepare" />, an accurate column count will not be - available until you invoke <xref linkend="function.PDOStatement-execute" />. + <function>PDO::prepare</function>, an accurate column count will not be + available until you invoke <function>PDOStatement::execute</function>. </para> </refsect1> @@ -37,7 +34,7 @@ <para> Returns the number of columns in the result set represented by the PDOStatement object. If there is no result set, - <xref linkend="function.PDOStatement-columnCount" /> returns <literal>0</literal>. + <function>PDOStatement::columnCount</function> returns <literal>0</literal>. </para> </refsect1> @@ -47,7 +44,7 @@ <example> <title>Counting columns</title> <para> - This example demonstrates how <xref linkend="function.PDOStatement-columnCount" /> + This example demonstrates how <function>PDOStatement::columnCount</function> operates with and without a result set. </para> <programlisting role="php"> @@ -86,9 +83,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> - <member><xref linkend="function.PDOStatement-rowCount" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::execute</function></member> + <member><function>PDOStatement::rowCount</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/errorcode.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/errorcode.xml diff -u phpdoc/en/reference/pdo/pdostatement/errorcode.xml:1.1 phpdoc/en/reference/pdo/pdostatement/errorcode.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/errorcode.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/errorcode.xml Mon Dec 31 15:43:38 2007 @@ -1,28 +1,25 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-errorCode" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.errorcode" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->errorCode()</refname> + <refname>PDOStatement->errorCode</refname> <refpurpose> Fetch the SQLSTATE associated with the last operation on the statement handle </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>string</type><methodname>errorCode</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>string</type><methodname>PDOStatement::errorCode</methodname> + <void/> + </methodsynopsis> </refsect1> <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - Identical to <xref linkend="function.PDO-errorCode" />, except that - <xref linkend="function.PDOStatement-errorCode" /> only retrieves error codes + Identical to <function>PDO::errorCode</function>, except that + <function>PDOStatement::errorCode</function> only retrieves error codes for operations performed with PDOStatement objects. </para> </refsect1> @@ -57,9 +54,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-errorCode" /></member> - <member><xref linkend="function.PDO-errorInfo" /></member> - <member><xref linkend="function.PDOStatement-errorInfo" /></member> + <member><function>PDO::errorCode</function></member> + <member><function>PDO::errorInfo</function></member> + <member><function>PDOStatement::errorInfo</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/errorinfo.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/errorinfo.xml diff -u phpdoc/en/reference/pdo/pdostatement/errorinfo.xml:1.1 phpdoc/en/reference/pdo/pdostatement/errorinfo.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/errorinfo.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/errorinfo.xml Mon Dec 31 15:43:38 2007 @@ -1,28 +1,25 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-errorInfo" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.errorinfo" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->errorInfo()</refname> + <refname>PDOStatement->errorInfo</refname> <refpurpose> Fetch extended error information associated with the last operation on the statement handle </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>array</type><methodname>errorInfo</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>array</type><methodname>PDOStatement::errorInfo</methodname> + <void/> + </methodsynopsis> </refsect1> <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDOStatement-errorInfo" /> returns an array of + <function>PDOStatement::errorInfo</function> returns an array of error information about the last operation performed by this statement handle. The array consists of the following fields: <informaltable> @@ -91,9 +88,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-errorCode" /></member> - <member><xref linkend="function.PDO-errorInfo" /></member> - <member><xref linkend="function.PDOStatement-errorCode" /></member> + <member><function>PDO::errorCode</function></member> + <member><function>PDO::errorInfo</function></member> + <member><function>PDOStatement::errorCode</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/execute.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/execute.xml diff -u phpdoc/en/reference/pdo/pdostatement/execute.xml:1.1 phpdoc/en/reference/pdo/pdostatement/execute.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/execute.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/execute.xml Mon Dec 31 15:43:38 2007 @@ -1,26 +1,23 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-execute" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.execute" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->execute()</refname> + <refname>PDOStatement->execute</refname> <refpurpose> Executes a prepared statement </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>execute</methodname> - <methodparam choice="opt"><type>array</type><parameter>input_parameters</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::execute</methodname> + <methodparam choice="opt"><type>array</type><parameter>input_parameters</parameter></methodparam> + </methodsynopsis> <para> Execute the prepared statement. If the prepared statement included parameter markers, you must either: <itemizedlist> - <listitem><para>call <xref linkend="function.PDOStatement-bindParam" /> to bind PHP variables + <listitem><para>call <function>PDOStatement::bindParam</function> to bind PHP variables to the parameter markers: bound variables pass their value as input and receive the output value, if any, of their associated parameter markers</para></listitem> <listitem><para>or pass an array of input-only parameter values</para></listitem> @@ -133,11 +130,11 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-bindParam" /></member> - <member><xref linkend="function.PDOStatement-fetch" /></member> - <member><xref linkend="function.PDOStatement-fetchAll" /></member> - <member><xref linkend="function.PDOStatement-fetchColumn" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::bindParam</function></member> + <member><function>PDOStatement::fetch</function></member> + <member><function>PDOStatement::fetchAll</function></member> + <member><function>PDOStatement::fetchColumn</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/fetch.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/fetch.xml diff -u phpdoc/en/reference/pdo/pdostatement/fetch.xml:1.1 phpdoc/en/reference/pdo/pdostatement/fetch.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/fetch.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/fetch.xml Mon Dec 31 15:43:38 2007 @@ -1,23 +1,20 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-fetch" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.fetch" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->fetch()</refname> + <refname>PDOStatement->fetch</refname> <refpurpose> Fetches the next row from a result set </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>mixed</type><methodname>fetch</methodname> - <methodparam choice="opt"><type>int</type><parameter>fetch_style</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>cursor_orientation</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>cursor_offset</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>mixed</type><methodname>PDOStatement::fetch</methodname> + <methodparam choice="opt"><type>int</type><parameter>fetch_style</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>cursor_orientation</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>cursor_offset</parameter></methodparam> + </methodsynopsis> <para> Fetches a row from a result set associated with a PDOStatement object. The @@ -50,7 +47,7 @@ <listitem><para> <literal>PDO::FETCH_BOUND</literal>: returns &true; and assigns the values of the columns in your result set to the PHP variables to which - they were bound with the <xref linkend="function.PDOStatement-bindColumn" /> + they were bound with the <function>PDOStatement::bindColumn</function> method </para></listitem> <listitem><para> @@ -95,7 +92,7 @@ scrollable cursor for your PDOStatement object, you must set the <literal>PDO::ATTR_CURSOR</literal> attribute to <literal>PDO::CURSOR_SCROLL</literal> when you prepare the SQL - statement with <xref linkend="function.PDO-prepare" />. + statement with <function>PDO::prepare</function>. </para> </listitem> </varlistentry> @@ -113,7 +110,7 @@ the <literal>cursor_orientation</literal> parameter is set to <literal>PDO::FETCH_ORI_REL</literal>, this value specifies the row to fetch relative to the cursor position before - <xref linkend="function.PDOStatement-fetch" /> was called. + <function>PDOStatement::fetch</function> was called. </para> </listitem> </varlistentry> @@ -264,12 +261,12 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> - <member><xref linkend="function.PDOStatement-fetchAll" /></member> - <member><xref linkend="function.PDOStatement-fetchColumn" /></member> - <member><xref linkend="function.PDOStatement-fetchObject" /></member> - <member><xref linkend="function.PDOStatement-setFetchMode" /></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::execute</function></member> + <member><function>PDOStatement::fetchAll</function></member> + <member><function>PDOStatement::fetchColumn</function></member> + <member><function>PDOStatement::fetchObject</function></member> + <member><function>PDOStatement::setFetchMode</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/fetchall.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/fetchall.xml diff -u phpdoc/en/reference/pdo/pdostatement/fetchall.xml:1.1 phpdoc/en/reference/pdo/pdostatement/fetchall.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/fetchall.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/fetchall.xml Mon Dec 31 15:43:38 2007 @@ -1,23 +1,20 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-fetchAll" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.fetchall" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->fetchAll()</refname> + <refname>PDOStatement->fetchAll</refname> <refpurpose> Returns an array containing all of the result set rows </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>array</type><methodname>fetchAll</methodname> - <methodparam choice="opt"><type>int</type><parameter>fetch_style</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>column_index</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>ctor_args</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>array</type><methodname>PDOStatement::fetchAll</methodname> + <methodparam choice="opt"><type>int</type><parameter>fetch_style</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>column_index</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>ctor_args</parameter></methodparam> + </methodsynopsis> </refsect1> @@ -30,7 +27,7 @@ <listitem> <para> Controls the contents of the returned array as documented in - <xref linkend="function.PDOStatement-fetch" />. Defaults to + <function>PDOStatement::fetch</function>. Defaults to <literal>PDO::FETCH_BOTH</literal>. </para> <para> @@ -76,7 +73,7 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDOStatement-fetchAll" /> returns an array containing + <function>PDOStatement::fetchAll</function> returns an array containing all of the remaining rows in the result set. The array represents each row as either an array of column values or an object with properties corresponding to each column name. @@ -227,11 +224,11 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-query" /></member> - <member><xref linkend="function.PDOStatement-fetch" /></member> - <member><xref linkend="function.PDOStatement-fetchColumn" /></member> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-setFetchMode" /></member> + <member><function>PDO::query</function></member> + <member><function>PDOStatement::fetch</function></member> + <member><function>PDOStatement::fetchColumn</function></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::setFetchMode</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/fetchcolumn.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/fetchcolumn.xml diff -u phpdoc/en/reference/pdo/pdostatement/fetchcolumn.xml:1.1 phpdoc/en/reference/pdo/pdostatement/fetchcolumn.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/fetchcolumn.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/fetchcolumn.xml Mon Dec 31 15:43:38 2007 @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-fetchColumn" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.fetchcolumn" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->fetchColumn()</refname> + <refname>PDOStatement->fetchColumn</refname> <refpurpose> Returns a single column from the next row of a result set </refpurpose> @@ -10,13 +10,10 @@ <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>string</type><methodname>fetchColumn</methodname> - <methodparam choice="opt"><type>int</type><parameter>column_number</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>string</type><methodname>PDOStatement::fetchColumn</methodname> + <methodparam choice="opt"><type>int</type><parameter>column_number</parameter></methodparam> + </methodsynopsis> <para> Returns a single column from the next row of a result set or &false; if @@ -33,7 +30,7 @@ <listitem> <para> 0-indexed number of the column you wish to retrieve from the row. If - no value is supplied, <xref linkend="function.PDOStatement-fetchColumn" /> + no value is supplied, <function>PDOStatement::fetchColumn</function> fetches the first column. </para> </listitem> @@ -45,13 +42,13 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - <xref linkend="function.PDOStatement-fetchColumn" /> returns a single column + <function>PDOStatement::fetchColumn</function> returns a single column in the next row of a result set. </para> <warning> <para> There is no way to return another column from the same row if you - use <xref linkend="function.PDOStatement-fetchColumn" /> to retrieve data. + use <function>PDOStatement::fetchColumn</function> to retrieve data. </para> </warning> </refsect1> @@ -94,11 +91,11 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-query" /></member> - <member><xref linkend="function.PDOStatement-fetch" /></member> - <member><xref linkend="function.PDOStatement-fetchAll" /></member> - <member><xref linkend="function.PDO-prepare" /></member> - <member><xref linkend="function.PDOStatement-setFetchMode" /></member> + <member><function>PDO::query</function></member> + <member><function>PDOStatement::fetch</function></member> + <member><function>PDOStatement::fetchAll</function></member> + <member><function>PDO::prepare</function></member> + <member><function>PDOStatement::setFetchMode</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/fetchobject.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/fetchobject.xml diff -u phpdoc/en/reference/pdo/pdostatement/fetchobject.xml:1.1 phpdoc/en/reference/pdo/pdostatement/fetchobject.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/fetchobject.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/fetchobject.xml Mon Dec 31 15:43:38 2007 @@ -1,24 +1,21 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-fetchObject" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.fetchobject" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->fetchObject()</refname> + <refname>PDOStatement->fetchObject</refname> <refpurpose>Fetches the next row and returns it as an object.</refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>mixed</type><methodname>fetchObject</methodname> - <methodparam choice="opt"><type>string</type><parameter>class_name</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>ctor_args</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>mixed</type><methodname>PDOStatement::fetchObject</methodname> + <methodparam choice="opt"><type>string</type><parameter>class_name</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>ctor_args</parameter></methodparam> + </methodsynopsis> <para> Fetches the next row and returns it as an object. This function is an - alternative to <xref linkend="function.PDOStatement-fetch" /> with + alternative to <function>PDOStatement::fetch</function> with <constant>PDO::FETCH_CLASS</constant> or <constant>PDO::FETCH_OBJ</constant> style. </para> @@ -59,7 +56,7 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDOStatement-fetch" /></member> + <member><function>PDOStatement::fetch</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/getattribute.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/getattribute.xml diff -u phpdoc/en/reference/pdo/pdostatement/getattribute.xml:1.1 phpdoc/en/reference/pdo/pdostatement/getattribute.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/getattribute.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/getattribute.xml Mon Dec 31 15:43:38 2007 @@ -1,21 +1,18 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-getAttribute" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.getattribute" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->getAttribute()</refname> + <refname>PDOStatement->getAttribute</refname> <refpurpose> Retrieve a statement attribute </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>mixed</type><methodname>getAttribute</methodname> - <methodparam><type>int</type><parameter>attribute</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>mixed</type><methodname>PDOStatement::getAttribute</methodname> + <methodparam><type>int</type><parameter>attribute</parameter></methodparam> + </methodsynopsis> <para> Gets an attribute of the statement. Currently, no generic attributes exist but only driver specific: @@ -40,9 +37,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-getAttribute" /></member> - <member><xref linkend="function.PDO-setAttribute" /></member> - <member><xref linkend="function.PDOStatement-setAttribute" /></member> + <member><function>PDO::getAttribute</function></member> + <member><function>PDO::setAttribute</function></member> + <member><function>PDOStatement::setAttribute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/getcolumnmeta.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/getcolumnmeta.xml diff -u phpdoc/en/reference/pdo/pdostatement/getcolumnmeta.xml:1.1 phpdoc/en/reference/pdo/pdostatement/getcolumnmeta.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/getcolumnmeta.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/getcolumnmeta.xml Mon Dec 31 15:43:38 2007 @@ -1,21 +1,18 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-getColumnMeta" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.getcolumnmeta" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->getColumnMeta()</refname> + <refname>PDOStatement->getColumnMeta</refname> <refpurpose> Returns metadata for a column in a result set </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>array</type><methodname>getColumnMeta</methodname> - <methodparam><type>int</type><parameter>column</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>array</type><methodname>PDOStatement::getColumnMeta</methodname> + <methodparam><type>int</type><parameter>column</parameter></methodparam> + </methodsynopsis> &warn.experimental.func; <para> @@ -25,7 +22,7 @@ <warning> <simpara> Not all PDO drivers support - <xref linkend="function.PDOStatement-getColumnMeta" />. + <function>PDOStatement::getColumnMeta</function>. </simpara> </warning> @@ -72,7 +69,7 @@ <entry><literal>driver:decl_type</literal></entry> <entry>The SQL type used to represent the column value in the database. If the column in the result set is the result of a function, this value - is not returned by <xref linkend="function.PDOStatement-getColumnMeta" />. + is not returned by <function>PDOStatement::getColumnMeta</function>. </entry> </row> <row> @@ -190,8 +187,8 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDOStatement-columnCount" /></member> - <member><xref linkend="function.PDOStatement-rowCount" /></member> + <member><function>PDOStatement::columnCount</function></member> + <member><function>PDOStatement::rowCount</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/nextrowset.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/nextrowset.xml diff -u phpdoc/en/reference/pdo/pdostatement/nextrowset.xml:1.1 phpdoc/en/reference/pdo/pdostatement/nextrowset.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/nextrowset.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/nextrowset.xml Mon Dec 31 15:43:38 2007 @@ -1,26 +1,23 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-nextRowset" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.nextrowset" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->nextRowset()</refname> + <refname>PDOStatement->nextRowset</refname> <refpurpose> Advances to the next rowset in a multi-rowset statement handle </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>nextRowset</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::nextRowset</methodname> + <void/> + </methodsynopsis> <para> Some database servers support stored procedures that return more than one rowset (also known as a result set). - <xref linkend="function.PDOStatement-nextRowset" /> enables you to access the + <function>PDOStatement::nextRowset</function> enables you to access the second and subsequent rowsets associated with a PDOStatement object. Each rowset can have a different set of columns from the preceding rowset. </para> @@ -41,7 +38,7 @@ <para> The following example shows how to call a stored procedure, MULTIPLE_ROWSETS, that returns three rowsets. We use a do / while loop to - loop over the <xref linkend="function.PDOStatement-nextRowset" /> method, which + loop over the <function>PDOStatement::nextRowset</function> method, which returns false and terminates the loop when no more rowsets can be returned. </para> <programlisting role="php"> @@ -96,10 +93,10 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDOStatement-columnCount" /></member> - <member><xref linkend="function.PDOStatement-execute" /></member> - <member><xref linkend="function.PDOStatement-getColumnMeta" /></member> - <member><xref linkend="function.PDO-query" /></member> + <member><function>PDOStatement::columnCount</function></member> + <member><function>PDOStatement::execute</function></member> + <member><function>PDOStatement::getColumnMeta</function></member> + <member><function>PDO::query</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/rowcount.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/rowcount.xml diff -u phpdoc/en/reference/pdo/pdostatement/rowcount.xml:1.1 phpdoc/en/reference/pdo/pdostatement/rowcount.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/rowcount.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/rowcount.xml Mon Dec 31 15:43:38 2007 @@ -1,24 +1,21 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-rowCount" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.rowcount" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->rowCount()</refname> + <refname>PDOStatement->rowCount</refname> <refpurpose> Returns the number of rows affected by the last SQL statement </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>int</type><methodname>rowCount</methodname> - <void/> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>int</type><methodname>PDOStatement::rowCount</methodname> + <void/> + </methodsynopsis> <para> - <xref linkend="function.PDOStatement-rowCount" /> returns the number of + <function>PDOStatement::rowCount</function> returns the number of rows affected by the last DELETE, INSERT, or UPDATE statement executed by the corresponding <literal>PDOStatement</literal> object. </para> @@ -44,7 +41,7 @@ <example> <title>Return the number of deleted rows</title> <para> - <xref linkend="function.PDOStatement-rowCount" /> returns the number of + <function>PDOStatement::rowCount</function> returns the number of rows affected by a DELETE, INSERT, or UPDATE statement. </para> <programlisting role="php"> @@ -71,11 +68,11 @@ <example> <title>Counting rows returned by a SELECT statement</title> <para> - For most databases, <xref linkend="function.PDOStatement-rowCount" /> does not + For most databases, <function>PDOStatement::rowCount</function> does not return the number of rows affected by a SELECT statement. Instead, use - <xref linkend="function.PDO-query" /> to issue a SELECT COUNT(*) statement + <function>PDO::query</function> to issue a SELECT COUNT(*) statement with the same predicates as your intended SELECT statement, then use - <xref linkend="function.PDOStatement-fetchColumn" /> to retrieve the number + <function>PDOStatement::fetchColumn</function> to retrieve the number of rows that will be returned. Your application can then perform the correct action. </para> @@ -122,9 +119,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDOStatement-columnCount" /></member> - <member><xref linkend="function.PDOStatement-fetchColumn" /></member> - <member><xref linkend="function.PDO-query" /></member> + <member><function>PDOStatement::columnCount</function></member> + <member><function>PDOStatement::fetchColumn</function></member> + <member><function>PDO::query</function></member> </simplelist> </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/setattribute.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/setattribute.xml diff -u phpdoc/en/reference/pdo/pdostatement/setattribute.xml:1.1 phpdoc/en/reference/pdo/pdostatement/setattribute.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/setattribute.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/setattribute.xml Mon Dec 31 15:43:38 2007 @@ -1,22 +1,19 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-setAttribute" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.setattribute" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->setAttribute()</refname> + <refname>PDOStatement->setAttribute</refname> <refpurpose> Set a statement attribute </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>setAttribute</methodname> - <methodparam><type>int</type><parameter>attribute</parameter></methodparam> - <methodparam><type>mixed</type><parameter>value</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::setAttribute</methodname> + <methodparam><type>int</type><parameter>attribute</parameter></methodparam> + <methodparam><type>mixed</type><parameter>value</parameter></methodparam> + </methodsynopsis> <para> Sets an attribute on the statement. Currently, no generic attributes are set but only driver specific: @@ -41,9 +38,9 @@ &reftitle.seealso; <para> <simplelist> - <member><xref linkend="function.PDO-getAttribute" /></member> - <member><xref linkend="function.PDO-setAttribute" /></member> - <member><xref linkend="function.PDOStatement-getAttribute" /></member> + <member><function>PDO::getAttribute</function></member> + <member><function>PDO::setAttribute</function></member> + <member><function>PDOStatement::getAttribute</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/pdostatement/setfetchmode.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/en/reference/pdo/pdostatement/setfetchmode.xml diff -u phpdoc/en/reference/pdo/pdostatement/setfetchmode.xml:1.1 phpdoc/en/reference/pdo/pdostatement/setfetchmode.xml:1.2 --- phpdoc/en/reference/pdo/pdostatement/setfetchmode.xml:1.1 Mon Dec 31 14:29:34 2007 +++ phpdoc/en/reference/pdo/pdostatement/setfetchmode.xml Mon Dec 31 15:43:38 2007 @@ -1,49 +1,37 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<refentry xml:id="function.PDOStatement-setFetchMode" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.2 $ --> +<refentry xml:id="pdostatement.setfetchmode" xmlns="http://docbook.org/ns/docbook"> <refnamediv> - <refname>PDOStatement->setFetchMode()</refname> + <refname>PDOStatement->setFetchMode</refname> <refpurpose> Set the default fetch mode for this statement </refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>setFetchMode</methodname> - <methodparam><type>int</type><parameter>mode</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>setFetchMode</methodname> - <methodparam><type>int</type><parameter>PDO::FETCH_COLUMN</parameter></methodparam> - <methodparam><type>int</type><parameter>colno</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>setFetchMode</methodname> - <methodparam><type>int</type><parameter>PDO::FETCH_CLASS</parameter></methodparam> - <methodparam><type>string</type><parameter>classname</parameter></methodparam> - <methodparam><type>array</type><parameter>ctorargs</parameter></methodparam> - </methodsynopsis> - </classsynopsis> - - <classsynopsis> - <ooclass><classname>PDOStatement</classname></ooclass> - <methodsynopsis> - <type>bool</type><methodname>setFetchMode</methodname> - <methodparam><type>int</type><parameter>PDO::FETCH_INTO</parameter></methodparam> - <methodparam><type>object</type><parameter>object</parameter></methodparam> - </methodsynopsis> - </classsynopsis> + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::setFetchMode</methodname> + <methodparam><type>int</type><parameter>mode</parameter></methodparam> + </methodsynopsis> + + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::setFetchMode</methodname> + <methodparam><type>int</type><parameter>PDO::FETCH_COLUMN</parameter></methodparam> + <methodparam><type>int</type><parameter>colno</parameter></methodparam> + </methodsynopsis> + + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::setFetchMode</methodname> + <methodparam><type>int</type><parameter>PDO::FETCH_CLASS</parameter></methodparam> + <methodparam><type>string</type><parameter>classname</parameter></methodparam> + <methodparam><type>array</type><parameter>ctorargs</parameter></methodparam> + </methodsynopsis> + + <methodsynopsis> + <type>bool</type><methodname>PDOStatement::setFetchMode</methodname> + <methodparam><type>int</type><parameter>PDO::FETCH_INTO</parameter></methodparam> + <methodparam><type>object</type><parameter>object</parameter></methodparam> + </methodsynopsis> </refsect1> <refsect1 role="parameters"> @@ -76,7 +64,7 @@ <title>Setting the fetch mode</title> <para> The following example demonstrates how - <xref linkend="function.PDOStatement-setFetchMode" /> changes the default fetch + <function>PDOStatement::setFetchMode</function> changes the default fetch mode for a PDOStatement object. </para> <programlisting role="php"> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_dblib/reference.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc/en/reference/pdo_dblib/reference.xml diff -u phpdoc/en/reference/pdo_dblib/reference.xml:1.7 phpdoc/en/reference/pdo_dblib/reference.xml:1.8 --- phpdoc/en/reference/pdo_dblib/reference.xml:1.7 Wed Jun 20 22:25:12 2007 +++ phpdoc/en/reference/pdo_dblib/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external, pecl --> <!-- State: experimental --> @@ -13,7 +13,7 @@ &reftitle.intro; <para> &warn.experimental; - PDO_DBLIB is a driver that implements the <link linkend="ref.pdo">PHP + PDO_DBLIB is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO) interface</link> to enable access from PHP to Microsoft SQL Server and Sybase databases through the FreeTDS libary. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_ibm/reference.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/reference/pdo_ibm/reference.xml diff -u phpdoc/en/reference/pdo_ibm/reference.xml:1.3 phpdoc/en/reference/pdo_ibm/reference.xml:1.4 --- phpdoc/en/reference/pdo_ibm/reference.xml:1.3 Thu Nov 1 16:40:40 2007 +++ phpdoc/en/reference/pdo_ibm/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- Purpose: database.vendors --> <!-- Membership: external, pecl --> @@ -11,7 +11,7 @@ <section xml:id="pdo-ibm.intro"> &reftitle.intro; <para> - PDO_IBM is a driver that implements the <link linkend="ref.pdo">PHP Data + PDO_IBM is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO)</link> interface to enable access from PHP to IBM databases. </para> </section> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_informix/reference.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc/en/reference/pdo_informix/reference.xml diff -u phpdoc/en/reference/pdo_informix/reference.xml:1.4 phpdoc/en/reference/pdo_informix/reference.xml:1.5 --- phpdoc/en/reference/pdo_informix/reference.xml:1.4 Wed Jun 20 22:25:12 2007 +++ phpdoc/en/reference/pdo_informix/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- Purpose: database.vendors --> <!-- Membership: external, pecl --> @@ -11,7 +11,7 @@ <section xml:id="pdo-informix.intro"> &reftitle.intro; <para> - PDO_INFORMIX is a driver that implements the <link linkend="ref.pdo">PHP Data + PDO_INFORMIX is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO)</link> interface to enable access from PHP to Informix databases. </para> </section> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_mysql/reference.xml?r1=1.11&r2=1.12&diff_format=u Index: phpdoc/en/reference/pdo_mysql/reference.xml diff -u phpdoc/en/reference/pdo_mysql/reference.xml:1.11 phpdoc/en/reference/pdo_mysql/reference.xml:1.12 --- phpdoc/en/reference/pdo_mysql/reference.xml:1.11 Wed Jun 20 22:25:12 2007 +++ phpdoc/en/reference/pdo_mysql/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.11 $ --> +<!-- $Revision: 1.12 $ --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external, pecl --> @@ -11,7 +11,7 @@ <section xml:id="pdo-mysql.intro"> &reftitle.intro; <para> - PDO_MYSQL is a driver that implements the <link linkend="ref.pdo">PHP + PDO_MYSQL is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO) interface</link> to enable access from PHP to MySQL 3.x, 4.x and 5.x databases. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_oci/reference.xml?r1=1.9&r2=1.10&diff_format=u Index: phpdoc/en/reference/pdo_oci/reference.xml diff -u phpdoc/en/reference/pdo_oci/reference.xml:1.9 phpdoc/en/reference/pdo_oci/reference.xml:1.10 --- phpdoc/en/reference/pdo_oci/reference.xml:1.9 Wed Jun 20 22:25:12 2007 +++ phpdoc/en/reference/pdo_oci/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.9 $ --> +<!-- $Revision: 1.10 $ --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external, pecl --> <!-- State: experimental --> @@ -13,7 +13,7 @@ &reftitle.intro; <para> &warn.experimental; - PDO_OCI is a driver that implements the <link linkend="ref.pdo">PHP Data + PDO_OCI is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO) interface</link> to enable access from PHP to Oracle databases through the OCI library. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_odbc/reference.xml?r1=1.12&r2=1.13&diff_format=u Index: phpdoc/en/reference/pdo_odbc/reference.xml diff -u phpdoc/en/reference/pdo_odbc/reference.xml:1.12 phpdoc/en/reference/pdo_odbc/reference.xml:1.13 --- phpdoc/en/reference/pdo_odbc/reference.xml:1.12 Wed Jun 20 22:25:12 2007 +++ phpdoc/en/reference/pdo_odbc/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.12 $ --> +<!-- $Revision: 1.13 $ --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external, pecl --> @@ -11,7 +11,7 @@ <section xml:id="pdo-odbc.intro"> &reftitle.intro; <para> - PDO_ODBC is a driver that implements the <link linkend="ref.pdo">PHP Data + PDO_ODBC is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO) interface</link> to enable access from PHP to databases through ODBC drivers or through the IBM DB2 Call Level Interface (DB2 CLI) library. PDO_ODBC currently supports http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_pgsql/reference.xml?r1=1.11&r2=1.12&diff_format=u Index: phpdoc/en/reference/pdo_pgsql/reference.xml diff -u phpdoc/en/reference/pdo_pgsql/reference.xml:1.11 phpdoc/en/reference/pdo_pgsql/reference.xml:1.12 --- phpdoc/en/reference/pdo_pgsql/reference.xml:1.11 Mon Dec 10 17:06:08 2007 +++ phpdoc/en/reference/pdo_pgsql/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.11 $ --> +<!-- $Revision: 1.12 $ --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, external, pecl --> @@ -11,7 +11,7 @@ <section xml:id="pdo-pgsql.intro"> &reftitle.intro; <para> - PDO_PGSQL is a driver that implements the <link linkend="ref.pdo">PHP + PDO_PGSQL is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO) interface</link> to enable access from PHP to PostgreSQL databases. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_sqlite/reference.xml?r1=1.14&r2=1.15&diff_format=u Index: phpdoc/en/reference/pdo_sqlite/reference.xml diff -u phpdoc/en/reference/pdo_sqlite/reference.xml:1.14 phpdoc/en/reference/pdo_sqlite/reference.xml:1.15 --- phpdoc/en/reference/pdo_sqlite/reference.xml:1.14 Thu Dec 27 02:37:10 2007 +++ phpdoc/en/reference/pdo_sqlite/reference.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.14 $ --> +<!-- $Revision: 1.15 $ --> <!-- Purpose: database.vendors --> <!-- Membership: bundled, pecl --> @@ -11,7 +11,7 @@ <section xml:id="pdo-sqlite.intro"> &reftitle.intro; <para> - PDO_SQLITE is a driver that implements the <link linkend="ref.pdo">PHP + PDO_SQLITE is a driver that implements the <link linkend="intro.pdo">PHP Data Objects (PDO) interface</link> to enable access to SQLite 3 databases. </para> <para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sdodasrel/book.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/sdodasrel/book.xml diff -u phpdoc/en/reference/sdodasrel/book.xml:1.2 phpdoc/en/reference/sdodasrel/book.xml:1.3 --- phpdoc/en/reference/sdodasrel/book.xml:1.2 Wed Dec 26 00:07:08 2007 +++ phpdoc/en/reference/sdodasrel/book.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- Purpose: database.abstract --> <!-- Membership: pecl --> <!-- State: experimental --> @@ -27,7 +27,7 @@ In order to use the Relational DAS you will need to be able to create and pass a PDO database connection; for this reason you might also want to take a look at - <link linkend='ref.pdo'>the section on PDO</link>. + <link linkend="intro.pdo">the section on PDO</link>. </para> <para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sqlite/setup.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/sqlite/setup.xml diff -u phpdoc/en/reference/sqlite/setup.xml:1.2 phpdoc/en/reference/sqlite/setup.xml:1.3 --- phpdoc/en/reference/sqlite/setup.xml:1.2 Fri Dec 21 18:01:02 2007 +++ phpdoc/en/reference/sqlite/setup.xml Mon Dec 31 15:43:38 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <chapter xml:id="sqlite.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.setup; @@ -33,7 +33,7 @@ compiled by default. However, since PHP 5.1.0 you need to manually activate the extension in &php.ini; (because it is now bundled as shared). Moreover, since PHP 5.1.0 SQLite depends on <link - linkend="ref.pdo">PDO</link> it must be enabled too, by adding the + linkend="intro.pdo">PDO</link> it must be enabled too, by adding the following lines to &php.ini; (in order): <informalexample> <programlisting role="ini">