Changeset 1743:a659700da036

Timestamp:

09/06/13 21:36:57 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add mysqli support, step 1, addresses #1450

Files:

• README.md (modified) (1 diff)
• admin/install/check.php (modified) (1 diff)
• admin/install/wizard.php (modified) (2 diffs)
• debian/control (modified) (1 diff)
• inc/config.php.in (modified) (1 diff)
• inc/core/class.dc.blog.php (modified) (7 diffs)
• inc/core/class.dc.core.php (modified) (1 diff)
• locales/fr/main.po (modified) (1 diff)
• plugins/importExport/inc/flat/class.flat.import.php (modified) (3 diffs)

README.md

@@ -50 +50 @@
     * iconv
     * simplexml
-    * mysql, postgresql or sqlite
+    * mysql, mysqli, postgresql or sqlite
  * A database server (MySQL or PostgreSQL) or SQLite.
 

admin/install/check.php

@@ -49 +49 @@
      }
      
-     if ($con->driver() == 'mysql')
+     if ($con->driver() == 'mysql' || $con->driver() == 'mysqli')
      {
           if (version_compare($con->version(),'4.1','<'))

admin/install/wizard.php

@@ -55 +55 @@
 }
 
-$DBDRIVER = !empty($_POST['DBDRIVER']) ? $_POST['DBDRIVER'] : 'mysql';
+$DBDRIVER = !empty($_POST['DBDRIVER']) ? $_POST['DBDRIVER'] : 'mysqli';
 $DBHOST = !empty($_POST['DBHOST']) ? $_POST['DBHOST'] : '';
 $DBNAME = !empty($_POST['DBNAME']) ? $_POST['DBNAME'] : '';
@@ -179 +179 @@
 '<form action="wizard.php" method="post">'.
 '<p><label class="required" for="DBDRIVER"><abbr title="'.__('Required field').'">*</abbr> '.__('Database type:').'</label> '.
-form::combo('DBDRIVER',array('MySQL'=>'mysql','PostgreSQL'=>'pgsql'),$DBDRIVER).'</p>'.
+form::combo('DBDRIVER',array(__('MySQL (deprecated)')=>'mysql',__('MySQLi')=>'mysqli',__('PostgreSQL')=>'pgsql'),$DBDRIVER).'</p>'.
 '<p><label for="DBHOST">'.__('Database Host Name:').'</label> '.
 form::field('DBHOST',30,255,html::escapeHTML($DBHOST)).'</p>'.

debian/control

@@ -8 +8 @@
 Package: dotclear
 Architecture: all
-Depends: ${misc:Depends}, apache2 | httpd | apache, libclearbricks, php5-pgsql | php5-sqlite | php5-mysql, php5-gd
+Depends: ${misc:Depends}, apache2 | httpd | apache, libclearbricks, php5-pgsql | php5-sqlite | php5-mysql | php5-mysqli, php5-gd
 Suggests: php5-tidy
 Description: DotClear 2

inc/config.php.in

@@ -12 +12 @@
 if (!defined('DC_RC_PATH')) { return; }
 
-// Database driver (mysql, pgsql, sqlite)
+// Database driver (mysql, mysqli, pgsql, sqlite)
 define('DC_DBDRIVER','');
 

inc/core/class.dc.blog.php

@@ -658 +658 @@
           if (!$rs->isEmpty())
           {
-               if ($this->con->driver() == 'mysql') {
+               if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
                     $clause = "REGEXP '^".$this->con->escape($url)."[0-9]+$'";
                } elseif ($this->con->driver() == 'pgsql') {
@@ -1828 +1828 @@
           if (!$rs->isEmpty())
           {
-               if ($this->con->driver() == 'mysql') {
+               if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
                     $clause = "REGEXP '^".$this->con->escape($url)."[0-9]+$'";
                } elseif ($this->con->driver() == 'pgsql') {
@@ -2187 +2187 @@
           
           # mySQL uses "JOIN" synthax
-          if ($this->con->driver() == 'mysql') {
+          if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
                $strReq .= 
                     'JOIN '.$this->prefix.'post tp ON tc.post_id = tp.post_id ';
@@ -2196 +2196 @@
           
           # pgSQL uses "FROM" synthax
-          if ($this->con->driver() != 'mysql') {
+          if ($this->con->driver() != 'mysql' || $this->con->driver() == 'mysqli') {
                $strReq .= 
                     'FROM '.$this->prefix.'post tp ';
@@ -2206 +2206 @@
           
           # add pgSQL "WHERE" clause
-          if ($this->con->driver() != 'mysql') {
+          if ($this->con->driver() != 'mysql' || $this->con->driver() == 'mysqli') {
                $strReq .= 
                     'AND tc.post_id = tp.post_id ';
@@ -2265 +2265 @@
           
           # mySQL uses "INNER JOIN" synthax
-          if ($this->con->driver() == 'mysql') {
+          if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
                $strReq = 
                     'DELETE FROM tc '.
@@ -2302 +2302 @@
           
           # mySQL uses "INNER JOIN" synthax
-          if ($this->con->driver() == 'mysql') {
+          if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
                $strReq = 
                     'DELETE FROM tc '.

inc/core/class.dc.core.php

@@ -64 +64 @@
           if ($this->con instanceof mysqlConnection) {
                mysqlConnection::$weak_locks = true;
+          } elseif ($this->con instanceof mysqliConnection) {
+               mysqliConnection::$weak_locks = true;
           }
           

locales/fr/main.po

@@ -3330 +3330 @@
 msgid "You do not have sufficient permissions to write to this folder."
 msgstr "Vous n'avez pas les droits suffisants pour écrire dans ce répertoire."
+
+msgid "MySQL (deprecated)"
+msgstr "MySQL (obsolète)"

plugins/importExport/inc/flat/class.flat.import.php

@@ -160 +160 @@
                          if (in_array($last_line_name,$constrained)) {
                               # UNDEFER
-                              if ($this->con->driver() == 'mysql') $this->con->execute('SET foreign_key_checks = 1');
+                              if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') $this->con->execute('SET foreign_key_checks = 1');
                               if ($this->con->driver() == 'pgsql') $this->con->execute('SET CONSTRAINTS ALL DEFERRED');
                          }
@@ -166 +166 @@
                          if (in_array($line->__name,$constrained)) {
                               # DEFER
-                              if ($this->con->driver() == 'mysql') $this->con->execute('SET foreign_key_checks = 0');
+                              if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') $this->con->execute('SET foreign_key_checks = 0');
                               if ($this->con->driver() == 'pgsql') $this->con->execute('SET CONSTRAINTS ALL IMMEDIATE');
                          }
@@ -205 +205 @@
                }
                
-               if ($this->con->driver() == 'mysql') $this->con->execute('SET foreign_key_checks = 1');
+               if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') $this->con->execute('SET foreign_key_checks = 1');
                if ($this->con->driver() == 'pgsql') $this->con->execute('SET CONSTRAINTS ALL DEFERRED');
           }