Просмотр исходного кода

ZF-10423 Introducing MariaDB support in Zend_DB

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22921 44c647ce-9c0f-0410-b52a-842ac1e357ba
freak 15 лет назад
Родитель
Сommit
792b6192a6

+ 19 - 5
documentation/manual/en/module_specs/Zend_Db_Adapter.xml

@@ -37,6 +37,13 @@
 
         <listitem>
             <para>
+                MariaDB, using the <ulink url="http://www.php.net/pdo-mysql">pdo_mysql</ulink>
+                <acronym>PHP</acronym> extension
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
                 MySQL, using the <ulink url="http://www.php.net/pdo-mysql">pdo_mysql</ulink>
                 <acronym>PHP</acronym> extension
             </para>
@@ -81,6 +88,13 @@
     <itemizedlist>
         <listitem>
             <para>
+                MariaDB, using the <ulink url="http://www.php.net/mysqli">mysqli</ulink>
+                <acronym>PHP</acronym> extension
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
                 MySQL, using the <ulink url="http://www.php.net/mysqli">mysqli</ulink>
                 <acronym>PHP</acronym> extension
             </para>
@@ -1066,8 +1080,8 @@ $id = $db->lastSequenceId('bugs_id_gen');
             </example>
 
             <para>
-                For <acronym>RDBMS</acronym> brands that don't support sequences, including MySQL,
-                Microsoft <acronym>SQL</acronym> Server, and SQLite, the arguments to the
+                For <acronym>RDBMS</acronym> brands that don't support sequences, including MariaDB,
+		MySQL, Microsoft <acronym>SQL</acronym> Server, and SQLite, the arguments to the
                 <methodname>lastInsertId()</methodname> method are ignored, and the value returned
                 is the most recent value generated for any table by <acronym>INSERT</acronym>
                 operations during the current connection. For these <acronym>RDBMS</acronym> brands,
@@ -1768,7 +1782,7 @@ try {
 
                 <listitem>
                     <para>
-                        <constant>AUTO_INCREMENT</constant> - MySQL
+                        <constant>AUTO_INCREMENT</constant> - MySQL/MariaDB
                     </para>
                 </listitem>
 
@@ -2015,7 +2029,7 @@ if (!is_null($version)) {
 
                 <listitem>
                     <para>
-                        MySQL does not support sequences, so
+                        MySQL and MariaDB do not support sequences, so
                         <methodname>lastInsertId()</methodname> ignores its arguments and
                         always returns the last value generated for an
                         auto-increment key. The <methodname>lastSequenceId()</methodname>
@@ -2272,7 +2286,7 @@ if (!is_null($version)) {
 
                 <listitem>
                     <para>
-                        MySQL does not support sequences, so
+                        MySQL and MariaDB do not support sequences, so
                         <methodname>lastInsertId()</methodname> ignores its arguments and
                         always returns the last value generated for an
                         auto-increment key. The <methodname>lastSequenceId()</methodname>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Db_Table-Relationships.xml

@@ -688,7 +688,7 @@ $products = $bug1234->findProductsViaBugsProductsByBug();
             </para>
 
             <para>
-                For example, if you use MySQL's MyISAM storage engine, or SQLite, these solutions
+                For example, if you use MySQL's or MariaDB's MyISAM storage engine, or SQLite, these solutions
                 do not support <acronym>DRI</acronym>. You may find it helpful to declare the
                 cascading operations with <classname>Zend_Db_Table</classname>.
             </para>
@@ -863,4 +863,4 @@ class BugsProducts extends Zend_Db_Table_Abstract
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->