X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=17caef397c5f9ee472bf9242c8ddf84df30fb0da;hp=13d333d1b2e16f99c1cb5206e88ff7a0470ba18b;hb=b622c2d9285f044f49328cbd98efbf2f1a24aa8e;hpb=b7ec93f8292180fa480361949f8da5d6f558ef7e

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 13d333d1b2..17caef397c 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -6,19 +6,18 @@
  * -------------------------------------------------------------------- *
  * File              : lib-mysql3.php                                   *
  * -------------------------------------------------------------------- *
- * Short description : Database layer for MySQL +3.x server             *
+ * Short description : Database layer for MySQL 3/4/5 server            *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Datenbankschicht fuer MySQL +3.x Server          *
+ * Kurzbeschreibung  : Datenbankschicht fuer MySQL 3/4/5 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 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -42,57 +41,66 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // SQL queries
-function SQL_QUERY ($sqlString, $F, $L) {
-	// Trim SQL string
-	$sqlString = trim($sqlString);
+function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][$sqlString])) {
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called: ' . $sqlString);
+
+		// Trim SQL string
+		$sqlStringModified = trim($sqlString);
+
+		// Empty query string or link is not up?
+		if (empty($sqlStringModified)) {
+			// Empty SQL string!
+			reportBug(__FUNCTION__, __LINE__, sprintf("SQL string is empty, please fix this: file=%s, line=%s",
+				basename($F),
+				$L
+			));
+		} elseif (!SQL_IS_LINK_UP()) {
+			// We should not quietly ignore this
+			reportBug(__FUNCTION__, __LINE__, sprintf("Cannot query database: sqlString=%s,file=%s,line=%s",
+				$sqlStringModified,
+				basename($F),
+				$L
+			));
+		}
 
-	// Link is up?
-	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
-		));
+		// Remove \t, \n and \r from queries they may confuse some MySQL versions
+		$sqlStringModified = str_replace(array(chr(9), chr(10), chr(13)), array(' ', ' ', ' '), $sqlStringModified);
 
-		// 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
-		));
+		// Compile config entries out
+		$sqlStringModified = SQL_PREPARE_SQL_STRING($sqlStringModified, $enableCodes);
 
-		// This is invalid, of course
-		return false;
-	}
+		// Cache it and remember as last SQL query
+		$GLOBALS[__FUNCTION__][$sqlString] = $sqlStringModified;
+		$GLOBALS['last_sql'] = $sqlStringModified;
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Stored cache: ' . $sqlStringModified);
+	}  else {
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cache used: ' . $sqlString);
 
-	// Remove \t, \n and \r from queries they may confuse some MySQL version I have heard
-	$sqlString = str_replace("\t", ' ', str_replace("\n", ' ', str_replace("\r", ' ', $sqlString)));
+		// Use cache (to save a lot function calls
+		$GLOBALS['last_sql'] = $GLOBALS[__FUNCTION__][$sqlString];
 
-	// Compile config out
-	$sqlString = FILTER_COMPILE_CONFIG($sqlString, true);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cache is: ' . $sqlString);
+	}
 
 	// Starting time
 	$querytimeBefore = microtime(true);
 
 	// 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);
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sqlString . ',numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'F=' . basename($F) . ',L=' . $L . ',sql=' . $GLOBALS['last_sql']);
+	$result = mysql_query($GLOBALS['last_sql'], SQL_GET_LINK())
+		or SQL_ERROR($F, $L, 'file='. basename($F) . ',line=' . $L . ':mysql_error()=' . mysql_error() . ',last_query=' . $GLOBALS['last_sql']);
+	//* DEBUG: */ logDebugMessage($F, $L, 'sql=' . $GLOBALS['last_sql'] . ',affected=' . SQL_AFFECTEDROWS() . ',numRows='.(is_resource($result) ? SQL_NUMROWS($result) : gettype($result)));
 
 	// Calculate query time
 	$queryTime = microtime(true) - $querytimeBefore;
 
 	// Add this query to array including timing
