friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #3227 from annando/1703-pdo 

We now support PDO
This commit is contained in:
rabuzarus 2017-03-16 00:25:16 +01:00 committed by GitHub
parent b4bad92657 acadb8ecdb
commit 6fdc219143
2 changed files with 198 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

316
include/dba.php
View File

@ -1,17 +1,5 @@
<?php <?php
require_once("dbm.php"); require_once("dbm.php");
# if PDO is avaible for mysql, use the new database abstraction
# TODO: PDO is disabled for release 3.3. We need to investigate why
# the update from 3.2 fails with pdo
/*
if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
require_once("library/dddbl2/dddbl.php");
require_once("include/dba_pdo.php");
}
*/
require_once('include/datetime.php'); require_once('include/datetime.php');
/** /**
@ -24,13 +12,12 @@ require_once('include/datetime.php');
* *
*/ */
if (! class_exists('dba')) {
class dba { class dba {
private $debug = 0; private $debug = 0;
private $db; private $db;
private $result; private $result;
public $mysqli = true; private $driver;
public $connected = false; public $connected = false;
public $error = false; public $error = false;
@ -53,7 +40,7 @@ class dba {
if ($install) { if ($install) {
if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
$this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server); $this->error = sprintf(t('Cannot locate DNS info for database server \'%s\''), $server);
$this->connected = false; $this->connected = false;
$this->db = null; $this->db = null;
return; return;
@ -61,37 +48,52 @@ class dba {
} }
} }
if (class_exists('mysqli')) { if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
$this->db = @new mysqli($server,$user,$pass,$db); $this->driver = 'pdo';
if (! mysqli_connect_errno()) { $connect = "mysql:host=".$server.";dbname=".$db;
if (isset($a->config["system"]["db_charset"])) {
$connect .= ";charset=".$a->config["system"]["db_charset"];
}
$this->db = @new PDO($connect, $user, $pass);
if (!$this->db->errorCode()) {
$this->connected = true; $this->connected = true;
} }
if (isset($a->config["system"]["db_charset"])) { } elseif (class_exists('mysqli')) {
$this->db->set_charset($a->config["system"]["db_charset"]); $this->driver = 'mysqli';
$this->db = @new mysqli($server,$user,$pass,$db);
if (!mysqli_connect_errno()) {
$this->connected = true;
if (isset($a->config["system"]["db_charset"])) {
$this->db->set_charset($a->config["system"]["db_charset"]);
}
} }
} else { } elseif (function_exists('mysql_connect')) {
$this->mysqli = false; $this->driver = 'mysql';
$this->db = mysql_connect($server,$user,$pass); $this->db = mysql_connect($server,$user,$pass);
if ($this->db && mysql_select_db($db,$this->db)) { if ($this->db && mysql_select_db($db,$this->db)) {
$this->connected = true; $this->connected = true;
if (isset($a->config["system"]["db_charset"])) {
mysql_set_charset($a->config["system"]["db_charset"], $this->db);
}
}
} else {
// No suitable SQL driver was found.
if (!$install) {
system_unavailable();
} }
if (isset($a->config["system"]["db_charset"]))
mysql_set_charset($a->config["system"]["db_charset"], $this->db);
} }
if (!$this->connected) { if (!$this->connected) {
$this->db = null; $this->db = null;
if (!$install) { if (!$install) {
system_unavailable(); system_unavailable();
} }
} }
$a->save_timestamp($stamp1, "network"); $a->save_timestamp($stamp1, "network");
} }
public function getdb() {
return $this->db;
}
/** /**
* @brief Returns the MySQL server version string * @brief Returns the MySQL server version string
* *
@ -101,12 +103,18 @@ class dba {
* @return string * @return string
*/ */
public function server_info() { public function server_info() {
if ($this->mysqli) { switch ($this->driver) {
$return = $this->db->server_info; case 'pdo':
} else { $version = $this->db->getAttribute(PDO::ATTR_SERVER_VERSION);
$return = mysql_get_server_info($this->db); break;
case 'mysqli':
$version = $this->db->server_info;
break;
case 'mysql':
$version = mysql_get_server_info($this->db);
break;
} }
return $return; return $version;
} }
/** /**
@ -130,12 +138,18 @@ class dba {
return 0; return 0;
} }
if ($this->mysqli) { switch ($this->driver) {
$return = $this->result->num_rows; case 'pdo':
} else { $rows = $this->result->rowCount();
$return = mysql_num_rows($this->result); break;
case 'mysqli':
$rows = $this->result->num_rows;
break;
case 'mysql':
$rows = mysql_num_rows($this->result);
break;
} }
return $return; return $rows;
} }
/** /**
@ -172,8 +186,9 @@ class dba {
if ((intval($a->config["system"]["db_loglimit_index"]) > 0)) { if ((intval($a->config["system"]["db_loglimit_index"]) > 0)) {
$log = (in_array($row['key'], $watchlist) AND $log = (in_array($row['key'], $watchlist) AND
($row['rows'] >= intval($a->config["system"]["db_loglimit_index"]))); ($row['rows'] >= intval($a->config["system"]["db_loglimit_index"])));
} else } else {
$log = false; $log = false;
}
if ((intval($a->config["system"]["db_loglimit_index_high"]) > 0) AND ($row['rows'] >= intval($a->config["system"]["db_loglimit_index_high"]))) { if ((intval($a->config["system"]["db_loglimit_index_high"]) > 0) AND ($row['rows'] >= intval($a->config["system"]["db_loglimit_index_high"]))) {
$log = true; $log = true;
@ -203,13 +218,7 @@ class dba {
$this->error = ''; $this->error = '';
// Check the connection (This can reconnect the connection - if configured) $connstr = ($this->connected() ? "Connected" : "Disonnected");
if ($this->mysqli) {
$connected = $this->db->ping();
} else {
$connected = mysql_ping($this->db);
}
$connstr = ($connected ? "Connected" : "Disonnected");
$stamp1 = microtime(true); $stamp1 = microtime(true);
@ -219,10 +228,20 @@ class dba {
$sql = "/*".$a->callstack()." */ ".$sql; $sql = "/*".$a->callstack()." */ ".$sql;
} }
if ($this->mysqli) { $columns = 0;
$result = @$this->db->query($sql);
} else { switch ($this->driver) {
$result = @mysql_query($sql,$this->db); case 'pdo':
$result = @$this->db->query($sql);
// Is used to separate between queries that returning data - or not
$columns = $result->columnCount();
break;
case 'mysqli':
$result = @$this->db->query($sql);
break;
case 'mysql':
$result = @mysql_query($sql,$this->db);
break;
} }
$stamp2 = microtime(true); $stamp2 = microtime(true);
$duration = (float)($stamp2-$stamp1); $duration = (float)($stamp2-$stamp1);
@ -243,16 +262,27 @@ class dba {
} }
} }
if ($this->mysqli) { switch ($this->driver) {
if ($this->db->errno) { case 'pdo':
$this->error = $this->db->error; $errorInfo = $this->db->errorInfo();
$this->errorno = $this->db->errno; if ($errorInfo) {
} $this->error = $errorInfo[2];
} elseif (mysql_errno($this->db)) { $this->errorno = $errorInfo[1];
$this->error = mysql_error($this->db); }
$this->errorno = mysql_errno($this->db); break;
case 'mysqli':
if ($this->db->errno) {
$this->error = $this->db->error;
$this->errorno = $this->db->errno;
}
break;
case 'mysql':
if (mysql_errno($this->db)) {
$this->error = mysql_error($this->db);
$this->errorno = mysql_errno($this->db);
}
break;
} }
if (strlen($this->error)) { if (strlen($this->error)) {
logger('DB Error ('.$connstr.') '.$this->errorno.': '.$this->error); logger('DB Error ('.$connstr.') '.$this->errorno.': '.$this->error);
} }
@ -266,10 +296,16 @@ class dba {
} elseif ($result === true) { } elseif ($result === true) {
$mesg = 'true'; $mesg = 'true';
} else { } else {
if ($this->mysqli) { switch ($this->driver) {
$mesg = $result->num_rows . ' results' . EOL; case 'pdo':
} else { $mesg = $result->rowCount().' results'.EOL;
$mesg = mysql_num_rows($result) . ' results' . EOL; break;
case 'mysqli':
$mesg = $result->num_rows.' results'.EOL;
break;
case 'mysql':
$mesg = mysql_num_rows($result).' results'.EOL;
break;
} }
} }
@ -302,18 +338,32 @@ class dba {
} }
$r = array(); $r = array();
if ($this->mysqli) { switch ($this->driver) {
if ($result->num_rows) { case 'pdo':
while($x = $result->fetch_array(MYSQLI_ASSOC)) while ($x = $result->fetch(PDO::FETCH_ASSOC)) {
$r[] = $x; $r[] = $x;
}
$result->closeCursor();
break;
case 'mysqli':
while ($x = $result->fetch_array(MYSQLI_ASSOC)) {
$r[] = $x;
}
$result->free_result(); $result->free_result();
} break;
} else { case 'mysql':
if (mysql_num_rows($result)) { while ($x = mysql_fetch_array($result, MYSQL_ASSOC)) {
while($x = mysql_fetch_array($result, MYSQL_ASSOC))
$r[] = $x; $r[] = $x;
}
mysql_free_result($result); mysql_free_result($result);
} break;
}
// PDO doesn't return "true" on successful operations - like mysqli does
// Emulate this behaviour by checking if the query returned data and had columns
// This should be reliable enough
if (($this->driver == 'pdo') AND (count($r) == 0) AND ($columns == 0)) {
return true;
} }
//$a->save_timestamp($stamp1, "database"); //$a->save_timestamp($stamp1, "database");
@ -328,12 +378,16 @@ class dba {
$x = false; $x = false;
if ($this->result) { if ($this->result) {
if ($this->mysqli) { switch ($this->driver) {
if ($this->result->num_rows) case 'pdo':
$x = $this->result->fetch(PDO::FETCH_ASSOC);
break;
case 'mysqli':
$x = $this->result->fetch_array(MYSQLI_ASSOC); $x = $this->result->fetch_array(MYSQLI_ASSOC);
} else { break;
if (mysql_num_rows($this->result)) case 'mysql':
$x = mysql_fetch_array($this->result, MYSQL_ASSOC); $x = mysql_fetch_array($this->result, MYSQL_ASSOC);
break;
} }
} }
return($x); return($x);
@ -341,10 +395,16 @@ class dba {
public function qclose() { public function qclose() {
if ($this->result) { if ($this->result) {
if ($this->mysqli) { switch ($this->driver) {
$this->result->free_result(); case 'pdo':
} else { $this->result->closeCursor();
mysql_free_result($this->result); break;
case 'mysqli':
$this->result->free_result();
break;
case 'mysql':
mysql_free_result($this->result);
break;
} }
} }
} }
@ -355,35 +415,65 @@ class dba {
public function escape($str) { public function escape($str) {
if ($this->db && $this->connected) { if ($this->db && $this->connected) {
if ($this->mysqli) { switch ($this->driver) {
return @$this->db->real_escape_string($str); case 'pdo':
} else { return substr(@$this->db->quote($str, PDO::PARAM_STR), 1, -1);
return @mysql_real_escape_string($str,$this->db); case 'mysqli':
return @$this->db->real_escape_string($str);
case 'mysql':
return @mysql_real_escape_string($str,$this->db);
} }
} }
} }
function connected() { function connected() {
if ($this->mysqli) { switch ($this->driver) {
$connected = $this->db->ping(); case 'pdo':
} else { // Not sure if this really is working like expected
$connected = mysql_ping($this->db); $connected = ($this->db->getAttribute(PDO::ATTR_CONNECTION_STATUS) != "");
break;
case 'mysqli':
$connected = $this->db->ping();
break;
case 'mysql':
$connected = mysql_ping($this->db);
break;
} }
return $connected; return $connected;
} }
function insert_id() {
switch ($this->driver) {
case 'pdo':
$id = $this->db->lastInsertId();
break;
case 'mysqli':
$id = $this->db->insert_id;
break;
case 'mysql':
$id = mysql_insert_id($this->db);
break;
}
return $id;
}
function __destruct() { function __destruct() {
if ($this->db) { if ($this->db) {
if ($this->mysqli) { switch ($this->driver) {
$this->db->close(); case 'pdo':
} else { $this->db = null;
mysql_close($this->db); break;
case 'mysqli':
$this->db->close();
break;
case 'mysql':
mysql_close($this->db);
break;
} }
} }
} }
}} }
if (! function_exists('printable')) {
function printable($s) { function printable($s) {
$s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s); $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s);
$s = str_replace("\x00",'.',$s); $s = str_replace("\x00",'.',$s);
@ -391,37 +481,32 @@ function printable($s) {
$s = escape_tags($s); $s = escape_tags($s);
} }
return $s; return $s;
}} }
// Procedural functions // Procedural functions
if (! function_exists('dbg')) {
function dbg($state) { function dbg($state) {
global $db; global $db;
if ($db) { if ($db) {
$db->dbg($state); $db->dbg($state);
} }
}} }
if (! function_exists('dbesc')) {
function dbesc($str) { function dbesc($str) {
global $db; global $db;
if ($db && $db->connected) { if ($db && $db->connected) {
return($db->escape($str)); return($db->escape($str));
} else { } else {
return(str_replace("'","\\'",$str)); return(str_replace("'","\\'",$str));
} }
}} }
// Function: q($sql,$args); // Function: q($sql,$args);
// Description: execute SQL query with printf style args. // Description: execute SQL query with printf style args.
// Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
// 'user', 1); // 'user', 1);
if (! function_exists('q')) {
function q($sql) { function q($sql) {
global $db; global $db;
$args = func_get_args(); $args = func_get_args();
unset($args[0]); unset($args[0]);
@ -445,8 +530,7 @@ function q($sql) {
*/ */
logger('dba: no database: ' . print_r($args,true)); logger('dba: no database: ' . print_r($args,true));
return false; return false;
}
}}
/** /**
* @brief Performs a query with "dirty reads" * @brief Performs a query with "dirty reads"
@ -458,8 +542,8 @@ function q($sql) {
* @return array Query array * @return array Query array
*/ */
function qu($sql) { function qu($sql) {
global $db; global $db;
$args = func_get_args(); $args = func_get_args();
unset($args[0]); unset($args[0]);
@ -484,7 +568,6 @@ function qu($sql) {
*/ */
logger('dba: no database: ' . print_r($args,true)); logger('dba: no database: ' . print_r($args,true));
return false; return false;
} }
/** /**
@ -492,40 +575,31 @@ function qu($sql) {
* Raw db query, no arguments * Raw db query, no arguments
* *
*/ */
if (! function_exists('dbq')) {
function dbq($sql) { function dbq($sql) {
global $db; global $db;
if ($db && $db->connected) { if ($db && $db->connected) {
$ret = $db->q($sql); $ret = $db->q($sql);
} else { } else {
$ret = false; $ret = false;
} }
return $ret; return $ret;
}} }
// Caller is responsible for ensuring that any integer arguments to // Caller is responsible for ensuring that any integer arguments to
// dbesc_array are actually integers and not malformed strings containing // dbesc_array are actually integers and not malformed strings containing
// SQL injection vectors. All integer array elements should be specifically // SQL injection vectors. All integer array elements should be specifically
// cast to int to avoid trouble. // cast to int to avoid trouble.
if (! function_exists('dbesc_array_cb')) {
function dbesc_array_cb(&$item, $key) { function dbesc_array_cb(&$item, $key) {
if (is_string($item)) if (is_string($item))
$item = dbesc($item); $item = dbesc($item);
}} }
if (! function_exists('dbesc_array')) {
function dbesc_array(&$arr) { function dbesc_array(&$arr) {
if (is_array($arr) && count($arr)) { if (is_array($arr) && count($arr)) {
array_walk($arr,'dbesc_array_cb'); array_walk($arr,'dbesc_array_cb');
} }
}} }
function dba_timer() { function dba_timer() {
return microtime(true); return microtime(true);

9
include/uimport.php
View File

@ -11,14 +11,11 @@ define("IMPORT_DEBUG", False);
function last_insert_id() { function last_insert_id() {
global $db; global $db;
if (IMPORT_DEBUG) if (IMPORT_DEBUG)
return 1; return 1;
if ($db->mysqli) {
$thedb = $db->getdb(); return $db->insert_id();
return $thedb->insert_id;
} else {
return mysql_insert_id();
}
} }
function last_error() { function last_error() {