Merge pull request #276 from tomtom84/master

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
index 782c279d5d0ec78815240acf9ad5ee7abaf8a07c..c9f880241ba9003d38cc2a356c90e62daeb7fc59 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once('include/datetime.php');
+
 /**
  *
  * MySQL database class
@@ -73,22 +75,28 @@ class dba {
                if((! $this->db) || (! $this->connected))
                        return false;
                
+               $this->error = '';
+
                if($this->mysqli)
                        $result = @$this->db->query($sql);
                else
                        $result = @mysql_query($sql,$this->db);
 
+               if($this->mysqli) {
+                       if($this->db->errno)
+                               $this->error = $this->db->error;
+               }
+               elseif(mysql_errno($this->db))
+                               $this->error = mysql_error($this->db);  
+
+               if(strlen($this->error)) {
+                       logger('dba: ' . $this->error);
+               }
+
                if($this->debug) {
 
                        $mesg = '';
 
-                       if($this->mysqli) {
-                               if($this->db->errno)
-                                       logger('dba: ' . $this->db->error);
-                       }
-                       elseif(mysql_errno($this->db))
-                               logger('dba: ' . mysql_error($this->db));
-
                        if($result === false)
                                $mesg = 'false';
                        elseif($result === true)
@@ -100,23 +108,23 @@ class dba {
                                        $mesg = mysql_num_rows($result) . ' results' . EOL;
                        }
     
-                       $str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL;
+                       $str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg 
+                               . (($this->error) ? ' error: ' . $this->error : '')
+                               . EOL;
 
                        logger('dba: ' . $str );
                }
-               else {
 
-                       /**
-                        * If dbfail.out exists, we will write any failed calls directly to it,
-                        * regardless of any logging that may or may nor be in effect.
-                        * These usually indicate SQL syntax errors that need to be resolved.
-                        */
+               /**
+                * If dbfail.out exists, we will write any failed calls directly to it,
+                * regardless of any logging that may or may nor be in effect.
+                * These usually indicate SQL syntax errors that need to be resolved.
+                */
 
-                       if($result === false) {
-                               logger('dba: ' . printable($sql) . ' returned false.');
-                               if(file_exists('dbfail.out'))
-                                       file_put_contents('dbfail.out', printable($sql) . ' returned false' . "\n", FILE_APPEND);
-                       }
+               if($result === false) {
+                       logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
+                       if(file_exists('dbfail.out'))
+                               file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
                }
 
                if(($result === true) || ($result === false))
@@ -125,7 +133,7 @@ class dba {
                $r = array();
                if($this->mysqli) {
                        if($result->num_rows) {
-                               while($x = $result->fetch_array(MYSQL_ASSOC))
+                               while($x = $result->fetch_array(MYSQLI_ASSOC))
                                        $r[] = $x;
                                $result->free_result();
                        }
@@ -140,7 +148,7 @@ class dba {
 
     
                if($this->debug)
-                       logger('dba: ' . printable(print_r($r, true)), LOGGER_DATA);
+                       logger('dba: ' . printable(print_r($r, true)));
                return($r);
        }
 
@@ -207,8 +215,10 @@ function q($sql) {
        unset($args[0]);
 
        if($db && $db->connected) {
-               $ret = $db->q(vsprintf($sql,$args));
-               return $ret;
+               $stmt = vsprintf($sql,$args);
+               if($stmt === false)
+                       logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
+               return $db->q($stmt);
        }
 
        /**
@@ -258,6 +268,4 @@ function dbesc_array(&$arr) {
        if(is_array($arr) && count($arr)) {
                array_walk($arr,'dbesc_array_cb');
        }
-}}             
-
-
+}}