-	addSqlToDebug($result, $sqlString, $queryTime, $F, $L);
+	addSqlToDebug($result, $GLOBALS['last_sql'], $queryTime, $F, $L);
 
 	// Save last successfull query
-	setConfigEntry('db_last_query', $sqlString);
+	setConfigEntry('db_last_query', $GLOBALS['last_sql']);
 
 	// Count all query times
 	incrementConfigEntry('sql_time', $queryTime);
@@ -101,48 +109,46 @@ Query string:<br />
 	incrementConfigEntry('sql_count');
 
 	// Debug output
-	if ((getOutputMode() != 1) && (isDebugModeEnabled()) && (isConfigEntrySet('DEBUG_SQL')) && (getConfig('DEBUG_SQL') == 'Y')) {
-		//
-		// Debugging stuff...
-		//
-		$fp = fopen(getConfig('CACHE_PATH') . 'mysql.log', 'a') or app_die(__FILE__, __LINE__, 'Cannot write mysql.log!');
+	if (SQL_DEBUG_ENABLED()) {
+		// Is this the first call?
 		if (!isset($GLOBALS['sql_first_entry'])) {
 			// Write first entry
-			fwrite($fp, 'Module=' . getModule() . "\n");
+			appendLineToFile(getCachePath() . 'mysql.log', 'Module=' . getModule());
 			$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", ' ', $sqlString)) . "\n");
-		fclose($fp);
+
+		// Append debug line
+		appendLineToFile(getCachePath() . 'mysql.log', basename($F) . '|LINE=' . $L . '|NUM=' . (is_resource($result) ? SQL_NUMROWS($result) : 'false') . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . $queryTime . '): ' . str_replace(array(chr(13), chr(10)), array('', ' '), $GLOBALS['last_sql']));
 	} // END - if
 
-	// Count DB hits
-	if (!isStatsEntrySet('db_hits')) {
-		// Count in dummy variable
-		setStatsEntry('db_hits', 1);
-	} else {
-		// Count to config array
-		incrementStatsEntry('db_hits');
-	}
+	// Increment stats entry
+	incrementStatsEntry('db_hits');
 
 	// Return the result
 	return $result;
 }
 
 // SQL num rows
-function SQL_NUMROWS ($result) {
+function SQL_NUMROWS ($resource) {
+	// Valid link resource?
+	if (!SQL_IS_LINK_UP()) return false;
+
 	// Link is not up, no rows by default
 	$lines = false;
 
 	// Is the result a valid resource?
-	if (is_resource($result)) {
+	if (isset($GLOBALS['sql_numrows'][intval($resource)])) {
+		// Use cache
+		$lines = $GLOBALS['sql_numrows'][intval($resource)];
+	} elseif (is_resource($resource)) {
 		// Get the count of rows from database
-		$lines = mysql_num_rows($result);
+		$lines = mysql_num_rows($resource);
 
-		// 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';
+		// Remember it in cache
+		$GLOBALS['sql_numrows'][intval($resource)] = $lines;
+	} else {
+		// No resource given, please fix this
+		reportBug(__FUNCTION__, __LINE__, 'No resource given! result[]=' . gettype($resource) . ',last_sql=' .  $GLOBALS['last_sql']);
 	}
 
 	// Return lines
@@ -162,65 +168,62 @@ function SQL_AFFECTEDROWS() {
 }
 
 // SQL fetch row
-function SQL_FETCHROW ($result) {
+function SQL_FETCHROW ($resource) {
 	// Is a result resource set?
-	if ((!is_resource($result)) || (!SQL_IS_LINK_UP())) return false;
+	if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return false;
 
 	// Fetch the data and return it
-	return mysql_fetch_row($result);
+	return mysql_fetch_row($resource);
 }
 
 // SQL fetch array
-function SQL_FETCHARRAY ($res, $nr=0, $remove_numerical=true) {
+function SQL_FETCHARRAY ($res) {
 	// Is a result resource set?
 	if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
 
-	// Initialize array
-	$row = array();
-
 	// Load row from database
-	$row = mysql_fetch_array($res);
+	$row = mysql_fetch_assoc($res);
 
 	// Return only arrays here
 	if (is_array($row)) {
-		// Shall we remove numerical data here automatically?
-		if ($remove_numerical) {
-			// 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;
 	} else {
-		// Return a false here...
+		// Return a false, else some loops would go endless...
 		return false;
 	}
 }
 
 // SQL result
-function SQL_RESULT ($res, $row, $field = '0') {
-	// Is $res valid?
-	if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
+function SQL_RESULT ($resource, $row, $field = '0') {
+	// Is $resource valid?
+	if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return false;
+
+	// Run the result command
+	$result = mysql_result($resource, $row, $field);
 
-	// Run the result command and return the result
-	$result = mysql_result($res, $row, $field);
+	// ... and return the result
 	return $result;
 }
 
 // SQL 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());
+	$linkResource = mysql_connect($host, $login, $password) or SQL_ERROR($F, $L,  mysql_error());
 
 	// Set the link resource
-	SQL_SET_LINK($connect);
+	if (is_resource($linkResource)) {
+		/*
+		 * A non-resource (boolean) may happen on installation phase which
+		 * shall not be set here. Only valid link resources shall be set so
+		 * SQL_IS_LINK_UP() will only return 'true' if there is really a
+		 * working database link.
+		 */
+		SQL_SET_LINK($linkResource);
+	} // END - if
 
-	// Destroy cache
-	unset($GLOBALS['sql_link_res']);
+	// Return the resource
+	return $linkResource;
 }
 
 // SQL select database
@@ -229,7 +232,7 @@ function SQL_SELECT_DB ($dbName, $F, $L) {
 	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());
+	return mysql_select_db($dbName, SQL_GET_LINK()) or SQL_ERROR($F, $L,  mysql_error());
 }
 
 // SQL close link
@@ -240,37 +243,36 @@ function SQL_CLOSE ($F, $L) {
 	} // END - if
 
 	// Close database link and forget the link
-	$close = mysql_close(SQL_GET_LINK())
-		or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):'.mysql_error());
+	$close = mysql_close(SQL_GET_LINK()) or SQL_ERROR($F, $L, mysql_error());
 
 	// Close link
-	SQL_SET_LINK(null);
-
-	// Destroy cache
-	unset($GLOBALS['sql_link_res']);
+	SQL_SET_LINK(NULL);
 
 	// Return the result
 	return $close;
 }
 
 // SQL free result
-function SQL_FREERESULT ($result) {
-	if ((!is_resource($result)) || (!SQL_IS_LINK_UP())) {
+function SQL_FREERESULT ($resource) {
+	if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) {
 		// Abort here
 		return false;
 	} // END - if
 
-	$res = mysql_free_result($result);
+	// Free result
+	$res = mysql_free_result($resource);
+
+	// And return that result of freeing it...
 	return $res;
 }
 
 // SQL string escaping
-function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure=true) {
+function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = true, $strip = true, $secure = true) {
 	// Link is there?
 	if ((!SQL_IS_LINK_UP()) || (!is_array($data))) return false;
 
 	// Escape all data
-	$dataSecured['__sql_string'] = $qstring;
+	$dataSecured['__sql_string'] = $sqlString;
 	foreach ($data as $key => $value) {
 		$dataSecured[$key] = SQL_ESCAPE($value, $secure, $strip);
 	} // END - foreach
@@ -278,12 +280,6 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure
 	// Generate query
 	$query = call_user_func_array('sprintf', $dataSecured);
 
-	// Debugging
-	//
-	//* 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 === true) {
 		// Run SQL query (default)
 		return SQL_QUERY($query, $F, $L);
@@ -300,9 +296,12 @@ function SQL_INSERTID () {
 }
 
 // Escape a string for the database
-function SQL_ESCAPE ($str, $secureString=true, $strip=true) {
+function SQL_ESCAPE ($str, $secureString = true, $strip = true) {
 	// Do we have cache?
 	if (!isset($GLOBALS['sql_escapes'][''.$str.''])) {
+		// Prepare the string here
+		$str = SQL_PREPARE_SQL_STRING($str);
+
 		// Secure string first? (which is the default behaviour!)
 		if ($secureString === true) {
 			// Then do it here
@@ -314,7 +313,6 @@ function SQL_ESCAPE ($str, $secureString=true, $strip=true) {
 			$ret = escapeQuotes($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
@@ -337,7 +335,7 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 	// Is columns an array?
 	if (!is_array($columns)) {
 		// No array
-		debug_report_bug(sprintf("columns is not an array. %s != array, file=%s, line=%s",
+		reportBug(__FUNCTION__, __LINE__, sprintf("columns is not an array. %s != array, file=%s, line=%s",
 			gettype($columns),
 			basename($F),
 			$L
@@ -347,8 +345,20 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 		return false;
 	} // END  - if
 
-	// Prepare the SQL statement
-	$sql = "SELECT `".implode("`,`", $columns)."` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1";
+	// Is this is a simple array?
+	if ((is_array($columns[0])) && (isset($columns[0]['column']))) {
+		// Begin with SQL query
+		$sql = 'SELECT ';
+
+		// No, it comes from XML, so get it back from it
+		$sql .= getSqlPartFromXmlArray($columns);
+
+		// Finalize it
+		$sql .= " FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1";
+	} else {
+		// Yes, prepare the SQL statement
+		$sql = 'SELECT `' . implode('`,`', $columns) . "` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1";
+	}
 
 	// Return the result
 	return SQL_QUERY_ESC($sql,
@@ -361,7 +371,7 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 }
 
 // ALTER TABLE wrapper function
-function SQL_ALTER_TABLE ($sql, $F, $L) {
+function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
 	// Abort if link is down
 	if (!SQL_IS_LINK_UP()) return false;
 
@@ -369,115 +379,101 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
 	$result = false;
 
 	// Determine index/fulltext/unique word
-	$noIndex = (
-	(
-		strpos($sql, 'INDEX') === false
-	) && (
-		strpos($sql, 'KEY') === false
-	) && (
-		strpos($sql, 'FULLTEXT') === false
-	) && (
-		strpos($sql, 'UNIQUE') === false
-	)
+	$isAlterIndex = (
+		(
+			isInString('INDEX', $sql)
+		) || (
+			isInString('KEY', $sql)
+		) || (
+			isInString('FULLTEXT', $sql)
+		) || (
+			isInString('UNIQUE', $sql)
+		)
 	);
 
 	// Extract table name
 	$tableArray = explode(' ', $sql);
 	$tableName = str_replace('`', '', $tableArray[2]);
 
+	// Debug log
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ',tableName=' . $tableName . ',tableArray=<pre>' . print_r($tableArray, true) . '</pre>,isAlterIndex=' . intval($isAlterIndex));
+
 	// Shall we add/drop?
-	if (((strpos($sql, 'ADD') !== false) || (strpos($sql, 'DROP') !== false)) && ($noIndex === true)) {
+	if (((isInString('ADD', $sql)) || (isInString('DROP', $sql)) || (isInString('CHANGE', $sql))) && ($isAlterIndex === false)) {
 		// Try two columns, one should fix
 		foreach (array(4,5) as $idx) {
+			// If an entry is not set, abort here
+			if (!isset($tableArray[$idx])) {
+				// Debug log this
+				logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',idx=' . $idx . ',sql=' . $sql . ' is missing!');
+				break;
+			} // END - if
+
 			// And column name as well
-			$columnName = str_replace('`', '', $tableArray[$idx]);
+			$columnName = $tableArray[$idx];
 
-			// Get column information
-			$result = SQL_QUERY_ESC("SHOW COLUMNS FROM `%s` LIKE '%s'",
-				array($tableName, $columnName), __FILE__, __LINE__);
+			// Debug log
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',idx=' . $idx . ',sql=' . $sql . ',hasZeroNums=' . intval(isSqlTableColumnFound($tableName, $columnName)));
 
-			// 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 we have no entry on ADD or an entry on DROP/CHANGE?
+			if (((!isSqlTableColumnFound($tableName, $columnName)) && (isInString('ADD', $sql))) || ((isSqlTableColumnFound($tableName, $columnName)) && ((isInString('DROP', $sql)) || ((isInString('CHANGE', $sql)) && ($idx == 4) && ((!isSqlTableColumnFound($tableName, $tableArray[5])) || ($columnName == $tableArray[5])))))) {
 				// 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 ((((isSqlTableColumnFound($tableName, $columnName)) && (isInString('ADD', $sql))) || ((!isSqlTableColumnFound($tableName, $columnName)) && ((isInString('DROP', $sql))) || (isInString('CHANGE', $sql)))) && ($columnName != 'KEY')) {
 				// Abort here because it is alreay there
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $sql);
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: sql=' . $sql . ',columnName=' . $columnName . ',idx=' . $idx);
+				break;
+			} elseif ((!isSqlTableColumnFound($tableName, $columnName)) && (isInString('DROP', $sql))) {
+				// Abort here because we tried to drop a column which is not there (never created maybe)
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No drop: ' . $sql);
 				break;
 			} elseif ($columnName != 'KEY') {
-				// Something didn't fit
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Possible problem: ' . $sql);
+				// Something didn't fit, we better log it
+				logDebugMessage(__FUNCTION__, __LINE__, 'Possible problem: ' . $sql . ',hasZeroNums=' . intval(isSqlTableColumnFound($tableName, $columnName)) . '');
 			}
 		} // 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
-		//* DEBUG: */ print __LINE__.':tableArray=<pre>' . print_r($tableArray, true) . '</pre>';
+	} elseif ((getTableType() == 'InnoDB') && (isInString('FULLTEXT', $sql))) {
+		// Skip this query silently because InnoDB does not understand fulltext indexes
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,tableName=%s,hasZeroNums=%d,file=%s,line=%s", $sql, $tableName, intval((is_bool($result)) ? 0 : isSqlTableColumnFound($columnName)), $F, $L));
+	} elseif ($isAlterIndex === true) {
+		// And column name as well without backticks
 		$keyName = str_replace('`', '', $tableArray[5]);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . ',tableArray=<pre>' . print_r($tableArray, true) . '</pre>');
 
 		// Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above
-		if (in_array(strtoupper($keyName), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) {
+		if (in_array(strtoupper($tableArray[4]), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) {
 			// Init loop
-			$begin = 1; $keyName = ',';
-			while (strpos($keyName, ',') !== false) {
+			$begin = 1;
+			$keyName = ',';
+			while (isInString(',', $keyName)) {
 				// Use last
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - BEFORE');
 				$keyName = str_replace('`', '', $tableArray[count($tableArray) - $begin]);
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $keyName . '----------------' . $begin);
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - BETWEEN');
 
 				// Remove brackes
-				$keyName = str_replace('(', '', str_replace(')', '', $keyName));
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $keyName . '----------------' . $begin);
+				$keyName = str_replace(array('(', ')'), array('', ''), $keyName);
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - AFTER');
 
 				// Continue
 				$begin++;
 			} // END while
 		} // END - if
 
-		// Show indexes
-		$result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FILE__, __LINE__);
-
-		// 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);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ', tableArray[3]=' . $tableArray[3] . ',keyName=' . $keyName);
+		if (($tableArray[3] == 'ADD') && (!isSqlTableIndexFound($tableName, $keyName))) {
+			// Send it to the SQL_QUERY() function to add it
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - ADDING!');
+			$result = SQL_QUERY($sql, $F, $L, $enableCodes);
+		} elseif (($tableArray[3] == 'DROP') && (isSqlTableIndexFound($tableName, $keyName))) {
+			// Send it to the SQL_QUERY() function to drop it
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - DROPPING!');
+			$result = SQL_QUERY($sql, $F, $L, $enableCodes);
 		} else {
 			// Not executed
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not executed: ' . $sql);
@@ -485,7 +481,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
 	} else {
 		// Other ALTER TABLE query
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
-		$result = SQL_QUERY($sql, $F, $L, false);
+		$result = SQL_QUERY($sql, $F, $L, $enableCodes);
 	}
 
 	// Return result
@@ -495,7 +491,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
 // Getter for SQL link
 function SQL_GET_LINK () {
 	// Init link
-	$link = null;
+	$link = NULL;
 
 	// Is it in the globals?
 	if (isset($GLOBALS['sql_link'])) {
@@ -510,34 +506,198 @@ function SQL_GET_LINK () {
 // Setter for link
 function SQL_SET_LINK ($link) {
 	// Is this a resource or null?
-	if ((!is_resource($link)) && (!is_null($link))) {
+	if ((ifFatalErrorsDetected()) && (isInstallationPhase())) {
+		// This may happen in installation phase
+		return;
+	} elseif ((!is_resource($link)) && (!is_null($link))) {
 		// This should never happen!
-		debug_report_bug(sprintf("link is not resource or null. Type: %s", gettype($link)));
+		reportBug(__FUNCTION__, __LINE__, sprintf("Type of link is not resource or null, type=%s", gettype($link)));
 	} // END - if
 
 	// Set it
 	$GLOBALS['sql_link'] = $link;
+
+	// Re-init cache
+	$GLOBALS['is_sql_link_up'] = is_resource($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'];
+	if (!isset($GLOBALS['is_sql_link_up'])) {
+		// Determine it
+		$GLOBALS['is_sql_link_up'] = is_resource(SQL_GET_LINK());
+	} // END - if
+
+	// Return the result
+	return $GLOBALS['is_sql_link_up'];
+}
+
+// Wrapper function to make code more readable
+function SQL_HASZERONUMS ($result) {
+	// Just pass it through
+	return (SQL_NUMROWS($result) === 0);
+}
+
+// Wrapper function to make code more readable
+function SQL_HASZEROAFFECTED () {
+	// Just pass it through
+	return (SQL_AFFECTEDROWS() === 0);
+}
+
+// Private function to prepare the SQL query string
+function SQL_PREPARE_SQL_STRING ($sqlString, $enableCodes = true) {
+	// Is it already cached?
+	if (!isset($GLOBALS['sql_strings'][$sqlString])) {
+		// Compile URI codes+config+expression code
+		$sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG(compileUriCode($sqlString)));
+
+		// Do final compilation
+		$GLOBALS['sql_strings'][$sqlString] = doFinalCompilation($sqlString2, false, $enableCodes);
+	} // END - if
+
+	// Return it
+	return $GLOBALS['sql_strings'][$sqlString];
+}
+
+// Creates a MySQL TIMESTAMP compatible string from given Uni* timestamp
+function SQL_EPOCHE_TO_TIMESTAMP ($timestamp) {
+	return generateDateTime($timestamp, 7);
+}
+
+// Log SQL errors to debug.log in installation phase or call reportBug()
+function SQL_ERROR ($file, $line, $message) {
+	// Remember plain error in last_sql_error
+	$GLOBALS['last_sql_error'] = mysql_error();
+
+	// Do we have installation phase?
+	if (isInstallationPhase()) {
+		/*
+		 * In installation phase, we don't want SQL errors abort e.g. connection
+		 * tests, so just log it away.
+		 */
+		logDebugMessage($file, $line, $message);
 	} else {
-		// Get it
-		$linkUp = is_resource(SQL_GET_LINK());
+		// Regular mode, then call reportBug()
+		reportBug($file, $line, $message);
+	}
+}
 
-		// And cache it
-		$GLOBALS['sql_link_res'] = $linkUp;
+// Check if there is a SQL table created
+function ifSqlTableExists ($tableName) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ' - ENTERED!');
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][$tableName])) {
+		// Check if the table is there
+		$result = SQL_QUERY_ESC("SHOW TABLES FROM `{?__DB_NAME?}` WHERE `Tables_in_{?__DB_NAME?}`='{?_MYSQL_PREFIX?}_%s'",
+			array($tableName), __FILE__, __LINE__);
+
+		// Is there an entry?
+		$GLOBALS[__FUNCTION__][$tableName] = (SQL_NUMROWS($result) == 1);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',numRows=' . intval($GLOBALS[__FUNCTION__][$tableName]));
+	} // END - if
+
+	// Return cache
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName]) . ' - EXIT!');
+	return $GLOBALS[__FUNCTION__][$tableName];
+}
+
+// Is a table column there?
+function isSqlTableColumnFound ($tableName, $columnName) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ' - ENTERED!');
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][$tableName][$columnName])) {
+		// And column name as well
+		$columnName = str_replace('`', '', $columnName);
+
+		// Get column information
+		$result = SQL_QUERY_ESC("SHOW COLUMNS FROM `%s` LIKE '%s'",
+			array($tableName, $columnName), __FUNCTION__, __LINE__);
+
+		// Determine it
+		$GLOBALS[__FUNCTION__][$tableName][$columnName] = (!SQL_HASZERONUMS($result));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ',hasZeroNums=' . intval(SQL_HASZERONUMS($result)) . ',numRows=' . intval($GLOBALS[__FUNCTION__][$tableName][$columnName]));
+
+		// Free result
+		SQL_FREERESULT($result);
+	} // END - if
+
+	// Return cache
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName][$columnName]) . ' - EXIT!');
+	return $GLOBALS[__FUNCTION__][$tableName][$columnName];
+}
+
+// Checks depending on the mode if the index is there
+function isSqlTableIndexFound ($tableName, $keyName) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $keyName . ' - ENTERED!');
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][$tableName][$keyName])) {
+		// Show indexes
+		$result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__);
+
+		// The column is not found by default
+		$GLOBALS[__FUNCTION__][$tableName][$keyName] = false;
+
+		// Walk through all
+		while ($content = SQL_FETCHARRAY($result)) {
+			// Add all entries for better caching behavior
+			$GLOBALS[__FUNCTION__][$tableName][$content['Key_name']] = true;
+		} // END - while
+
+		// Free result
+		SQL_FREERESULT($result);
+	} else {
+		// Cache used
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $keyName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName][$keyName]) . ' - CACHE!');
+	} // END - if
+
+	// Return cache
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $keyName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName][$keyName]) . ' - EXIT!');
+	return $GLOBALS[__FUNCTION__][$tableName][$keyName];
+}
+
+// Init database layer
+function initDatabaseLayer () {
+	// Set all required variables:
+	$GLOBALS['last_sql_error'] = '';
+}
+
+// Get last SQL error
+function getLastSqlError () {
+	return $GLOBALS['last_sql_error'];
+}
+
+// Gets an array (or false if none is found) from all supported engines
+function getArrayFromSupportedSqlEngines ($support = 'YES') {
+	// Init array
+	$engines = array();
+
+	// This also worked, now we need to check if the selected database type is supported
+	$result = SQL_QUERY('SHOW ENGINES', __FUNCTION__, __LINE__);
+
+	// Do we have entries? (Bad if not)
+	if (SQL_NUMROWS($result) > 0) {
+		// Load all and check for active entries
+		while ($content = SQL_FETCHARRAY($result)) {
+			// Is this supported?
+			if (($support == 'ALL') || ($content['Support'] == $support)) {
+				// Add it
+				array_push($engines, $content);
+			} elseif (isDebugModeEnabled()) {
+				// Log it away in debug mode
+				logDebugMessage(__FUNCTION__, __LINE__, 'Engine ' . $content['Engine'] . ' is not supported (' . $content['Supported'] . ')');
+			}
+		} // END - if
+	} else {
+		// No engines! :(
+		$engines = false;
 	}
 
-	// Return the result
-	return $linkUp;
+	// Free result
+	SQL_FREERESULT($result);
+
+	// Return result
+	return $engines;
 }
 
 // [EOF]