X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=7409ec3a8ce69e278e9ac0c205dc7890b5e9657e;hb=500dbecfe75b75a3079a08138a61fad060f3fc6b;hp=a9f70aa40d3c6ce402eefd587e56718a453587d8;hpb=5501dd0759cdec41f74b4bc104fca526ecbb0eef;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
index a9f70aa40d..7409ec3a8c 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,5 +1,11 @@
 <?php
 
+# if PDO is avaible for mysql, use the new database abstraction
+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');
 
 /**
@@ -18,11 +24,15 @@ class dba {
 
 	private $debug = 0;
 	private $db;
+	private $result;
 	public  $mysqli = true;
 	public  $connected = false;
 	public  $error = false;
 
 	function __construct($server,$user,$pass,$db,$install = false) {
+		global $a;
+
+		$stamp1 = microtime(true);
 
 		$server = trim($server);
 		$user = trim($user);
@@ -64,13 +74,15 @@ class dba {
 			if(! $install)
 				system_unavailable();
 		}
+
+		$a->save_timestamp($stamp1, "network");
 	}
 
 	public function getdb() {
 		return $this->db;
 	}
 
-	public function q($sql) {
+	public function q($sql, $onlyquery = false) {
 		global $a;
 
 		if((! $this->db) || (! $this->connected))
@@ -78,20 +90,23 @@ class dba {
 
 		$this->error = '';
 
-		if(x($a->config,'system') && x($a->config['system'],'db_log'))
-			$stamp1 = microtime(true);
+		$stamp1 = microtime(true);
 
 		if($this->mysqli)
 			$result = @$this->db->query($sql);
 		else
 			$result = @mysql_query($sql,$this->db);
 
+		$stamp2 = microtime(true);
+		$duration = (float)($stamp2-$stamp1);
+
+		$a->save_timestamp($stamp1, "database");
+
 		if(x($a->config,'system') && x($a->config['system'],'db_log')) {
-			$stamp2 = microtime(true);
-			$duration = round($stamp2-$stamp1, 3);
 			if (($duration > $a->config["system"]["db_loglimit"])) {
+				$duration = round($duration, 3);
 				$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-				@file_put_contents($a->config["system"]["db_log"], $duration."\t".
+				@file_put_contents($a->config["system"]["db_log"], datetime_convert()."\t".$duration."\t".
 						basename($backtrace[1]["file"])."\t".
 						$backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
 						substr($sql, 0, 2000)."\n", FILE_APPEND);
@@ -146,6 +161,11 @@ class dba {
 		if(($result === true) || ($result === false))
 			return $result;
 
+		if ($onlyquery) {
+			$this->result = $result;
+			return true;
+		}
+
 		$r = array();
 		if($this->mysqli) {
 			if($result->num_rows) {
@@ -162,12 +182,37 @@ class dba {
 			}
 		}
 
+		//$a->save_timestamp($stamp1, "database");
 
 		if($this->debug)
 			logger('dba: ' . printable(print_r($r, true)));
 		return($r);
 	}
 
+	public function qfetch() {
+		$x = false;
+
+		if ($this->result)
+			if($this->mysqli) {
+				if($this->result->num_rows)
+					$x = $this->result->fetch_array(MYSQLI_ASSOC);
+			} else {
+				if(mysql_num_rows($this->result))
+					$x = mysql_fetch_array($this->result, MYSQL_ASSOC);
+			}
+
+		return($x);
+	}
+
+	public function qclose() {
+		if ($this->result)
+			if($this->mysqli) {
+				$this->result->free_result();
+			} else {
+				mysql_free_result($this->result);
+			}
+	}
+
 	public function dbg($dbg) {
 		$this->debug = $dbg;
 	}