From af10efebe2137c05097f2972cbd632327dc43531 Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@php.net>
Date: Sun, 30 Apr 2006 02:39:22 +0000
Subject: [PATCH] improve documentation on PDOStatement::setFetchMode() and
 PDO::query().

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@212186 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/pdo/functions/PDO-query.xml         | 34 ++++++++++++++++++-
 .../functions/PDOStatement-setFetchMode.xml   | 21 +++++++++++-
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/reference/pdo/functions/PDO-query.xml b/reference/pdo/functions/PDO-query.xml
index 27272be1b8..1f0dcc3d4f 100644
--- a/reference/pdo/functions/PDO-query.xml
+++ b/reference/pdo/functions/PDO-query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
 <refentry id="function.PDO-query">
  <refnamediv>
@@ -15,6 +15,28 @@
    <methodparam><type>string</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
 
+  <methodsynopsis>
+   <type>bool</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>bool</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>bool</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>
    <function>PDO::query</function> executes an SQL statement in
    a single function call, returning the result set (if any) returned by the
@@ -34,6 +56,16 @@
    next call to <function>PDO::query</function>.
   </para>
 
+  <note>
+   <para>
+    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
+    <function>PDOStatement::setFetchMode</function> on the resultant statement
+    object.
+   </para>
+  </note>
+
  </refsect1>
  <refsect1 role="parameters">
   &reftitle.parameters;
diff --git a/reference/pdo/functions/PDOStatement-setFetchMode.xml b/reference/pdo/functions/PDOStatement-setFetchMode.xml
index e48a58fd7e..50725c0991 100644
--- a/reference/pdo/functions/PDOStatement-setFetchMode.xml
+++ b/reference/pdo/functions/PDOStatement-setFetchMode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
 <refentry id="function.PDOStatement-setFetchMode">
  <refnamediv>
@@ -15,6 +15,25 @@
    <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">
   &reftitle.parameters;