From 21853e3f7a1aecf34d61908e9352cecbe5ea0783 Mon Sep 17 00:00:00 2001
From: Kenji ITO <mystralkk@gmail.com>
Date: Thu, 22 Dec 2016 14:30:43 +0900
Subject: [PATCH] Fixed a bug where migration failed with MySQL-5.7

---
 .../admin/install/classes/installer.class.php |  2 +
 sql/updates/mysql_2.1.1_to_2.1.2.php          | 45 ++++++++--
 system/databases/mysql.class.php              | 84 +++++++++++++++++++
 system/databases/mysqli.class.php             | 84 +++++++++++++++++++
 system/lib-database.php                       | 12 +++
 5 files changed, 219 insertions(+), 8 deletions(-)

diff --git a/public_html/admin/install/classes/installer.class.php b/public_html/admin/install/classes/installer.class.php
index 2994fb798..4bd04c5ed 100644
--- a/public_html/admin/install/classes/installer.class.php
+++ b/public_html/admin/install/classes/installer.class.php
@@ -2440,6 +2440,7 @@ private function doDatabaseUpgrades($currentGlVersion, $checkForMessage = false)
         // leaving that up to each Geeklog database driver
         $done = false;
         $progress = '';
+        DB_setMysqlSqlMode(Database::MYSQL_SQL_MODE_NONE);
         $_SQL = array();
 
         while (!$done) {
@@ -2912,6 +2913,7 @@ private function doDatabaseUpgrades($currentGlVersion, $checkForMessage = false)
                         }
                     } else {
                         $this->updateDB($_SQL, $progress);
+                        update_dateTimeColumns212();
                         update_addLanguage();
                         update_addRouting();
                         update_ConfValuesFor212();
diff --git a/sql/updates/mysql_2.1.1_to_2.1.2.php b/sql/updates/mysql_2.1.1_to_2.1.2.php
index 83722123e..882f8b129 100644
--- a/sql/updates/mysql_2.1.1_to_2.1.2.php
+++ b/sql/updates/mysql_2.1.1_to_2.1.2.php
@@ -1,13 +1,5 @@
 <?php
 
-// Modify DATETIME columns with '0000-00-00 00:00:00' being the default value to DATETIME DEFAULT NULL
-// to make Geeklog compatible with MySQL-5.7 with NO_ZERO_DATE in sql_mode
-$_SQL[] = "ALTER TABLE {$_TABLES['blocks']} MODIFY COLUMN `rdfupdated` DATETIME DEFAULT NULL";
-$_SQL[] = "ALTER TABLE {$_TABLES['stories']} MODIFY COLUMN `comment_expire` DATETIME DEFAULT NULL";
-$_SQL[] = "ALTER TABLE {$_TABLES['stories']} MODIFY COLUMN `expire` DATETIME DEFAULT NULL";
-$_SQL[] = "ALTER TABLE {$_TABLES['syndication']} MODIFY COLUMN `updated` DATETIME DEFAULT NULL";
-$_SQL[] = "ALTER TABLE {$_TABLES['users']} MODIFY COLUMN `regdate` DATETIME DEFAULT NULL";
-
 // Add device type to blocks table
 $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} ADD `device` VARCHAR( 15 ) NOT NULL DEFAULT 'all' AFTER `blockorder`";
 
@@ -122,6 +114,43 @@ function update_addRouting()
     }
 }
 
