Bugfix for pull request #2147 (Fix for issue #2122)

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
index 8d224b570f44299c431f087392cc5e735787ef27..c66723033c1965c6251cd837fdba3c0f5f43276b 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,5 +1,16 @@
 <?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');
 
 /**
@@ -8,21 +19,25 @@ require_once('include/datetime.php');
  *
  * For debugging, insert 'dbg(1);' anywhere in the program flow.
  * dbg(0); will turn it off. Logging is performed at LOGGER_DATA level.
- * When logging, all binary info is converted to text and html entities are escaped so that 
+ * When logging, all binary info is converted to text and html entities are escaped so that
  * the debugging stream is safe to view within both terminals and web pages.
  *
  */
- 
-if(! class_exists('dba')) { 
+
+if(! class_exists('dba')) {
 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 +79,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 +95,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"]) {
+                       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 +166,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 +187,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;
        }
@@ -182,7 +232,7 @@ class dba {
        }
 
        function __destruct() {
-               if ($this->db) 
+               if ($this->db)
                        if($this->mysqli)
                                $this->db->close();
                        else
@@ -200,14 +250,14 @@ function printable($s) {
 }}
 
 // Procedural functions
-if(! function_exists('dbg')) { 
+if(! function_exists('dbg')) {
 function dbg($state) {
        global $db;
        if($db)
        $db->dbg($state);
 }}
 
-if(! function_exists('dbesc')) { 
+if(! function_exists('dbesc')) {
 function dbesc($str) {
        global $db;
        if($db && $db->connected)
@@ -223,7 +273,7 @@ function dbesc($str) {
 // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
 //                   'user', 1);
 
-if(! function_exists('q')) { 
+if(! function_exists('q')) {
 function q($sql) {
 
        global $db;
@@ -231,20 +281,21 @@ function q($sql) {
        unset($args[0]);
 
        if($db && $db->connected) {
-               $stmt = vsprintf($sql,$args);
+               $stmt = @vsprintf($sql,$args); // Disabled warnings
+               //logger("dba: q: $stmt", LOGGER_ALL);
                if($stmt === false)
-                       logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
+                       logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG);
                return $db->q($stmt);
        }
 
        /**
         *
-        * This will happen occasionally trying to store the 
-        * session data after abnormal program termination 
+        * This will happen occasionally trying to store the
+        * session data after abnormal program termination
         *
         */
        logger('dba: no database: ' . print_r($args,true));
-       return false; 
+       return false;
 
 }}
 
@@ -254,7 +305,7 @@ function q($sql) {
  *
  */
 
-if(! function_exists('dbq')) { 
+if(! function_exists('dbq')) {
 function dbq($sql) {
 
        global $db;
@@ -266,10 +317,10 @@ function dbq($sql) {
 }}
 
 
-// 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
-// SQL injection vectors. All integer array elements should be specifically 
-// cast to int to avoid trouble. 
+// SQL injection vectors. All integer array elements should be specifically
+// cast to int to avoid trouble.
 
 
 if(! function_exists('dbesc_array_cb')) {