wez Sun Sep 11 02:17:10 2005 EDT
Added files:
/phpdoc/en/reference/pdo_odbc ini.xml
Modified files:
/phpdoc/en/reference/pdo ini.xml reference.xml
/phpdoc/en/reference/pdo_dblib reference.xml
/phpdoc/en/reference/pdo_firebird 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
Log:
Juggle and update
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo/ini.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/pdo/ini.xml
diff -u phpdoc/en/reference/pdo/ini.xml:1.1 phpdoc/en/reference/pdo/ini.xml:1.2
--- phpdoc/en/reference/pdo/ini.xml:1.1 Wed Aug 10 04:36:30 2005
+++ phpdoc/en/reference/pdo/ini.xml Sun Sep 11 02:17:05 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<section id="pdo.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -22,12 +22,6 @@
<entry>&php.ini; only</entry>
<entry></entry>
</row>
- <row>
- <entry>pdo_odbc.connection_pooling</entry>
- <entry>"strict"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
</tbody>
</tgroup>
</table>
@@ -51,19 +45,6 @@
</listitem>
</varlistentry>
- <varlistentry id="ini.pdo-odbc.connection-pooling">
- <term>
- <parameter>pdo_odbc.connection_pooling</parameter>
- <type>string</type>
- </term>
- <listitem>
- <para>
- Whether to pool ODBC connections. Can be one of "strict", "relaxed" or
- "off" (equals to "").
- </para>
- </listitem>
- </varlistentry>
-
</variablelist>
</para>
</section>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo/reference.xml?r1=1.33&r2=1.34&ty=u
Index: phpdoc/en/reference/pdo/reference.xml
diff -u phpdoc/en/reference/pdo/reference.xml:1.33
phpdoc/en/reference/pdo/reference.xml:1.34
--- phpdoc/en/reference/pdo/reference.xml:1.33 Fri Sep 9 11:13:53 2005
+++ phpdoc/en/reference/pdo/reference.xml Sun Sep 11 02:17:05 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.33 $ -->
+<!-- $Revision: 1.34 $ -->
<!-- Purpose: database.abstract -->
<!-- Membership: pecl, bundled -->
<!-- State:experimental -->
@@ -248,12 +248,6 @@
</listitem>
<listitem>
<para>
- <link linkend='function.PDO-exec'>exec</link>
- - issues an SQL statement and returns the number of affected rows
- </para>
- </listitem>
- <listitem>
- <para>
<link linkend='function.PDO-errorCode'>errorCode</link>
- retrieves an error code, if any, from the database
</para>
@@ -267,6 +261,12 @@
</listitem>
<listitem>
<para>
+ <link linkend='function.PDO-exec'>exec</link>
+ - issues an SQL statement and returns the number of affected rows
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<link linkend='function.PDO-getAttribute'>getAttribute</link>
- retrieves a database connection attribute
</para>
@@ -333,6 +333,12 @@
</listitem>
<listitem>
<para>
+ <link linkend='function.PDOStatement-bindValue'>bindValue</link>
+ - binds a value to a parameter in the prepared statement
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<link linkend='function.PDOStatement-closeCursor'>closeCursor</link>
- closes the cursor, allowing the statement to be executed again
</para>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_dblib/reference.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/pdo_dblib/reference.xml
diff -u phpdoc/en/reference/pdo_dblib/reference.xml:1.4
phpdoc/en/reference/pdo_dblib/reference.xml:1.5
--- phpdoc/en/reference/pdo_dblib/reference.xml:1.4 Sun Sep 4 15:39:24 2005
+++ phpdoc/en/reference/pdo_dblib/reference.xml Sun Sep 11 02:17:07 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- Purpose: database.vendors -->
<!-- Membership: bundled, external, pecl -->
@@ -12,15 +12,15 @@
&reftitle.intro;
<para>
&warn.experimental;
- PDO_DBLIB is a driver that implements the PHP Data Objects (PDO) interface
- to enable access from PHP to Microsoft SQL Server and Sybase databases
- through the FreeTDS libary.
+ PDO_DBLIB is a driver that implements the <link linkend="ref.pdo">PHP
+ Data Objects (PDO) interface</link> to enable access from PHP to
+ Microsoft SQL Server and Sybase databases through the FreeTDS libary.
</para>
<para>
On Windows, you should use the <link
linkend="ref.pdo-odbc">PDO_ODBC</link>
- driver to connect to Microsoft SQL Server and Sybase databases, as
PDO_ODBC
- is built directly against the Microsoft Windows ODBC Driver Manager
- libraries.
+ driver to connect to Microsoft SQL Server and Sybase databases, as the
+ native Windows DB-LIB is ancient, thread un-safe and no longer supported
+ by Microsoft.
</para>
</section>
</partintro>
@@ -41,8 +41,10 @@
<listitem>
<para>
The DSN prefix is <userinput>sybase:</userinput> if PDO_DBLIB was
- linked against the FreeTDS libraries, or <userinput>mssql:</userinput>
- if PDO_DBLIB was linked against the Microsoft SQL Server libraries.
+ linked against the FreeTDS libraries, <userinput>mssql:</userinput>
+ if PDO_DBLIB was linked against the Microsoft SQL Server libraries,
+ or <userinput>dblib:</userinput> if linked against any other variety
+ of DB-lib.
</para>
</listitem>
</varlistentry>
@@ -76,6 +78,7 @@
<programlisting><![CDATA[
mssql:host=localhost;dbname=testdb
sybase:host=localhost;dbname=testdb
+dblib:host=localhost;dbname=testdb
]]>
</programlisting>
</para>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_firebird/reference.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/pdo_firebird/reference.xml
diff -u phpdoc/en/reference/pdo_firebird/reference.xml:1.4
phpdoc/en/reference/pdo_firebird/reference.xml:1.5
--- phpdoc/en/reference/pdo_firebird/reference.xml:1.4 Sun Sep 4 15:39:24 2005
+++ phpdoc/en/reference/pdo_firebird/reference.xml Sun Sep 11 02:17:07 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- Purpose: database.vendors -->
<!-- Membership: bundled, external, pecl -->
@@ -12,8 +12,8 @@
&reftitle.intro;
<para>
&warn.experimental;
- PDO_FIREBIRD is a driver that implements the PHP Data Objects (PDO)
- interface to enable access from PHP to Firebird and Interbase databases.
+ PDO_FIREBIRD is a driver that implements the <link linkend="ref.pdo">PHP
Data Objects (PDO)
+ interface</link> to enable access from PHP to Firebird and Interbase
databases.
</para>
</section>
</partintro>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_mysql/reference.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/pdo_mysql/reference.xml
diff -u phpdoc/en/reference/pdo_mysql/reference.xml:1.4
phpdoc/en/reference/pdo_mysql/reference.xml:1.5
--- phpdoc/en/reference/pdo_mysql/reference.xml:1.4 Sun Sep 4 15:39:24 2005
+++ phpdoc/en/reference/pdo_mysql/reference.xml Sun Sep 11 02:17:08 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- Purpose: database.vendors -->
<!-- Membership: bundled, external, pecl -->
@@ -12,7 +12,8 @@
&reftitle.intro;
<para>
&warn.experimental;
- PDO_MYSQL is a driver that implements the PHP Data Objects (PDO) interface
+ PDO_MYSQL is a driver that implements the <link linkend="ref.pdo">PHP
+ Data Objects (PDO) interface</link>
to enable access from PHP to MySQL 3.x and 4.x databases.
</para>
</section>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_oci/reference.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/pdo_oci/reference.xml
diff -u phpdoc/en/reference/pdo_oci/reference.xml:1.4
phpdoc/en/reference/pdo_oci/reference.xml:1.5
--- phpdoc/en/reference/pdo_oci/reference.xml:1.4 Sun Sep 4 15:39:24 2005
+++ phpdoc/en/reference/pdo_oci/reference.xml Sun Sep 11 02:17:08 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- Purpose: database.vendors -->
<!-- Membership: bundled, external, pecl -->
@@ -12,7 +12,8 @@
&reftitle.intro;
<para>
&warn.experimental;
- PDO_OCI is a driver that implements the PHP Data Objects (PDO) interface
+ PDO_OCI is a driver that implements the <link linkend="ref.pdo">PHP Data
+ Objects (PDO) interface</link>
to enable access from PHP to Oracle databases through the OCI library.
</para>
</section>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_odbc/reference.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/pdo_odbc/reference.xml
diff -u phpdoc/en/reference/pdo_odbc/reference.xml:1.5
phpdoc/en/reference/pdo_odbc/reference.xml:1.6
--- phpdoc/en/reference/pdo_odbc/reference.xml:1.5 Sat Sep 10 20:52:05 2005
+++ phpdoc/en/reference/pdo_odbc/reference.xml Sun Sep 11 02:17:08 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- Purpose: database.vendors -->
<!-- Membership: bundled, external, pecl -->
@@ -12,7 +12,8 @@
&reftitle.intro;
<para>
&warn.experimental;
- PDO_ODBC is a driver that implements the PHP Data Objects (PDO) interface
+ PDO_ODBC is a driver that implements the <link linkend="ref.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.
</para>
@@ -23,6 +24,7 @@
connecting to Microsoft SQL Server databases.
</para>
</section>
+ &reference.pdo-odbc.ini;
</partintro>
<refentry id="ref.pdo-odbc.connection">
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_pgsql/reference.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/pdo_pgsql/reference.xml
diff -u phpdoc/en/reference/pdo_pgsql/reference.xml:1.4
phpdoc/en/reference/pdo_pgsql/reference.xml:1.5
--- phpdoc/en/reference/pdo_pgsql/reference.xml:1.4 Sun Sep 4 15:39:25 2005
+++ phpdoc/en/reference/pdo_pgsql/reference.xml Sun Sep 11 02:17:08 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- Purpose: database.vendors -->
<!-- Membership: bundled, external, pecl -->
@@ -12,7 +12,8 @@
&reftitle.intro;
<para>
&warn.experimental;
- PDO_PGSQL is a driver that implements the PHP Data Objects (PDO) interface
+ PDO_PGSQL is a driver that implements the <link linkend="ref.pdo">PHP
+ Data Objects (PDO) interface</link>
to enable access from PHP to PostgreSQL databases.
</para>
</section>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_sqlite/reference.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/reference/pdo_sqlite/reference.xml
diff -u phpdoc/en/reference/pdo_sqlite/reference.xml:1.7
phpdoc/en/reference/pdo_sqlite/reference.xml:1.8
--- phpdoc/en/reference/pdo_sqlite/reference.xml:1.7 Sat Sep 10 12:45:51 2005
+++ phpdoc/en/reference/pdo_sqlite/reference.xml Sun Sep 11 02:17:09 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- Purpose: database.vendors -->
<!-- Membership: bundled, pecl -->
@@ -12,8 +12,8 @@
&reftitle.intro;
<para>
&warn.experimental;
- PDO_SQLITE is a driver that implements the PHP Data Objects (PDO)
interface
- to enable access to SQLite 3 databases.
+ PDO_SQLITE is a driver that implements the <link linkend="ref.pdo">PHP
+ Data Objects (PDO) interface</link> to enable access to SQLite 3
databases.
</para>
<para>
In PHP 5.1, the <link linkend="ref.sqlite">SQLite</link> extension also
http://cvs.php.net/co.php/phpdoc/en/reference/pdo_odbc/ini.xml?r=1.1&p=1
Index: phpdoc/en/reference/pdo_odbc/ini.xml
+++ phpdoc/en/reference/pdo_odbc/ini.xml
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.1 $ -->
<section id="pdo_odbc.configuration">
&reftitle.runtime;
&extension.runtime;
<para>
<table>
<title>PDO_ODBC Configuration Options</title>
<tgroup cols="4">
<thead>
<row>
<entry>Name</entry>
<entry>Default</entry>
<entry>Changeable</entry>
<entry>Changelog</entry>
</row>
</thead>
<tbody>
<row>
<entry>pdo_odbc.connection_pooling</entry>
<entry>"strict"</entry>
<entry>PHP_INI_ALL</entry>
<entry></entry>
</row>
</tbody>
</tgroup>
</table>
&ini.php.constants;
</para>
&ini.descriptions.title;
<para>
<variablelist>
<varlistentry id="ini.pdo-odbc.connection-pooling">
<term>
<parameter>pdo_odbc.connection_pooling</parameter>
<type>string</type>
</term>
<listitem>
<para>
Whether to pool ODBC connections. Can be one of "strict", "relaxed" or
"off" (equals to ""). The parameter describes how strict the connection
manager should be when matching connection parameters to existing pooled
connections. <userinput>strict</userinput> is the recommend default, and
will result in the use of cached connections only when all the connection
parameters match exactly. <userinput>relaxed</userinput> will result in
the use of cached connections when similar connection parameters are
used. This can result in increased use of the cache, at the risk of
bleeding connection information between (for example) virtual hosts.
</para>
<para>
This setting can only be changed from the &php.ini;
file, and affects the entire process; any other modules loaded into the
process that use the same ODBC libraries will be affected too, including
the <link linkend="ref.uodbc">Unified ODBC extension</link>.
</para>
<warning>
<para>
<userinput>relaxed</userinput> matching should not be used on a shared
server, for security reasons.
</para>
</warning>
<tip>
<para>
Leave this setting at the default <userinput>strict</userinput> setting
unless you have good reason to change it.
</para>
</tip>
</listitem>
</varlistentry>
</variablelist>
</para>
</section>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
sgml-omittag:t
sgml-shorttag:t
sgml-minimize-attributes:nil
sgml-always-quote-attributes:t
sgml-indent-step:1
sgml-indent-data:t
indent-tabs-mode:nil
sgml-parent-document:nil
sgml-default-dtd-file:"../../../manual.ced"
sgml-exposed-tags:nil
sgml-local-catalogs:nil
sgml-local-ecat-files:nil
End:
vim600: syn=xml fen fdm=syntax fdl=2 si
vim: et tw=78 syn=sgml
vi: ts=1 sw=1
-->
