svn: /phpdoc/en/trunk/ language-snippets.ent reference/pdo/pdo/begintransaction.xml reference/pdo/pdo/commit.xml reference/pdo/pdo/rollback.xml
| From: | Peter Cowburn | Date: | Tue, 17 May 2016 22:23:00 +0000 |
| Subject: | svn: /phpdoc/en/trunk/ language-snippets.ent reference/pdo/pdo/begintransaction.xml reference/pdo/pdo/commit.xml reference/pdo/pdo/rollback.xml | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-14136@lists.php.net to get a copy of this message | ||
salathe Tue, 17 May 2016 22:23:00 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=339183
Log:
Some PDO exceptions ignore ATTR_ERRMODE
--
Based on a patch provided by marcus@hannmail.co.uk
Changed paths:
U phpdoc/en/trunk/language-snippets.ent
U phpdoc/en/trunk/reference/pdo/pdo/begintransaction.xml
U phpdoc/en/trunk/reference/pdo/pdo/commit.xml
U phpdoc/en/trunk/reference/pdo/pdo/rollback.xml
Modified: phpdoc/en/trunk/language-snippets.ent
===================================================================
--- phpdoc/en/trunk/language-snippets.ent 2016-05-17 22:22:52 UTC (rev 339182)
+++ phpdoc/en/trunk/language-snippets.ent 2016-05-17 22:23:00 UTC (rev 339183)
@@ -1105,6 +1105,8 @@
obtain the <constant>PDO_ATTR_DRIVER_NAME</constant> attribute to check the
driver, if your code can run against multiple drivers.</simpara>'>
+<!ENTITY pdo.errors.exception-not-errmode '<note xmlns="http://docbook.org/ns/docbook"><simpara>An
exception is raised even when the <constant>PDO::ATTR_ERRMODE</constant> attribute is
not <constant>PDO::ERRMODE_EXCEPTION</constant>.</simpara></note>'>
+
<!-- PECL entities -->
<!ENTITY pecl.moved 'This <link xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="&url.pecl;">PECL</link> extension
is not bundled with PHP.'>
Modified: phpdoc/en/trunk/reference/pdo/pdo/begintransaction.xml
===================================================================
--- phpdoc/en/trunk/reference/pdo/pdo/begintransaction.xml 2016-05-17 22:22:52 UTC (rev 339182)
+++ phpdoc/en/trunk/reference/pdo/pdo/begintransaction.xml 2016-05-17 22:23:00 UTC (rev 339183)
@@ -38,6 +38,14 @@
</para>
</refsect1>
+ <refsect1 role="errors">
+ &reftitle.errors;
+ <para>
+ Throws a <classname>PDOException</classname> if there is already a transaction
started or the driver does not support transactions.
+ </para>
+ &pdo.errors.exception-not-errmode;
+ </refsect1>
+
<refsect1 role="examples">
&reftitle.examples;
<para>
Modified: phpdoc/en/trunk/reference/pdo/pdo/commit.xml
===================================================================
--- phpdoc/en/trunk/reference/pdo/pdo/commit.xml 2016-05-17 22:22:52 UTC (rev 339182)
+++ phpdoc/en/trunk/reference/pdo/pdo/commit.xml 2016-05-17 22:23:00 UTC (rev 339183)
@@ -28,6 +28,14 @@
</para>
</refsect1>
+ <refsect1 role="errors">
+ &reftitle.errors;
+ <para>
+ Throws a <classname>PDOException</classname> if there is no active transaction.
+ </para>
+ &pdo.errors.exception-not-errmode;
+ </refsect1>
+
<refsect1 role="examples">
&reftitle.examples;
<para>
Modified: phpdoc/en/trunk/reference/pdo/pdo/rollback.xml
===================================================================
--- phpdoc/en/trunk/reference/pdo/pdo/rollback.xml 2016-05-17 22:22:52 UTC (rev 339182)
+++ phpdoc/en/trunk/reference/pdo/pdo/rollback.xml 2016-05-17 22:23:00 UTC (rev 339183)
@@ -17,8 +17,7 @@
<para>
Rolls back the current transaction, as initiated by
- <function>PDO::beginTransaction</function>. A
<classname>PDOException</classname>
- will be thrown if no transaction is active.
+ <function>PDO::beginTransaction</function>.
</para>
<para>
If the database was set to autocommit mode, this function will restore
@@ -40,6 +39,14 @@
</para>
</refsect1>
+ <refsect1 role="errors">
+ &reftitle.errors;
+ <para>
+ Throws a <classname>PDOException</classname> if there is no active transaction.
+ </para>
+ &pdo.errors.exception-not-errmode;
+ </refsect1>
+
<refsect1 role="examples">
&reftitle.examples;
<para>