From e3fecb2557ad0ac2f156f9583683f7c9d998e212 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 29 Apr 2012 17:34:54 -0700
Subject: improved db error logging

---
 include/dba.php | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'include/dba.php')

diff --git a/include/dba.php b/include/dba.php
index 44a663eac..414f4ae7a 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -74,23 +74,29 @@ 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)
@@ -102,7 +108,9 @@ 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 );
 		}
@@ -116,7 +124,7 @@ class dba {
 		if($result === false) {
 			logger('dba: ' . printable($sql) . ' returned false.');
 			if(file_exists('dbfail.out'))
-				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n", FILE_APPEND);
+				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
 		}
 
 		if(($result === true) || ($result === false))
-- 
cgit v1.2.3


From 1ebde084154f6272664e0b8c7309aab5b9c91cf2 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 29 Apr 2012 19:41:17 -0700
Subject: log db error strings in all cases

---
 include/dba.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/dba.php')

diff --git a/include/dba.php b/include/dba.php
index 414f4ae7a..c9f880241 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -74,9 +74,9 @@ class dba {
 		
 		if((! $this->db) || (! $this->connected))
 			return false;
-
-		$this->error = '';
 		
+		$this->error = '';
+
 		if($this->mysqli)
 			$result = @$this->db->query($sql);
 		else
@@ -122,7 +122,7 @@ class dba {
 		 */
 
 		if($result === false) {
-			logger('dba: ' . printable($sql) . ' returned 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);
 		}
-- 
cgit v1.2.3