+/**
+* Modify DATETIME columns with '0000-00-00 00:00:00' being the default value to DATETIME DEFAULT NULL
+* to make Geeklog compatible with MySQL-5.7 with NO_ZERO_DATE in sql_mode
+ */
+function update_dateTimeColumns212()
+{
+    global $_TABLES;
+
+    $date = '2030-01-01 00:00:00';
+    $_SQL = array();
+
+    // Replace '0000-00-00 00:00:00' with a future timestamp temporarily
+    $_SQL[] = "UPDATE {$_TABLES['blocks']} SET `rdfupdated` = {$date} WHERE `rdfupdated` = '0000-00-00 00:00:00'";
+    $_SQL[] = "UPDATE {$_TABLES['stories']} SET `comment_expire` = {$date} WHERE `comment_expire` = '0000-00-00 00:00:00'";
+    $_SQL[] = "UPDATE {$_TABLES['stories']} SET `expire` = {$date} WHERE `expire` = '0000-00-00 00:00:00'";
+    $_SQL[] = "UPDATE {$_TABLES['syndication']} SET `updated` = {$date} WHERE `updated` = '0000-00-00 00:00:00'";
+    $_SQL[] = "UPDATE {$_TABLES['users']} SET `regdate` = {$date} WHERE `regdate` = '0000-00-00 00:00:00'";
+
+    // Alter columns to allow NULL value
+    $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} MODIFY COLUMN `rdfupdated` DATETIME";
+    $_SQL[] = "ALTER TABLE {$_TABLES['stories']} MODIFY COLUMN `comment_expire` DATETIME";
+    $_SQL[] = "ALTER TABLE {$_TABLES['stories']} MODIFY COLUMN `expire` DATETIME";
+    $_SQL[] = "ALTER TABLE {$_TABLES['syndication']} MODIFY COLUMN `updated` DATETIME";
+    $_SQL[] = "ALTER TABLE {$_TABLES['users']} MODIFY COLUMN `regdate` DATETIME";
+
+    // Restore '0000-00-00 00:00:00' with NULL
+    $_SQL[] = "UPDATE {$_TABLES['blocks']} SET `rdfupdated` = NULL WHERE `rdfupdated` = '{$date}'";
+    $_SQL[] = "UPDATE {$_TABLES['stories']} SET `comment_expire` = NULL WHERE `comment_expire` = '{$date}'";
+    $_SQL[] = "UPDATE {$_TABLES['stories']} SET `expire` = NULL WHERE `expire` = '{$date}'";
+    $_SQL[] = "UPDATE {$_TABLES['syndication']} SET `updated` = NULL WHERE `updated` = '{$date}'";
+    $_SQL[] = "UPDATE {$_TABLES['users']} SET `regdate` = NULL WHERE `regdate` = '{$date}'";
+
+    foreach ($_SQL as $sql) {
+        DB_query($sql, 1);
+    }
+}
+
 /**
  * Add new config options
  */
