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

* add support of PDO mysql extension (try it by default while setup)

Browse source
This commit is contained in:
Max Pozdeev 2021-07-25 00:10:27 +03:00
parent 3c769c6d31
commit 648364aa23
4 changed files with 189 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

171
src/includes/class.db.mysql.php Normal file
View file

@ -0,0 +1,171 @@
<?php
/*
(C) Copyright 2021 Max Pozdeev <maxpozdeev@gmail.com>
Licensed under the GNU GPL v2 license. See file COPYRIGHT for details.
*/
// ---------------------------------------------------------------------------- //
class DatabaseResult_Mysql
{
private $q;
private $affected;
function __construct($dbh, $query, $resultless = 0)
{
// use with DELETE, INSERT, UPDATE
if ($resultless)
{
$this->affected = $dbh->exec($query); //throws PDOException
}
// SELECT
else
{
$this->q = $dbh->query($query); //throws PDOException
$this->affected = $this->q->rowCount();
}
}
function fetch_row()
{
return $this->q->fetch(PDO::FETCH_NUM);
}
function fetch_assoc()
{
return $this->q->fetch(PDO::FETCH_ASSOC);
}
function rowsAffected()
{
return $this->affected;
}
}
// ---------------------------------------------------------------------------- //
class Database_Mysql
{
private $dbh;
private $affected = null;
var $lastQuery;
private $dbname;
function __construct()
{
}
function connect($host, $user, $pass, $db)
{
$options = array(
PDO::MYSQL_ATTR_FOUND_ROWS => true,
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
);
$this->dbname = $db;
$this->dbh = new PDO("mysql:host=$host;dbname=$db", $user, $pass, $options);
return true;
}
/*
Returns single row of SELECT query as indexed array (FETCH_NUM).
Returns single field value if resulting array has only one field.
*/
function sq($query, $p = NULL)
{
$q = $this->_dq($query, $p);
$res = $q->fetch_row();
if ($res === false) return NULL;
if (sizeof($res) > 1) return $res;
else return $res[0];
}
/*
Returns single row of SELECT query as dictionary array (FETCH_ASSOC).
Returns single field value if resulting array has only one field.
*/
function sqa($query, $p = NULL)
{
$q = $this->_dq($query, $p);
$res = $q->fetch_assoc();
if ($res === false) return NULL;
if (sizeof($res) > 1) return $res;
else return $res[0];
}
function dq($query, $p = NULL)
{
return $this->_dq($query, $p);
}
/*
for resultless queries like INSERT,UPDATE,DELETE
*/
function ex($query, $p = NULL)
{
return $this->_dq($query, $p, true);
}
private function _dq($query, $p = NULL, $resultless = 0)
{
if (!isset($p)) $p = array();
elseif (!is_array($p)) $p = array($p);
$m = explode('?', $query);
if (sizeof($p) > 0)
{
if (sizeof($m) < sizeof($p)+1) {
throw new Exception("params to set MORE than query params");
}
if (sizeof($m) > sizeof($p)+1) {
throw new Exception("params to set LESS than query params");
}
$query = "";
for ($i=0; $i<sizeof($m)-1; $i++) {
$query .= $m[$i]. (is_null($p[$i]) ? 'NULL' : $this->quote($p[$i]));
}
$query .= $m[$i];
}
$this->lastQuery = $query;
$dbr = new DatabaseResult_Mysql($this->dbh, $query, $resultless);
$this->affected = $dbr->rowsAffected();
return $dbr;
}
function affected()
{
return $this->affected;
}
function quote($s)
{
return '\''. addslashes($s). '\'';
}
function quoteForLike($format, $s)
{
$s = str_replace(array('%','_'), array('\%','\_'), addslashes($s));
return '\''. sprintf($format, $s). '\'';
}
function last_insert_id()
{
return $this->dbh->lastInsertId();
}
function table_exists($table)
{
$r = $this->sq("SELECT 1 FROM information_schema.tables WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?",
array($this->dbname, $table) );
if ($r === false || $r === null) return false;
return true;
}
}
?>

1
src/includes/common.php
View file

@ -87,6 +87,7 @@ class Config
'template' => array('default'=>'default', 'type'=>'s'),
'showdate' => array('default'=>0, 'type'=>'i'),
'markup' => array('default'=>'markdown', 'type'=>'s'),
'mysqli' => array('default'=>1, 'type'=>'i')
);
public static $config;

5
src/init.php
View file

@ -40,9 +40,10 @@ unset($config);
date_default_timezone_set(Config::get('timezone'));
# MySQL Database Connection
if(Config::get('db') == 'mysql')
if (Config::get('db') == 'mysql')
{
require_once(MTTINC. 'class.db.mysqli.php');
if (Config::get('mysqli')) require_once(MTTINC. 'class.db.mysqli.php');
else require_once(MTTINC. 'class.db.mysql.php');
$db = DBConnection::init(new Database_Mysql);
try {
$db->connect(Config::get('mysql.host'), Config::get('mysql.user'), Config::get('mysql.password'), Config::get('mysql.db'));

18
src/setup.php
View file

@ -336,13 +336,23 @@ function testConnect(&$error)
{
if(Config::get('db') == 'mysql')
{
if ( !function_exists("mysqli_connect") ) {
throw new Exception("Required PHP extension 'mysqli' is not installed");
if (defined('PDO::MYSQL_ATTR_FOUND_ROWS')) {
require_once(MTTINC. 'class.db.mysql.php');
Config::set('mysqli', 0);
}
require_once(MTTINC. 'class.db.mysqli.php');
else if (function_exists("mysqli_connect")) {
require_once(MTTINC. 'class.db.mysqli.php');
Config::set('mysqli', 1);
}
else {
$text = "Required PHP extension 'PDO mysql' is not installed.";
throw new Exception($text);
}
$db = new Database_Mysql;
$db->connect(Config::get('mysql.host'), Config::get('mysql.user'), Config::get('mysql.password'), Config::get('mysql.db'));
} else
}
else
{
if(false === $f = @fopen(MTTPATH. 'db/todolist.db', 'a+')) throw new Exception("database file is not readable/writable");
else fclose($f);