X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=02e1722fe25d3d1b08db80b59f99d2429e2c38b6;hp=a3b5af0dd2bd8c8c9879f84ef051f17255253e85;hb=4b32c7be676d4a191c869a5745f2890240852fb0;hpb=aa1fa67e62e0d175d5d801becaea4362a5b50e2a

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index a3b5af0dd2..02e1722fe2 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -85,9 +85,8 @@ function SQL_QUERY ($sqlString, $F, $L) {
 	// Run SQL command
 	//* DEBUG: */ print('F=' . basename($F) . ',L=' . $L . 'sql=' . htmlentities($sqlString) . '<br />');
 	$result = mysql_query($sqlString, SQL_GET_LINK())
-		or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error() . '<br />
-Query string:<br />
-' . $sqlString);
+		or debug_report_bug('[' . __FUNCTION__ . ':' . __LINE__ . '] ' . $F . ' (' . $L . '):' . mysql_error() . "\n".
+'Query string:' . $sqlString);
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sqlString . ',numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS());
 
 	// Calculate query time
@@ -135,6 +134,9 @@ Query string:<br />
 
 // SQL num rows
 function SQL_NUMROWS ($result) {
+	// Valid link resource?
+	if (!SQL_IS_LINK_UP()) return false;
+
 	// Link is not up, no rows by default
 	$lines = false;
 
@@ -145,9 +147,9 @@ function SQL_NUMROWS ($result) {
 
 		// Is the result empty? Then we have an error!
 		if (empty($lines)) $lines = '0';
-	} elseif (SQL_IS_LINK_UP()) {
-		// No resource given, no lines found!
-		$lines = '0';
+	} else {
+		// No resource given, please fix this
+		trigger_error('No resource given! result[]=' . gettype($result));
 	}
 
 	// Return lines
@@ -225,7 +227,7 @@ function SQL_CONNECT ($host, $login, $password, $F, $L) {
 	SQL_SET_LINK($connect);
 
 	// Destroy cache
-	unset($GLOBALS['sql_link_res']);
+	unset($GLOBALS['is_sql_link_up']);
 }
 
 // SQL select database
@@ -252,7 +254,7 @@ function SQL_CLOSE ($F, $L) {
 	SQL_SET_LINK(null);
 
 	// Destroy cache
-	unset($GLOBALS['sql_link_res']);
+	unset($GLOBALS['is_sql_link_up']);
 
 	// Return the result
 	return $close;
@@ -403,14 +405,14 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
 
 			// Do we have no entry on ADD or an entry on DROP?
 			// 123           4       4     3    3      4           4          32    23           4       4     3    3      4            4          321
-			if (((SQL_NUMROWS($result) == '0') && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 1) && (strpos($sql, 'DROP') !== false))) {
+			if (((SQL_HASZERONUMS($result)) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 1) && (strpos($sql, 'DROP') !== false))) {
 				// Do the query
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Executing: ' . $sql);
 				$result = SQL_QUERY($sql, $F, $L, false);
 
 				// Skip further attempt(s)
 				break;
-			} elseif ((((SQL_NUMROWS($result) == 1) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == '0') && (strpos($sql, 'DROP') !== false))) && ($columnName != 'KEY')) {
+			} elseif ((((SQL_NUMROWS($result) == 1) && (strpos($sql, 'ADD') !== false)) || ((SQL_HASZERONUMS($result)) && (strpos($sql, 'DROP') !== false))) && ($columnName != 'KEY')) {
 				// Abort here because it is alreay there
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $sql);
 				break;
@@ -530,20 +532,26 @@ function SQL_IS_LINK_UP () {
 	$linkUp = false;
 
 	// Do we have cached this?
-	if (isset($GLOBALS['sql_link_res'])) {
+	if (isset($GLOBALS['is_sql_link_up'])) {
 		// Then use this
-		$linkUp = $GLOBALS['sql_link_res'];
+		$linkUp = $GLOBALS['is_sql_link_up'];
 	} else {
 		// Get it
 		$linkUp = is_resource(SQL_GET_LINK());
 
 		// And cache it
-		$GLOBALS['sql_link_res'] = $linkUp;
+		$GLOBALS['is_sql_link_up'] = $linkUp;
 	}
 
 	// Return the result
 	return $linkUp;
 }
 
+// Wrapper function to make code more readable
+function SQL_HASZERONUMS ($result) {
+	// Just pass it through
+	return (SQL_NUMROWS($result) === 0);
+}
+
 // [EOF]
 ?>