wez Fri Sep 9 00:10:15 2005 EDT
Modified files:
/phpdoc/en/reference/pdo_sqlite reference.xml
/phpdoc/en/reference/pdo_sqlite/functions
PDO-sqliteCreateAggregate.xml
PDO-sqliteCreateFunction.xml
Log:
tweak.
livedocs won't let me view the those two function pages, so I hope they are
ok.
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_sqlite/reference.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/pdo_sqlite/reference.xml
diff -u phpdoc/en/reference/pdo_sqlite/reference.xml:1.4
phpdoc/en/reference/pdo_sqlite/reference.xml:1.5
--- phpdoc/en/reference/pdo_sqlite/reference.xml:1.4 Sun Sep 4 15:39:25 2005
+++ phpdoc/en/reference/pdo_sqlite/reference.xml Fri Sep 9 00:10:10 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- Purpose: database.vendors -->
<!-- Membership: bundled, pecl -->
@@ -13,7 +13,13 @@
<para>
&warn.experimental;
PDO_SQLITE is a driver that implements the PHP Data Objects (PDO)
interface
- to enable access to SQLite 2 and SQLite 3 databases.
+ to enable access to SQLite 3 databases.
+ </para>
+ <para>
+ In PHP 5.1, the <link linkend="ref.sqlite">SQLite</link> extension also
+ provides a driver for SQLite 2 databases; while it is not technically a
+ part of the PDO_SQLITE driver, it behaves very similarly, so it is
+ documented alongside it.
</para>
</section>
</partintro>
@@ -55,12 +61,18 @@
<term>DSN prefix (SQLite 2)</term>
<listitem>
<para>
- While the default and recommended SQLite version in PDO_SQLITE is
- version 3, the driver also supports accessing and creating SQLite 2
- databases. This enables you to access databases you may have created
+ The <link linkend="ref.sqlite">SQLite</link> extension in
+ PHP 5.1 provides a PDO driver that supports accessing and creating
SQLite 2
+ databases. This enables you to access databases you may have created
with the <link linkend="ref.sqlite">SQLite</link> extension in
previous versions of PHP.
</para>
+ <note>
+ <para>
+ The sqlite2 driver is only available in PHP 5.1 if you have enabled
+ both PDO and ext/sqlite. It is not currently available via PECL.
+ </para>
+ </note>
<para>
The DSN prefix for connecting to SQLite 2 databases is
<userinput>sqlite2:</userinput>.
@@ -95,9 +107,9 @@
SQLite databases:
<programlisting><![CDATA[
sqlite:/opt/databases/mydb.sq3
-sqlite:memory:
+sqlite::memory:
sqlite2:/opt/databases/mydb.sq2
-sqlite2:memory:
+sqlite2::memory:
]]>
</programlisting>
</para>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateAggregate.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateAggregate.xml
diff -u
phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateAggregate.xml:1.1
phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateAggregate.xml:1.2
--- phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateAggregate.xml:1.1
Thu Sep 8 23:25:36 2005
+++ phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateAggregate.xml
Fri Sep 9 00:10:14 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<refentry id="function.PDO-sqliteCreateAggregate">
<refnamediv>
<refname>PDO::sqliteCreateAggregate</refname>
@@ -174,6 +174,7 @@
<member><function>PDO::sqliteCreateFunction</function></member>
</simplelist>
</para>
+ </refsect1>
</refentry>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml
diff -u
phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml:1.1
phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml:1.2
--- phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml:1.1
Thu Sep 8 23:25:37 2005
+++ phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml
Fri Sep 9 00:10:15 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<refentry id="function.PDO-sqliteCreateFunction">
<refnamediv>
<refname>PDO::sqliteCreateFunction</refname>
@@ -142,6 +142,7 @@
<member><function>PDO::sqliteCreateAggregate</function></member>
</simplelist>
</para>
+ </refsect1>
</refentry>