diff --git a/system/databases/mysql.class.php b/system/databases/mysql.class.php
index 43cb51fbd..44730403c 100755
--- a/system/databases/mysql.class.php
+++ b/system/databases/mysql.class.php
@@ -37,6 +37,15 @@
  */
 class Database
 {
+    // MySQL sql_mode constants
+    const MYSQL_SQL_MODE_NONE = 0;    // Prior to MySQL 5.6.6
+    const MYSQL_SQL_MODE_566 = 1;
+    const MYSQL_SQL_MODE_570 = 2;
+    const MYSQL_SQL_MODE_575 = 3;
+    const MYSQL_SQL_MODE_577 = 4;
+    const MYSQL_SQL_MODE_578 = 5;
+    const MYSQL_SQL_MODE_800 = 6;
+
     /**
      * @var string
      */
@@ -97,6 +106,11 @@ class Database
      */
     private $_use_innodb = false;
 
+    /**
+     * @var int
+     */
+    private $sqlMode = self::MYSQL_SQL_MODE_NONE;
+
     /**
      * Logs messages
      * Logs messages by calling the function held in $_errorlog_fn
@@ -207,6 +221,74 @@ private function setCharset()
         return $retval;
     }
 
+    /**
+     * Set MySQL sql_mode
+     *
+     * @param int $mode one of SQL_MODE_xxx constants
+     */
+    public function setSqlMode($mode)
+    {
+        $mode = (int) $mode;
+
+        if (($mode >= self::MYSQL_SQL_MODE_NONE) && ($mode <= self::MYSQL_SQL_MODE_800)) {
+            $this->sqlMode = $mode;
+        } else {
+            throw new InvalidArgumentException(__METHOD__ . ': bad argument was given');
+        }
+    }
+
+    /**
+     * Return sql_mode string the current MySQL server accepts
+     *
+     * @return string
+     */
+    private function getMysqlSqlModeString()
+    {
+        $sqlModes = array(
+            self::MYSQL_SQL_MODE_NONE => array(),
+            self::MYSQL_SQL_MODE_566  => array(
+                'NO_ENGINE_SUBSTITUTION'
+            ),
+            self::MYSQL_SQL_MODE_570 => array(
+                'NO_ENGINE_SUBSTITUTION',
+            ),
+            self::MYSQL_SQL_MODE_575  => array(
+                'ONLY_FULL_GROUP_BY', 'STRICT_TRANS_TABLES', 'NO_ENGINE_SUBSTITUTION',
+            ),
+            self::MYSQL_SQL_MODE_577  => array(
+                'ONLY_FULL_GROUP_BY', 'STRICT_TRANS_TABLES', 'NO_AUTO_CREATE_USER', 'NO_ENGINE_SUBSTITUTION',
+            ),
+            self::MYSQL_SQL_MODE_578  => array(
+                'ONLY_FULL_GROUP_BY', 'STRICT_TRANS_TABLES', 'NO_ZERO_IN_DATE', 'NO_ZERO_DATE',
+                'ERROR_FOR_DIVISION_BY_ZERO', 'NO_AUTO_CREATE_USER', 'NO_ENGINE_SUBSTITUTION',
+            ),
+            self::MYSQL_SQL_MODE_800  => array(
+                'ONLY_FULL_GROUP_BY', 'STRICT_TRANS_TABLES', 'NO_ZERO_IN_DATE', 'NO_ZERO_DATE',
+                'ERROR_FOR_DIVISION_BY_ZERO', 'NO_AUTO_CREATE_USER', 'NO_ENGINE_SUBSTITUTION',
+            ),
+        );
+
+        if ($this->_mysql_version < 50606) {
+            $currentMode = self::MYSQL_SQL_MODE_NONE;
+        } elseif (($this->_mysql_version >= 50606) && ($this->_mysql_version < 50700)) {
+            $currentMode = self::MYSQL_SQL_MODE_566;
+        } elseif (($this->_mysql_version >= 50700) && ($this->_mysql_version < 50705)) {
+            $currentMode = self::MYSQL_SQL_MODE_570;
+        } elseif (($this->_mysql_version >= 50705) && ($this->_mysql_version < 50707)) {
+            $currentMode = self::MYSQL_SQL_MODE_575;
+        } elseif (($this->_mysql_version >= 50707) && ($this->_mysql_version < 50708)) {
+            $currentMode = self::MYSQL_SQL_MODE_577;
+        } elseif (($this->_mysql_version >= 50708) && ($this->_mysql_version < 80000)) {
+            $currentMode = self::MYSQL_SQL_MODE_578;
+        } else {
+            $currentMode = self::MYSQL_SQL_MODE_800;
+        }
+
+        $allowedMode = min($this->sqlMode, $currentMode);
+
+        return implode(', ', $sqlModes[$allowedMode]);
+    }
+
     /**
      * Return if a given table exists in the current database
      *
@@ -356,6 +438,8 @@ public function dbQuery($sql, $ignore_errors = 0)
         }
 
         // Run query
+        @mysql_query("SET SESSION sql_mode = '" . $this->getMysqlSqlModeString() . "'", $this->_db);
+
         if ($ignore_errors) {
             $result = @mysql_query($sql, $this->_db);
         } else {
diff --git a/system/databases/mysqli.class.php b/system/databases/mysqli.class.php
index 4c004d74d..4e19e24dd 100644
--- a/system/databases/mysqli.class.php
+++ b/system/databases/mysqli.class.php
@@ -38,6 +38,15 @@
  */
 class Database
 {
+    // MySQL sql_mode constants
+    const MYSQL_SQL_MODE_NONE = 0;    // Prior to MySQL 5.6.6
+    const MYSQL_SQL_MODE_566 = 1;
+    const MYSQL_SQL_MODE_570 = 2;
+    const MYSQL_SQL_MODE_575 = 3;
+    const MYSQL_SQL_MODE_577 = 4;
+    const MYSQL_SQL_MODE_578 = 5;
+    const MYSQL_SQL_MODE_800 = 6;
+
     /**
      * @var string
      */
@@ -98,6 +107,11 @@ class Database
      */
     private $_use_innodb = false;
 
+    /**
+     * @var int
+     */
+    private $sqlMode = self::MYSQL_SQL_MODE_NONE;
+
     /**
      * Logs messages
      * Logs messages by calling the function held in $_errorlog_fn
@@ -214,6 +228,74 @@ private function setCharset()
         return $retval;
     }
 
+    /**
+     * Set MySQL sql_mode
+     *
+     * @param int $mode one of SQL_MODE_xxx constants
+     */
+    public function setSqlMode($mode)
+    {
+        $mode = (int) $mode;
+
+        if (($mode >= self::MYSQL_SQL_MODE_NONE) && ($mode <= self::MYSQL_SQL_MODE_800)) {
+            $this->sqlMode = $mode;
+        } else {
+            throw new InvalidArgumentException(__METHOD__ . ': bad argument was given');
+        }
+    }
+
+    /**
+     * Return sql_mode string the current MySQL server accepts
+     *
+     * @return string
+     */
+    private function getMysqlSqlModeString()
+    {
+        $sqlModes = array(
+            self::MYSQL_SQL_MODE_NONE => array(),
+            self::MYSQL_SQL_MODE_566  => array(
+                'NO_ENGINE_SUBSTITUTION'
+            ),
+            self::MYSQL_SQL_MODE_570 => array(
+                'NO_ENGINE_SUBSTITUTION',
+            ),
+            self::MYSQL_SQL_MODE_575  => array(
+                'ONLY_FULL_GROUP_BY', 'STRICT_TRANS_TABLES', 'NO_ENGINE_SUBSTITUTION',
+            ),
+            self::MYSQL_SQL_MODE_577  => array(
+                'ONLY_FULL_GROUP_BY', 'STRICT_TRANS_TABLES', 'NO_AUTO_CREATE_USER', 'NO_ENGINE_SUBSTITUTION',
+            ),
+            self::MYSQL_SQL_MODE_578  => array(
+                'ONLY_FULL_GROUP_BY', 'STRICT_TRANS_TABLES', 'NO_ZERO_IN_DATE', 'NO_ZERO_DATE',
+                'ERROR_FOR_DIVISION_BY_ZERO', 'NO_AUTO_CREATE_USER', 'NO_ENGINE_SUBSTITUTION',
+            ),
+            self::MYSQL_SQL_MODE_800  => array(
+                'ONLY_FULL_GROUP_BY', 'STRICT_TRANS_TABLES', 'NO_ZERO_IN_DATE', 'NO_ZERO_DATE',
+                'ERROR_FOR_DIVISION_BY_ZERO', 'NO_AUTO_CREATE_USER', 'NO_ENGINE_SUBSTITUTION',
+            ),
+        );
+
+        if ($this->_mysql_version < 50606) {
+            $currentMode = self::MYSQL_SQL_MODE_NONE;
+        } elseif (($this->_mysql_version >= 50606) && ($this->_mysql_version < 50700)) {
+            $currentMode = self::MYSQL_SQL_MODE_566;
+        } elseif (($this->_mysql_version >= 50700) && ($this->_mysql_version < 50705)) {
+            $currentMode = self::MYSQL_SQL_MODE_570;
+        } elseif (($this->_mysql_version >= 50705) && ($this->_mysql_version < 50707)) {
+            $currentMode = self::MYSQL_SQL_MODE_575;
+        } elseif (($this->_mysql_version >= 50707) && ($this->_mysql_version < 50708)) {
+            $currentMode = self::MYSQL_SQL_MODE_577;
+        } elseif (($this->_mysql_version >= 50708) && ($this->_mysql_version < 80000)) {
+            $currentMode = self::MYSQL_SQL_MODE_578;
+        } else {
+            $currentMode = self::MYSQL_SQL_MODE_800;
+        }
+
+        $allowedMode = min($this->sqlMode, $currentMode);
+
+        return implode(', ', $sqlModes[$allowedMode]);
+    }
+
     /**
      * Return if a given table exists in the current database
      *
@@ -366,6 +448,8 @@ public function dbQuery($sql, $ignore_errors = 0)
         }
 
         // Run query
+        @$this->_db->query("SET SESSION sql_mode = '" . $this->getMysqlSqlModeString() . "'");
+
         if ($ignore_errors) {
             $result = @$this->_db->query($sql);
         } else {
diff --git a/system/lib-database.php b/system/lib-database.php
index 191174e9f..8bbecdab4 100755
--- a/system/lib-database.php
+++ b/system/lib-database.php
@@ -618,3 +618,15 @@ function DB_escapeString($str)
 
     return $_DB->dbEscapeString($str);
 }
+
+/**
+ * @param int $mode use one of Database::MYSQL_SQL_MODE_xxx constant
+ */
+function DB_setMysqlSqlMode($mode)
+{
+    global $_DB, $_DB_dbms;
+
+    if ($_DB_dbms === 'mysql') {
+        $_DB->setSqlMode($mode);
+    }
+}