From 263e65ae5350b45b4fbf5d7858151369182768ad Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Tue, 8 Feb 2022 21:06:50 +0300
Subject: [PATCH] rename mysqli api class

---
 src/includes/class.db.mysqli.php |  6 +++---
 src/init.php                     | 12 +++++++++---
 src/setup.php                    |  4 +++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/includes/class.db.mysqli.php b/src/includes/class.db.mysqli.php
index 10c15b7..77b60da 100644
--- a/src/includes/class.db.mysqli.php
+++ b/src/includes/class.db.mysqli.php
@@ -7,7 +7,7 @@
 */
 
 // ---------------------------------------------------------------------------- //
-class DatabaseResult_Mysql extends DatabaseResult_Abstract
+class DatabaseResult_Mysqli extends DatabaseResult_Abstract
 {
     /** @var mysqli_result */
     protected $q;
@@ -29,7 +29,7 @@ class DatabaseResult_Mysql extends DatabaseResult_Abstract
 }
 
 // ---------------------------------------------------------------------------- //
-class Database_Mysql extends Database_Abstract
+class Database_Mysqli extends Database_Abstract
 {
     /** @var mysqli */
     protected $dbh;
@@ -114,7 +114,7 @@ class Database_Mysql extends Database_Abstract
             $query .= $m[$i];
         }
         $this->lastQuery = $query;
-        return new DatabaseResult_Mysql($this->dbh, $query, $resultless);
+        return new DatabaseResult_Mysqli($this->dbh, $query, $resultless);
     }
 
     function affected()
diff --git a/src/init.php b/src/init.php
index 4974dfa..07bf32f 100644
--- a/src/init.php
+++ b/src/init.php
@@ -39,9 +39,15 @@ require_once(MTTINC. 'version.php');
 # MySQL Database Connection
 if (MTT_DB_TYPE == 'mysql')
 {
-    if (defined('MTT_DB_DRIVER') && MTT_DB_DRIVER == 'mysqli') require_once(MTTINC. 'class.db.mysqli.php');
-    else require_once(MTTINC. 'class.db.mysql.php');
-    $db = DBConnection::init(new Database_Mysql);
+    if (defined('MTT_DB_DRIVER') && MTT_DB_DRIVER == 'mysqli') {
+        require_once(MTTINC. 'class.db.mysqli.php');
+        $db = new Database_Mysqli();
+    }
+    else {
+        require_once(MTTINC. 'class.db.mysql.php');
+        $db = new Database_Mysql();
+    }
+    DBConnection::init($db);
     try {
         $db->connect( array(
             'host' => MTT_DB_HOST,
diff --git a/src/setup.php b/src/setup.php
index 66080f6..ad8c2cb 100644
--- a/src/setup.php
+++ b/src/setup.php
@@ -432,10 +432,12 @@ function testConnect(&$error)
                 else if ($hasMysqli) $driver = 'mysqli';
             }
 
+            $db = null;
             if ($driver == 'mysqli') {
                 if ($hasMysqli) {
                     require_once(MTTINC. 'class.db.mysqli.php');
                     if (!defined('MTT_DB_DRIVER')) define('MTT_DB_DRIVER', 'mysqli');
+                    $db = new Database_Mysqli();
                 }
                 else {
                     throw new Exception("Required PHP extension 'MySQLi' is not installed.");
@@ -445,6 +447,7 @@ function testConnect(&$error)
                 if ($hasPDO) {
                     require_once(MTTINC. 'class.db.mysql.php');
                     if (!defined('MTT_DB_DRIVER')) define('MTT_DB_DRIVER', ''); // set pdo?
+                    $db = new Database_Mysql();
                 }
                 else {
                     throw new Exception("Required PHP extension 'PDO_MySQL' is not installed.");
@@ -455,7 +458,6 @@ function testConnect(&$error)
                 if (!defined($c)) throw new Exception("$c is not defined");
             }
 
-            $db = new Database_Mysql;
             $db->connect( array(
                 'host' => MTT_DB_HOST,
                 'user' => MTT_DB_USER,