X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=2d25cdea884311a5e9502aeec0868c1380437160;hb=56931cd9321119dd37372bd16d6c552857e40066;hp=cb1d236f3d401e4caf6dd226acb54ac7ce33efc4;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df;p=mailer.git
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index cb1d236f3d..2d25cdea88 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -1,23 +1,22 @@
');
- $result = mysql_query($sqlString, SQL_GET_LINK())
- or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error() . '
-Query string:
-' . $sqlString);
- //* DEBUG: */ outputHtml(__LINE__ . ': numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS() . "
");
-
- // Ending time
- $querytimeAfter = array_sum(explode(' ', microtime()));
+ //* 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 = $querytimeAfter - $querytimeBefore;
+ $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);
@@ -104,27 +110,25 @@ Query string:
incrementConfigEntry('sql_count');
// Debug output
- if ((getOutputMode() != 1) && (isDebugModeEnabled()) && (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', basename($F) . '|LINE=' . $L . '|NUM=' . (is_resource($result) ? SQL_NUMROWS($result) : 'false') . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . $queryTime . '): ' . str_replace("\r", '', str_replace("\n", ' ', $GLOBALS['last_sql'])));
} // END - if
// Count DB hits
- if (!isStatsEntrySet('db_hits_run')) {
+ if (!isStatsEntrySet('db_hits')) {
// Count in dummy variable
- setStatsEntry('db_hits_run', 1);
+ setStatsEntry('db_hits', 1);
} else {
// Count to config array
- incrementStatsEntry('db_hits_run');
+ incrementStatsEntry('db_hits');
}
// Return the result
@@ -132,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
@@ -165,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 debug_report_bug(__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
@@ -232,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 debug_report_bug(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error());
}
// SQL close link
@@ -243,91 +239,42 @@ 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 debug_report_bug(__FUNCTION__, __LINE__, $F . ' (' . $L . '):'.mysql_error());
// Close link
SQL_SET_LINK(null);
- // Destroy cache
- unset($GLOBALS['sql_link_res']);
-
- // Move stats
- incrementStatsEntry('db_hits', getStatsEntry('db_hits_run'));
-
// 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;
- /* Other way */
// 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
// Generate query
$query = call_user_func_array('sprintf', $dataSecured);
- /*
- /* Old eval() way... *
- // Init variable
- $query = 'failed';
-
- if ($strip === true) {
- $strip = 'true';
- } else {
- $strip = 'false';
- }
-
- if ($secure === true) {
- $secure = 'true';
- } else {
- $secure = 'false';
- }
-
- $eval = "\$query = sprintf(\"" . $qstring . "\"";
- foreach ($data as $var) {
- if ((!empty($var)) || ($var === 0)) {
- $eval .= ", SQL_ESCAPE('" . $var . "', " . $secure . ', ' . $strip . ')';
- } else {
- $eval .= ", ''";
- }
- } // END - foreach
- $eval .= ');';
- **/
-
- // 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);
-
- // Run the code
- /**
- eval($eval);
-
- // Was the eval() command fine?
- if ($query == 'failed') {
- // Something went wrong?
- debug_report_bug('eval=' . $eval);
- } // END - if
- **/
if ($run === true) {
// Run SQL query (default)
@@ -338,46 +285,42 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure
}
}
-// Get ID from last INSERT command
+// Get id from last INSERT command
function SQL_INSERTID () {
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) {
+function SQL_ESCAPE ($str, $secureString = true, $strip = true) {
// Do we have cache?
- if (isset($GLOBALS['sql_escapes'][$str])) {
- // Then use it instead
- return $GLOBALS['sql_escapes'][$str];
- } // END - if
-
- // Secure string first? (which is the default behaviour!)
- if ($secureString === true) {
- // Then do it here
- $str = secureString($str, $strip);
- } // END - if
+ 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
- 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: */ outputHtml(__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 (!SQL_IS_LINK_UP()) {
+ // Fall-back to escapeQuotes() when there is no link
+ $ret = escapeQuotes($str);
+ } elseif (function_exists('mysql_real_escape_string')) {
+ // The new and improved version
+ $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 escapeQuotes() again
+ $ret = escapeQuotes($str);
+ }
- // Cache result
- $GLOBALS['sql_escapes'][$str] = $ret;
+ // Cache result
+ $GLOBALS['sql_escapes'][''.$str.''] = $ret;
+ } // END - if
// Return it
- return $ret;
+ return $GLOBALS['sql_escapes'][''.$str.''];
}
// SELECT query string from table, columns and so on... ;-)
@@ -385,7 +328,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
@@ -396,7 +339,7 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
} // END - if
// Prepare the SQL statement
- $sql = "SELECT `".implode("`,`", $columns)."` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1";
+ $sql = "SELECT `".implode("`, `", $columns)."` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1";
// Return the result
return SQL_QUERY_ESC($sql,
@@ -409,7 +352,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;
@@ -420,6 +363,8 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
$noIndex = (
(
strpos($sql, 'INDEX') === false
+ ) && (
+ strpos($sql, 'KEY') === false
) && (
strpos($sql, 'FULLTEXT') === false
) && (
@@ -428,80 +373,98 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
);
// Extract table name
- $tableArray = explode(" ", $sql);
+ $tableArray = explode(' ', $sql);
$tableName = str_replace('`', '', $tableArray[2]);
+ // Debug log
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ',tableName=' . $tableName . ',tableArray=
' . print_r($tableArray, true) . ''); + // Shall we add/drop? - if (((strpos($sql, 'ADD') !== false) || (strpos($sql, 'DROP') !== false)) && ($noIndex === true)) { - // And column name as well - $columnName = str_replace('`', '', $tableArray[4]); + 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 - // 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: */ outputHtml(__LINE__.':'.$sql."
' . print_r($tableArray, true) . ''); // Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above - if (in_array(strtoupper($columnName), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) { + if (in_array(strtoupper($tableArray[4]), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) { // Init loop - $begin = 1; $columnName = ','; - while (strpos($columnName, ',') !== false) { + $begin = 1; + $keyName = ','; + while (strpos($keyName, ',') !== false) { // Use last - $columnName = str_replace('`', '', $tableArray[count($tableArray) - $begin]); - //* DEBUG: */ outputHtml(__LINE__.':'.$columnName."----------------".$begin."
".print_r($content, true).""); - if (($content['Column_name'] == $columnName) || ($content['Key_name'] == $columnName)) { - // Skip this query! - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skiped: %s", $sql)); - $skip = true; - break; - } // END - if - } // END - while - - // Free result - SQL_FREERESULT($result); - // Shall we run it? - if ($skip === false) { - // Send it to the SQL_QUERY() function - //* DEBUG: */ outputHtml(__LINE__.':'.$sql."