prehistoric-systems/mytinytodo
1
0
Fork 0
mirror of https://github.com/maxpozdeev/mytinytodo.git synced 2026-03-11 08:55:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename mysqli api class

Browse source
This commit is contained in:
Max Pozdeev 2022-02-08 21:06:50 +03:00
parent a5bf61e176
commit 263e65ae53
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/includes/class.db.mysqli.php
View file

@ -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()

12
src/init.php
View file

@ -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,

4
src/setup.php
View file

@ -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,