X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=7a33983a1ec2d59cb71e9ae08a518dc84280d4c5;hp=ab53b7041b94b2a85a1aff213e561a91bb5aa69b;hb=3b200d3e04e9d99184a65a16c9cbe35e9123e0bf;hpb=b8c071f12a601619c4c02b9441b3e0e012db6ced
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index ab53b7041b..7a33983a1e 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -6,18 +6,17 @@
* -------------------------------------------------------------------- *
* 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 *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -42,61 +41,67 @@ 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!
+ debug_report_bug(__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
+ debug_report_bug(__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("\t", ' ', str_replace("\n", ' ', str_replace("\r", ' ', $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
- ));
-
- // This is invalid, of course
- return false;
- }
+ // Compile config entries out
+ $sqlStringModified = SQL_PREPARE_SQL_STRING($sqlStringModified, $enableCodes);
- // 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)));
+ // 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);
- // Replace {PER}
- $sqlString = str_replace('{PER}', '%', $sqlString);
+ // Use cache (to save a lot function calls
+ $GLOBALS['last_sql'] = $GLOBALS[__FUNCTION__][$sqlString];
- // Compile config entries out
- $eval = "\$sqlString = \"".FILTER_COMPILE_CONFIG(escapeQuotes($sqlString))."\";";
- eval($eval);
+ //* 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) . '
');
- $result = mysql_query($sqlString, SQL_GET_LINK())
- or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error() . '
-Query string:
-' . $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 debug_report_bug($F, $L, 'file='. basename($F) . ',line=' . $L . ':mysql_error()=' . mysql_error() . "\n".
+'Query string:' . $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);
@@ -105,18 +110,16 @@ Query string:
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 ((!isCssOutputMode()) && (isDebugModeEnabled()) && (isSqlDebuggingEnabled())) {
+ // 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', $F . '(LINE=' . $L . '|NUM=' . SQL_NUMROWS($result) . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . $queryTime . '): ' . str_replace("\r", '', str_replace("\n", ' ', $GLOBALS['last_sql'])));
} // END - if
// Count DB hits
@@ -133,20 +136,26 @@ Query string:
}
// 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'][$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
+ debug_report_bug(__FUNCTION__, __LINE__, 'No resource given! result[]=' . gettype($resource) . ',last_sql=' . $GLOBALS['last_sql']);
}
// Return lines
@@ -166,65 +175,51 @@ 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 addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error());
// Set the link resource
- SQL_SET_LINK($connect);
-
- // Destroy cache
- unset($GLOBALS['sql_link_res']);
+ SQL_SET_LINK($linkResource);
}
// SQL select database
@@ -233,7 +228,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 addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error());
}
// SQL close link
@@ -250,31 +245,31 @@ function SQL_CLOSE ($F, $L) {
// Close link
SQL_SET_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)) || (!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
@@ -282,12 +277,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);
@@ -304,7 +293,7 @@ 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.''])) {
// Secure string first? (which is the default behaviour!)
@@ -318,7 +307,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
@@ -341,7 +329,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",
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("columns is not an array. %s != array, file=%s, line=%s",
gettype($columns),
basename($F),
$L
@@ -365,7 +353,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;
@@ -389,41 +377,59 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
$tableArray = explode(' ', $sql);
$tableName = str_replace('`', '', $tableArray[2]);
+ // Debug log
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ',tableName=' . $tableName);
+
// Shall we add/drop?
- if (((strpos($sql, 'ADD') !== false) || (strpos($sql, 'DROP') !== false)) && ($noIndex === true)) {
+ if (((strpos($sql, 'ADD') !== false) || (strpos($sql, 'DROP') !== false) || (strpos($sql, 'CHANGE') !== false)) && ($noIndex === true)) {
// 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]);
// Get column information
$result = SQL_QUERY_ESC("SHOW COLUMNS FROM `%s` LIKE '%s'",
- array($tableName, $columnName), __FILE__, __LINE__);
+ array($tableName, $columnName), __FUNCTION__, __LINE__);
+
+ // Debug log
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',idx=' . $idx . ',sql=' . $sql . ',hasZeroNums=' . intval(SQL_HASZERONUMS($result)));
- // 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?
+ // 123 4 43 3 4 4 32 23 4 4 3 3 4 4 32 23 4 43 3 4 4 3 3 321
+ if (((SQL_HASZERONUMS($result)) && (strpos($sql, 'ADD') !== false)) || ((!SQL_HASZERONUMS($result)) && (strpos($sql, 'DROP') !== false)) || ((!SQL_HASZERONUMS($result)) && (strpos($sql, 'CHANGE') !== false) && ($idx == 4))) {
// 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')) {
+ // 1234 5 54 4 5 5 43 34 5 54 4 5 5 43 3 4 4 32 2 21
+ } elseif ((((!SQL_HASZERONUMS($result)) && (strpos($sql, 'ADD') !== false)) || ((!SQL_HASZERONUMS($result)) && (strpos($sql, 'DROP') !== false)) || (strpos($sql, 'CHANGE') !== false)) && ($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 ((SQL_HASZERONUMS($result)) && (strpos($sql, 'DROP') !== false)) {
+ // 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(SQL_HASZERONUMS($result)) . '');
}
} // END - foreach
- } elseif ((getConfig('_TABLE_TYPE') == 'InnoDB') && (strpos($sql, 'FULLTEXT') !== false)) {
+ } elseif ((getTableType() == '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));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,tableName=%s,hasZeroNums=%d,file=%s,line=%s", $sql, $tableName, intval((is_bool($result)) ? 0 : SQL_HASZERONUMS($result)), $F, $L));
} elseif ($noIndex === false) {
// And column name as well
- //* DEBUG: */ print __LINE__.':tableArray=' . print_r($tableArray, true) . '
';
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableArray=' . print_r($tableArray, true) . '
');
$keyName = str_replace('`', '', $tableArray[5]);
// Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above
@@ -444,44 +450,11 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
} // 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=' . print_r($content, true) . '
');
- 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) {
+ if (!isSqlTableIndexAdded($tableName, $tableArray[3])) {
// Send it to the SQL_QUERY() function
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
- $result = SQL_QUERY($sql, $F, $L, false);
+ $result = SQL_QUERY($sql, $F, $L, $enableCodes);
} else {
// Not executed
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not executed: ' . $sql);
@@ -489,7 +462,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
@@ -514,13 +487,19 @@ 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)));
+ debug_report_bug(__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
@@ -529,20 +508,106 @@ 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);
+}
+
+// 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 config+expression code
+ $sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG($sqlString));
+
+ // Do final compilation
+ $GLOBALS['sql_strings'][$sqlString] = doFinalCompilation($sqlString2, false, $enableCodes);
+ //die($sqlString.'
'.$sqlString2.'
'.$GLOBALS['sql_strings'][$sqlString]);
+ } // END - if
+
+ // Return it
+ return $GLOBALS['sql_strings'][$sqlString];
+}
+
+// Check if there is a SQL table created
+function isSqlTableCreated ($table) {
+ // Do we have cache?
+ if (!isset($GLOBALS[__FUNCTION__][$table])) {
+ // Check if the table is there
+ $result = SQL_QUERY_ESC("SHOW TABLES FROM `{?__DB_NAME?}` WHERE `Tables_in_{?__DB_NAME?}`='{?_MYSQL_PREFIX?}_%s'",
+ array($table), __FILE__, __LINE__);
+
+ // Is there an entry?
+ $GLOBALS[__FUNCTION__][$table] = (SQL_NUMROWS($result) == 1);
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__][$table];
+}
+
+// Checks depending on the mode if the table is there
+function isSqlTableIndexAdded ($tableName, $mode) {
+ // Do we have cache?
+ if (!isset($GLOBALS[__FUNCTION__][$tableName][$mode])) {
+ // Show indexes
+ $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__);
+
+ // Non-skipping is default for ADD
+ $GLOBALS[__FUNCTION__][$tableName][$mode] = false;
+
+ // But should we DROP?
+ if ($mode == 'DROP') {
+ // Then skip if nothing found
+ $GLOBALS[__FUNCTION__][$tableName][$mode] = true;
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Going to drop key ' . $keyName);
+ } // END - if
+
+ // Walk through all
+ while ($content = SQL_FETCHARRAY($result)) {
+ // Is it found?
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName='.$keyName.',content=' . print_r($content, true) . '
');
+ if (($content['Key_name'] == $keyName) && ($mode == 'ADD')) {
+ // Skip this query!
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ADD: Skiped: %s", $sql));
+ $GLOBALS[__FUNCTION__][$tableName][$mode] = true;
+ break;
+ } elseif (($content['Key_name'] == $keyName) && ($mode == 'DROP')) {
+ // Don't skip this!
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("DROP: Not skiped: %s", $sql));
+ $GLOBALS[__FUNCTION__][$tableName][$mode] = false;
+ break;
+ }
+ } // END - while
+
+ // Free result
+ SQL_FREERESULT($result);
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__][$tableName][$mode];
+}
+
// [EOF]
?>