Changeset 3565:7b120898d2bd

Timestamp:

07/27/17 17:24:16 (8 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add MySQL UTF8-MB4 support

Files:

• admin/install/check.php (modified) (1 diff)
• admin/install/wizard.php (modified) (1 diff)
• inc/config.php.in (modified) (1 diff)
• inc/core/class.dc.blog.php (modified) (2 diffs)
• inc/core/class.dc.core.php (modified) (1 diff)
• plugins/importExport/inc/flat/class.flat.import.php (modified) (3 diffs)

admin/install/check.php

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

admin/install/wizard.php

@@ -201 +201 @@
 '<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 (deprecated)')=>'mysql',__('MySQLi')=>'mysqli',__('PostgreSQL')=>'pgsql',__('SQLite')=>'sqlite'),$DBDRIVER).'</p>'.
+    form::combo('DBDRIVER',array(__('MySQL (deprecated)')=>'mysql',__('MySQLi')=>'mysqli',__('MySQLi (full UTF-8)')=>'mysqlimb4',__('PostgreSQL')=>'pgsql',__('SQLite')=>'sqlite'),$DBDRIVER).'</p>'.
 '<p><label for="DBHOST">'.__('Database Host Name:').'</label> '.
 form::field('DBHOST',30,255,html::escapeHTML($DBHOST)).'</p>'.

inc/config.php.in

@@ -12 +12 @@
 if (!defined('DC_RC_PATH')) { return; }
 
-// Database driver (mysql (deprecated, disabled in PHP7), mysqli, pgsql, sqlite)
+// Database driver (mysql (deprecated, disabled in PHP7), mysqli, mysqlimb4 (full UTF-8), pgsql, sqlite)
 define('DC_DBDRIVER','');
 

inc/core/class.dc.blog.php

@@ -694 +694 @@
           if (!$rs->isEmpty())
           {
-               if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
+               if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli' || $this->con->driver() == 'mysqlimb4') {
                     $clause = "REGEXP '^".$this->con->escape($url)."[0-9]+$'";
                } elseif ($this->con->driver() == 'pgsql') {
@@ -1939 +1939 @@
           if (!$rs->isEmpty())
           {
-               if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
+               if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli' || $this->con->driver() == 'mysqlimb4') {
                     $clause = "REGEXP '^".$this->con->escape($url)."[0-9]+$'";
                } elseif ($this->con->driver() == 'pgsql') {

inc/core/class.dc.core.php

@@ -72 +72 @@
           } elseif ($this->con instanceof mysqliConnection) {
                mysqliConnection::$weak_locks = true;
+          } elseif ($this->con instanceof mysqlimb4Connection) {
+               mysqlimb4Connection::$weak_locks = true;
           }
 

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

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