support mysqli when available

This commit is contained in:
Andrew Dolgov 2013-04-17 18:56:13 +04:00
parent a42c55f02b
commit ae35bb87eb
4 changed files with 84 additions and 4 deletions

View File

@ -7,7 +7,11 @@ class Db implements IDb {
private function __construct() {
switch (DB_TYPE) {
case "mysql":
$this->adapter = new Db_Mysql();
if (function_exists("mysqli_connect")) {
$this->adapter = new Db_Mysqli();
} else {
$this->adapter = new Db_Mysql();
}
break;
case "pgsql":
$this->adapter = new Db_Pgsql();
@ -16,7 +20,7 @@ class Db implements IDb {
die("Unknown DB_TYPE: " . DB_TYPE);
}
$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT);
$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : false);
}
private function __clone() {

View File

@ -20,6 +20,8 @@ class Db_Mysql implements IDb {
}
function escape_string($s, $strip_tags = true) {
if ($strip_tags) $s = strip_tags($s);
return mysql_real_escape_string($s, $this->link);
}
@ -54,7 +56,7 @@ class Db_Mysql implements IDb {
}
function last_error() {
return mysql_affected_rows($this->link);
return mysql_error();
}
function init() {

74
classes/db/mysqli.php Normal file
View File

@ -0,0 +1,74 @@
<?php
class Db_Mysqli implements IDb {
private $link;
function connect($host, $user, $pass, $db, $port) {
$this->link = mysqli_connect($host, $user, $pass, $db, $port);
if ($this->link) {
$this->init();
return $this->link;
} else {
die("Unable to connect to database (as $user to $host, database $db): " . mysqli_error());
}
}
function escape_string($s, $strip_tags = true) {
if ($strip_tags) $s = strip_tags($s);
return mysqli_real_escape_string($this->link, $s);
}
function query($query, $die_on_error = true) {
$result = mysqli_query($this->link, $query);
if (!$result) {
user_error("Query $query failed: " . ($this->link ? mysqli_error($this->link) : "No connection"),
$die_on_error ? E_USER_ERROR : E_USER_WARNING);
}
return $result;
}
function fetch_assoc($result) {
return mysqli_fetch_assoc($result);
}
function num_rows($result) {
return mysqli_num_rows($result);
}
function fetch_result($result, $row, $param) {
if (mysqli_data_seek($result, $row)) {
$line = mysqli_fetch_assoc($result);
return $line[$param];
} else {
return false;
}
}
function close() {
return mysqli_close($this->link);
}
function affected_rows($result) {
return mysqli_affected_rows($this->link);
}
function last_error() {
return mysqli_error();
}
function init() {
$this->query("SET time_zone = '+0:0'");
if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
$this->query("SET NAMES " . MYSQL_CHARSET);
}
return true;
}
}
?>

View File

@ -44,7 +44,7 @@
array_push($errors, "PHP support for JSON is required, but was not found.");
}
if ($db_type == "mysql" && !function_exists("mysql_connect")) {
if ($db_type == "mysql" && !function_exists("mysql_connect") && !function_exists("mysqli_connect")) {
array_push($errors, "PHP support for MySQL is required for configured $db_type in config.php.");
}