X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=61aaa980cd7a7498ee0e30e7c1f8abb78fca6a4a;hp=0767c5f1628823eea4a731644b4cc9b306f0eae0;hb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb;hpb=cca98f57dff720b174d21d071cee8303462485d7

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 0767c5f162..61aaa980cd 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Datenbankschicht fuer MySQL +3.x Server          *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -33,29 +38,52 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
+	die();
+} // END - if
 
 // SQL queries
-function SQL_QUERY ($sql_string, $F, $L) {
-	global $link, $CSS, $_CONFIG, $OK;
+function SQL_QUERY ($sqlString, $F, $L) {
+	// Trim SQL string
+	$sqlString = trim($sqlString);
 
 	// Link is up?
-	if (!is_resource($link)) return false;
+	if (!SQL_IS_LINK_UP()) {
+		// We should not quietly ignore this!
+		debug_report_bug(sprintf("Cannot query database: sqlString=%s,file=%s,line=%s",
+			$sqlString,
+			basename($F),
+			$L
+		));
+
+		// Return 'false' because it has failed
+		return false;
+	} elseif (empty($sqlString)) {
+		// Empty SQL string!
+		debug_report_bug(sprintf("SQL string is empty. Please fix this. file=%s, line=%s",
+			basename($F),
+			$L
+		));
+
+		// This is invalid, of course
+		return false;
+	}
 
 	// Remove \t, \n and \r from queries they may confuse some MySQL version I have heard
-	$sql_string = str_replace("\t", " ", str_replace("\n", " ", str_replace("\r", " ", $sql_string)));
+	$sqlString = str_replace("\t", ' ', str_replace("\n", ' ', str_replace("\r", ' ', $sqlString)));
+
+	// Compile config out
+	$sqlString = FILTER_COMPILE_CONFIG($sqlString);
 
 	// Starting time
 	$querytimeBefore = array_sum(explode(' ', microtime()));
 
 	// Run SQL command
-	//* DEBUG: */ echo $sql_string."<br />\n";
-	$result = mysql_query($sql_string, $link)
-	 or addFatalMessage($F." (".$L."):".mysql_error()."<br />
+	///* DEBUG: */ print($sqlString . '<br />');
+	$result = mysql_query($sqlString, SQL_GET_LINK())
+		or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error() . '<br />
 Query string:<br />
-".$sql_string);
+' . $sqlString);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sqlString . ',numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS());
 
 	// Ending time
 	$querytimeAfter = array_sum(explode(' ', microtime()));
@@ -63,36 +91,40 @@ Query string:<br />
 	// Calculate query time
 	$queryTime = $querytimeAfter - $querytimeBefore;
 
+	// Add this query to array including timing
+	addSqlToDebug($result, $sqlString, $queryTime, $F, $L);
+
 	// Save last successfull query
-	$_CONFIG['db_last_query'] = $sql_string;
+	setConfigEntry('db_last_query', $sqlString);
+
+	// Count all query times
+	incrementConfigEntry('sql_time', $queryTime);
 
 	// Count this query
 	incrementConfigEntry('sql_count');
 
 	// Debug output
-	//* DEBUG: */ print "Query=<pre>".$sql_string."</pre>, affected=<strong>".SQL_AFFECTEDROWS()."</strong>, numrows=<strong>".SQL_NUMROWS($result)."</strong><br />\n";
-
-	if (($CSS != "1") && ($CSS != "-1") && (isBooleanConstantAndTrue('DEBUG_MODE')) && (isBooleanConstantAndTrue('DEBUG_SQL'))) {
+	if ((getOutputMode() != 1) && (isDebugModeEnabled()) && (isConfigEntrySet('DEBUG_SQL')) && (getConfig('DEBUG_SQL') == 'Y')) {
 		//
 		// Debugging stuff...
 		//
-		$fp = @fopen(PATH."inc/cache/mysql.log", 'a') or mxchange_die("Cannot write mysql.log!");
-		if (!isset($OK)) {
+		$fp = fopen(getConfig('CACHE_PATH') . 'mysql.log', 'a') or app_die(__FILE__, __LINE__, "Cannot write mysql.log!");
+		if (!isset($GLOBALS['sql_first_entry'])) {
 			// Write first entry
-			fwrite($fp, "Module=".$GLOBALS['module']."\n");
-			$OK = true;
+			fwrite($fp, 'Module=' . getModule() . "\n");
+			$GLOBALS['sql_first_entry'] = true;
 		} // END - if
-		fwrite($fp, $F."(LINE=".$L."|NUM=".SQL_NUMROWS($result)."|AFFECTED=".SQL_AFFECTEDROWS()."|QUERYTIME:".$queryTime."): ".str_replace('\r', "", str_replace('\n', " ", $sql_string))."\n");
+		fwrite($fp, $F . '(LINE=' . $L . '|NUM=' . SQL_NUMROWS($result) . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . $queryTime . '): ' . str_replace("\r", '', str_replace("\n", ' ', $sqlString)) . "\n");
 		fclose($fp);
 	} // END - if
 
 	// Count DB hits
-	if (getConfig('db_hits_run') == null) {
+	if (!isStatsEntrySet('db_hits')) {
 		// Count in dummy variable
-		$_CONFIG['db_hits_run'] = 1;
+		setStatsEntry('db_hits', 1);
 	} else {
 		// Count to config array
-		$_CONFIG['db_hits_run']++;
+		incrementStatsEntry('db_hits');
 	}
 
 	// Return the result
@@ -100,7 +132,10 @@ Query string:<br />
 }
 
 // SQL num rows
-function SQL_NUMROWS($result) {
+function SQL_NUMROWS ($result) {
+	// Link is not up, no rows by default
+	$lines = false;
+
 	// Is the result a valid resource?
 	if (is_resource($result)) {
 		// Get the count of rows from database
@@ -108,43 +143,40 @@ function SQL_NUMROWS($result) {
 
 		// Is the result empty? Then we have an error!
 		if (empty($lines)) $lines = 0;
-	} else {
+	} elseif (SQL_IS_LINK_UP()) {
 		// No resource given, no lines found!
 		$lines = 0;
 	}
+
+	// Return lines
 	return $lines;
 }
 
 // SQL affected rows
 function SQL_AFFECTEDROWS() {
-	global $link;
-
 	// Valid link resource?
-	if (!is_resource($link)) return false;
+	if (!SQL_IS_LINK_UP()) return false;
 
 	// Get affected rows
-	$lines = mysql_affected_rows($link);
+	$lines = mysql_affected_rows(SQL_GET_LINK());
 
 	// Return it
 	return $lines;
 }
 
 // SQL fetch row
-function SQL_FETCHROW($result) {
-	// Init data
-	$DATA = array();
-
+function SQL_FETCHROW ($result) {
 	// Is a result resource set?
-	if (!is_resource($result)) return false;
+	if ((!is_resource($result)) || (!SQL_IS_LINK_UP())) return false;
 
-	$DATA = mysql_fetch_row($result);
-	return $DATA;
+	// Fetch the data and return it
+	return mysql_fetch_row($result);
 }
 
 // SQL fetch array
-function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
+function SQL_FETCHARRAY ($res, $nr=0, $remove_numerical=true) {
 	// Is a result resource set?
-	if (!is_resource($res)) return false;
+	if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
 
 	// Initialize array
 	$row = array();
@@ -156,13 +188,13 @@ function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
 	if (is_array($row)) {
 		// Shall we remove numerical data here automatically?
 		if ($remove_numerical) {
-				 // So let's remove all numerical elements to save memory!
+			// So let's remove all numerical elements to save memory!
 			$max = count($row);
 			for ($idx = 0; $idx < ($max / 2); $idx++) {
 				// Remove entry
 				unset($row[$idx]);
-			}
-		}
+			} // END - for
+		} // END - if
 
 		// Return row
 		return $row;
@@ -173,52 +205,60 @@ function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
 }
 
 // SQL result
-function SQL_RESULT($res, $row, $field) {
+function SQL_RESULT ($res, $row, $field = 0) {
+	// Is $res valid?
+	if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
+
+	// Run the result command and return the result
 	$result = mysql_result($res, $row, $field);
 	return $result;
 }
+
 // SQL connect
-function SQL_CONNECT($host, $login, $password, $F, $L) {
-	$connect = mysql_connect($host, $login, $password) or addFatalMessage($F." (".$L."):".mysql_error());
-	return $connect;
+function SQL_CONNECT ($host, $login, $password, $F, $L) {
+	// Try to connect
+	$connect = mysql_connect($host, $login, $password) or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error());
+
+	// Set the link resource
+	SQL_SET_LINK($connect);
+
+	// Destroy cache
+	unset($GLOBALS['sql_link_res']);
 }
+
 // SQL select database
-function SQL_SELECT_DB($dbName, $link, $F, $L) {
-	$select = false;
-	if (is_resource($link)) {
-		$select = mysql_select_db($dbName, $link) or addFatalMessage($F." (".$L."):".mysql_error());
-	}
-	return $select;
+function SQL_SELECT_DB ($dbName, $F, $L) {
+	// Is there still a valid link? If not, skip it.
+	if (!SQL_IS_LINK_UP()) return false;
+
+	// Return the result
+	return mysql_select_db($dbName, SQL_GET_LINK()) or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error());
 }
-// SQL close link
-function SQL_CLOSE(&$link, $F, $L) {
-	global $_CONFIG, $cacheInstance, $cacheArray;
 
-	// Is there still a valid link?
-	if (!is_resource($link)) {
+// SQL close link
+function SQL_CLOSE ($F, $L) {
+	if (!SQL_IS_LINK_UP()) {
 		// Skip double close
 		return false;
 	} // END - if
 
-	// Do we need to update cache/db counter?
-	//* DEBUG: */ echo "DB=".getConfig('db_hits').",CACHE=".getConfig('cache_hits')."<br />\n";
-	if ((GET_EXT_VERSION("cache") >= "0.0.7") && (getConfig('db_hits') > 0) && (getConfig('cache_hits') > 0) && (is_object($cacheInstance))) {
-		// Add new hits
-		$_CONFIG['db_hits'] += getConfig('db_hits_run');
+	// Close database link and forget the link
+	$close = mysql_close(SQL_GET_LINK())
+		or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):'.mysql_error());
 
-		// Update counter for db/cache
-		UPDATE_CONFIG(array("db_hits", "cache_hits"), array(bigintval(getConfig('db_hits')), bigintval(getConfig('cache_hits'))));
-	} // END - if
+	// Close link
+	SQL_SET_LINK(null);
 
-	// Close database link and forget the link
-	$close = mysql_close($link) or addFatalMessage($F." (".$L."):".mysql_error());
-	$link = null;
+	// Destroy cache
+	unset($GLOBALS['sql_link_res']);
+
+	// Return the result
 	return $close;
 }
 
 // SQL free result
 function SQL_FREERESULT ($result) {
-	if (!is_resource($result)) {
+	if ((!is_resource($result)) || (!SQL_IS_LINK_UP())) {
 		// Abort here
 		return false;
 	} // END - if
@@ -228,145 +268,280 @@ function SQL_FREERESULT ($result) {
 }
 
 // SQL string escaping
-function SQL_QUERY_ESC ($qstring, $data, $file, $line, $run=true, $strip=true) {
-	global $link;
-
+function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure=true) {
 	// Link is there?
-	if (!is_resource($link)) return false;
+	if ((!SQL_IS_LINK_UP()) || (!is_array($data))) return false;
 
-	// Init variable
-	$query = "failed";
+	// Escape all data
+	$dataSecured['__sql_string'] = $qstring;
+	foreach ($data as $key => $value) {
+		$dataSecured[$key] = SQL_ESCAPE($value, $secure, $strip);
+	} // END - foreach
 
-	if ($strip) {
-		$strip = "true";
-	} else {
-		$strip = "false";
-	}
+	// Generate query
+	$query = call_user_func_array('sprintf', $dataSecured);
 
-	$eval = "\$query = sprintf(\"".$qstring."\"";
-	foreach ($data as $var) {
-		if ((!empty($var)) || ($var === 0)) {
-			$eval .= ", SQL_ESCAPE(\"".$var."\",true,".$strip.")";
-		} else {
-			$eval .= ", ''";
-		}
-	}
-	$eval .= ");";
-	//
 	// Debugging
 	//
-	//* DEBUG: */ $fp = fopen(PATH."inc/cache/escape_debug.log", 'a') or mxchange_die("Cannot write debug.log!");
-	//* DEBUG: */ fwrite($fp, $file."(".$line."): ".str_replace("\r", "", str_replace("\n", " ", $eval))."\n");
-	//* DEBUG: */ fclose($fp);
-
-	// Run the code
-	eval($eval);
-
-	// Was the eval() command fine?
-	if ($query == "failed") {
-		// Something went wrong?
-		print "eval=".htmlentities($eval)."<pre>";
-		debug_print_backtrace();
-		die("</pre>");
-	} // END - if
+	///* DEBUG: */ $fp = fopen(getConfig('CACHE_PATH') . 'escape_debug.log', 'a') or app_die(__FILE__, __LINE__, "Cannot write debug.log!");
+	///* DEBUG: */ fwrite($fp, $F.'('.$L."): ".str_replace("\r", '', str_replace("\n", " ", $eval))."\n");
+	///* DEBUG: */ fclose($fp);
 
-	if ($run) {
+	if ($run === true) {
 		// Run SQL query (default)
-		return SQL_QUERY($query, $file, $line);
+		return SQL_QUERY($query, $F, $L);
 	} else {
 		// Return secured string
 		return $query;
 	}
 }
 
-// Get ID from last INSERT command
+// Get id from last INSERT command
 function SQL_INSERTID () {
-	global $link;
-	if (!is_resource($link)) return false;
+	if (!SQL_IS_LINK_UP()) return false;
 	return mysql_insert_id();
 }
 
 // Escape a string for the database
-function SQL_ESCAPE ($str, $secureString=true,$strip=true) {
-	global $link;
+function SQL_ESCAPE ($str, $secureString=true, $strip=true) {
+	// Do we have cache?
+	if (!isset($GLOBALS['sql_escapes'][''.$str.''])) {
+		// Secure string first? (which is the default behaviour!)
+		if ($secureString === true) {
+			// Then do it here
+			$str = secureString($str, $strip);
+		} // END - if
 
-	// Secure string first? (which is the default behaviour!)
-	if ($secureString) {
-		// Then do it here
-		$str = secureString($str, $strip);
-	} // END - if
+		if (!SQL_IS_LINK_UP()) {
+			// Fall-back to smartAddSlashes() when there is no link
+			$ret = smartAddSlashes($str);
+		} elseif (function_exists('mysql_real_escape_string')) {
+			// The new and improved version
+			///* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str='.$str);
+			$ret = mysql_real_escape_string($str, SQL_GET_LINK());
+		} elseif (function_exists('mysql_escape_string')) {
+			// The obsolete function
+			$ret = mysql_escape_string($str, SQL_GET_LINK());
+		} else {
+			// If nothing else works, fall back to smartAddSlashes() again
+			$ret = smartAddSlashes($str);
+		}
 
-	if (!is_resource($link)) {
-		// Fall-back to addslashes() when there is no link
-		return addslashes($str);
+		// Cache result
+		$GLOBALS['sql_escapes'][''.$str.''] = $ret;
 	} // END - if
 
-	if (function_exists('mysql_real_escape_string')) {
-		// The new and improved version
-		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):str={$str}<br />\n";
-		return mysql_real_escape_string($str, $link);
-	} elseif (function_exists('mysql_escape_string')) {
-		// The obsolete function
-		return mysql_escape_string($str, $link);
-	} else {
-		// If nothing else works
-		return addslashes($str);
-	}
+	// Return it
+	return $GLOBALS['sql_escapes'][''.$str.''];
 }
 
 // SELECT query string from table, columns and so on... ;-)
 function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 	// Is columns an array?
-	if (!is_array($columns) {
+	if (!is_array($columns)) {
 		// No array
-		trigger_error(sprintf("columns is not array. %s!=array", gettype($columns)));
-	}
+		debug_report_bug(sprintf("columns is not an array. %s != array, file=%s, line=%s",
+			gettype($columns),
+			basename($F),
+			$L
+		));
+
+		// Abort here with 'false'
+		return false;
+	} // END  - if
 
 	// Prepare the SQL statement
-	$SQL = "SELECT `".implode("`, `", $columns)."` FROM `{!_MYSQL_PREFIX!}_%s` WHERE ``='%s' LIMIT 1";
+	$sql = "SELECT `".implode("`,`", $columns)."` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1";
 
 	// Return the result
-	return SQL_QUERY_ESC($SQL,
+	return SQL_QUERY_ESC($sql,
 		array(
-			bigintval($id),
 			$table,
-			$idRow
-		), $F, $L);
+			$idRow,
+			bigintval($id),
+		), $F, $L
+	);
 }
 
 // ALTER TABLE wrapper function
 function SQL_ALTER_TABLE ($sql, $F, $L) {
+	// Abort if link is down
+	if (!SQL_IS_LINK_UP()) return false;
+
 	// This is the default result...
 	$result = false;
 
 	// Determine index/fulltext/unique word
-	$noIndex = ((eregi("INDEX", $sql) == false) && (eregi("FULLTEXT", $sql) == false) && (eregi("UNIQUE", $sql) == false);
+	$noIndex = (
+	(
+		strpos($sql, 'INDEX') === false
+	) && (
+		strpos($sql, 'KEY') === false
+	) && (
+		strpos($sql, 'FULLTEXT') === false
+	) && (
+		strpos($sql, 'UNIQUE') === false
+	)
+	);
+
+	// Extract table name
+	$tableArray = explode(' ', $sql);
+	$tableName = str_replace('`', '', $tableArray[2]);
 
 	// Shall we add/drop?
-	if (((eregi("ADD", $sql) > 0) || (eregi("DROP", $sql) > 0)) && ($noIndex)) {
-		// Extract table name
-		$tableArray = explode(" ", $sql);
-		$tableName = str_replace("`", "", $tableArray[2]);
-
+	if (((strpos($sql, 'ADD') !== false) || (strpos($sql, 'DROP') !== false)) && ($noIndex === true)) {
+		// Try two columns, one should fix
+		foreach (array(4,5) as $idx) {
+			// And column name as well
+			$columnName = str_replace('`', '', $tableArray[$idx]);
+
+			// Get column information
+			$result = SQL_QUERY_ESC("SHOW COLUMNS FROM `%s` LIKE '%s'",
+				array($tableName, $columnName), __FILE__, __LINE__);
+
+			// 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))) {
+				// 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')) {
+				// Abort here because it is alreay there
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $sql);
+				break;
+			} elseif ($columnName != 'KEY') {
+				// Something didn't fit
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Possible problem: ' . $sql);
+			}
+		} // END - foreach
+	} elseif ((getConfig('_TABLE_TYPE') == 'InnoDB') && (strpos($sql, 'FULLTEXT') !== false)) {
+		// Skip this query silently
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,file=%s,line=%s", $sql, $F, $L));
+	} elseif ($noIndex === false) {
 		// And column name as well
-		$columnName = str_replace("`", "", $tableArray[4]);
+		//* DEBUG: */ print __LINE__.':tableArray=<pre>' . print_r($tableArray, true) . '</pre>';
+		$keyName = str_replace('`', '', $tableArray[5]);
+
+		// Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above
+		if (in_array(strtoupper($keyName), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) {
+			// Init loop
+			$begin = 1; $keyName = ',';
+			while (strpos($keyName, ',') !== false) {
+				// Use last
+				$keyName = str_replace('`', '', $tableArray[count($tableArray) - $begin]);
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $keyName . '----------------' . $begin);
+
+				// Remove brackes
+				$keyName = str_replace('(', '', str_replace(')', '', $keyName));
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $keyName . '----------------' . $begin);
+
+				// Continue
+				$begin++;
+			} // END while
+		} // END - if
 
-		// Get column information
-		$result = SQL_QUERY_ESC("SHOW COLUMNS FROM %s LIKE '%s'",
-			array($tableName, $columnName), $F, $L);
+		// Show indexes
+		$result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FILE__, __LINE__);
 
-		// Do we have no entry on ADD or an entry on DROP?
-		if (((SQL_NUMROWS($result) == 0) && (eregi("ADD", $sql) > 0)) || ((SQL_NUMROWS($result) == 1) && (eregi("DROP", $sql) > 0))) {
-			// Do the query
-			$result = SQL_QUERY($sql, $F, $L, false);
+		// Non-skipping is default for ADD
+		$skip = false;
+
+		// But should we DROP?
+		if ($tableArray[3] == 'DROP') {
+			// Then skip if nothing found!
+			$skip = true;
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Going to drop key ' . $keyName);
 		} // END - if
+
+		// Walk through all
+		while ($content = SQL_FETCHARRAY($result)) {
+			// Is it found?
+			//* DEBUG: */ print(__LINE__.':columnName='.$keyName.',content=<pre>' . print_r($content, true) . '</pre>');
+			if (($content['Key_name'] == $keyName) && ($tableArray[3] == 'ADD')) {
+				// Skip this query!
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ADD: Skiped: %s", $sql));
+				$skip = true;
+				break;
+			} elseif (($content['Key_name'] == $keyName) && ($tableArray[3] == 'DROP')) {
+				// Don't skip this!
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("DROP: Not skiped: %s", $sql));
+				$skip = false;
+				break;
+			}
+		} // END - while
+
+		// Free result
+		SQL_FREERESULT($result);
+
+		// Shall we run it?
+		if ($skip === false) {
+			// Send it to the SQL_QUERY() function
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
+			$result = SQL_QUERY($sql, $F, $L, false);
+		} else {
+			// Not executed
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not executed: ' . $sql);
+		}
 	} else {
-		// Send it to the SQL_QUERY() function
+		// Other ALTER TABLE query
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
 		$result = SQL_QUERY($sql, $F, $L, false);
 	}
 
 	// Return result
 	return $result;
 }
-//
+
+// Getter for SQL link
+function SQL_GET_LINK () {
+	// Init link
+	$link = null;
+
+	// Is it in the globals?
+	if (isset($GLOBALS['sql_link'])) {
+		// Then take it
+		$link = $GLOBALS['sql_link'];
+	} // END - if
+
+	// Return it
+	return $link;
+}
+
+// Setter for link
+function SQL_SET_LINK ($link) {
+	// Is this a resource or null?
+	if ((!is_resource($link)) && (!is_null($link))) {
+		// This should never happen!
+		debug_report_bug(sprintf("link is not resource or null. Type: %s", gettype($link)));
+	} // END - if
+
+	// Set it
+	$GLOBALS['sql_link'] = $link;
+}
+
+// Checks if the link is up
+function SQL_IS_LINK_UP () {
+	// Default is not up
+	$linkUp = false;
+
+	// Do we have cached this?
+	if (isset($GLOBALS['sql_link_res'])) {
+		// Then use this
+		$linkUp = $GLOBALS['sql_link_res'];
+	} else {
+		// Get it
+		$linkUp = is_resource(SQL_GET_LINK());
+
+		// And cache it
+		$GLOBALS['sql_link_res'] = $linkUp;
+	}
+
+	// Return the result
+	return $linkUp;
+}
+
+// [EOF]
 ?>