X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=02e1722fe25d3d1b08db80b59f99d2429e2c38b6;hp=2e8799d9c60dde95b38409806475de94bb47108e;hb=4b32c7be676d4a191c869a5745f2890240852fb0;hpb=5f5a73c72457ea761906640dc3d29749301102f9
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 2e8799d9c6..02e1722fe2 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -1,7 +1,7 @@
\n";
- $result = mysql_query($sql_string, SQL_GET_LINK())
- or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error()."
-Query string:
-".$sql_string);
-
- // Ending time
- $querytimeAfter = array_sum(explode(' ', microtime()));
+ //* DEBUG: */ print('F=' . basename($F) . ',L=' . $L . 'sql=' . htmlentities($sqlString) . '
');
+ $result = mysql_query($sqlString, SQL_GET_LINK())
+ or debug_report_bug('[' . __FUNCTION__ . ':' . __LINE__ . '] ' . $F . ' (' . $L . '):' . mysql_error() . "\n".
+'Query string:' . $sqlString);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sqlString . ',numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS());
// Calculate query time
- $queryTime = $querytimeAfter - $querytimeBefore;
+ $queryTime = microtime(true) - $querytimeBefore;
+
+ // Add this query to array including timing
+ addSqlToDebug($result, $sqlString, $queryTime, $F, $L);
// Save last successfull query
- setConfigEntry('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=".$sql_string."
, affected=".SQL_AFFECTEDROWS().", numrows=".SQL_NUMROWS($result)."
\n";
-
- if (($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1") && (isDebugModeEnabled()) && (isBooleanConstantAndTrue('DEBUG_SQL'))) {
+ if ((getOutputMode() != 1) && (isDebugModeEnabled()) && (isSqlDebuggingEnabled())) {
//
// Debugging stuff...
//
- $fp = fopen(constant('PATH')."inc/cache/mysql.log", 'a') or mxchange_die("Cannot write mysql.log!");
+ $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");
+ 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 (!isConfigEntrySet('db_hits_run')) {
+ if (!isStatsEntrySet('db_hits')) {
// Count in dummy variable
- setConfigEntry('db_hits_run', 1);
+ setStatsEntry('db_hits', 1);
} else {
// Count to config array
- incrementConfigEntry('db_hits_run');
+ incrementStatsEntry('db_hits');
}
// Return the result
@@ -102,17 +134,25 @@ Query string:
// SQL num rows
function SQL_NUMROWS ($result) {
+ // Valid link resource?
+ if (!SQL_IS_LINK_UP()) return false;
+
+ // Link is not up, no rows by default
+ $lines = false;
+
// Is the result a valid resource?
if (is_resource($result)) {
// Get the count of rows from database
$lines = mysql_num_rows($result);
// Is the result empty? Then we have an error!
- if (empty($lines)) $lines = 0;
+ if (empty($lines)) $lines = '0';
} else {
- // No resource given, no lines found!
- $lines = 0;
+ // No resource given, please fix this
+ trigger_error('No resource given! result[]=' . gettype($result));
}
+
+ // Return lines
return $lines;
}
@@ -129,21 +169,18 @@ function SQL_AFFECTEDROWS() {
}
// 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();
@@ -155,9 +192,9 @@ 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++) {
+ for ($idx = '0'; $idx < ($max / 2); $idx++) {
// Remove entry
unset($row[$idx]);
} // END - for
@@ -166,13 +203,17 @@ function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
// 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) {
+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;
}
@@ -184,6 +225,9 @@ function SQL_CONNECT ($host, $login, $password, $F, $L) {
// Set the link resource
SQL_SET_LINK($connect);
+
+ // Destroy cache
+ unset($GLOBALS['is_sql_link_up']);
}
// SQL select database
@@ -202,29 +246,23 @@ function SQL_CLOSE ($F, $L) {
return false;
} // END - if
- // Do we need to update cache/db counter?
- //* DEBUG: */ echo "DB=".getConfig('db_hits').",CACHE=".getConfig('cache_hits')."
\n";
- if ((GET_EXT_VERSION("cache") >= "0.0.7") && (getConfig('db_hits') > 0) && (getConfig('cache_hits') > 0) && (is_object($GLOBALS['cache_instance']))) {
- // Add new hits
- incrementConfigEntry('db_hits', getConfig('db_hits_run'));
-
- // Update counter for db/cache
- UPDATE_CONFIG(array("db_hits", "cache_hits"), array(bigintval(getConfig('db_hits')), bigintval(getConfig('cache_hits'))));
- } // 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 addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):'.mysql_error());
// Close link
SQL_SET_LINK(null);
+ // Destroy cache
+ unset($GLOBALS['is_sql_link_up']);
+
// 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
@@ -234,44 +272,25 @@ function SQL_FREERESULT ($result) {
}
// SQL string escaping
-function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true) {
+function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure=true) {
// Link is there?
- if (!SQL_IS_LINK_UP()) 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 .= ", ''";
- }
- } // END - foreach
- $eval .= ");";
- //
// Debugging
//
- //* DEBUG: */ $fp = fopen(constant('PATH')."inc/cache/escape_debug.log", 'a') or mxchange_die("Cannot write debug.log!");
- //* DEBUG: */ fwrite($fp, $F."(".$L."): ".str_replace("\r", "", str_replace("\n", " ", $eval))."\n");
+ //* 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)
return SQL_QUERY($query, $F, $L);
@@ -281,7 +300,7 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true) {
}
}
-// 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();
@@ -289,26 +308,35 @@ function SQL_INSERTID () {
// Escape a string for the database
function SQL_ESCAPE ($str, $secureString=true, $strip=true) {
- // Secure string first? (which is the default behaviour!)
- if ($secureString) {
- // Then do it here
- $str = secureString($str, $strip);
+ // 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
+
+ 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
+ //* 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 escapeQuotes() again
+ $ret = escapeQuotes($str);
+ }
+
+ // Cache result
+ $GLOBALS['sql_escapes'][''.$str.''] = $ret;
} // END - if
- if (!SQL_IS_LINK_UP()) {
- // Fall-back to smartAddSlashes() when there is no link
- return smartAddSlashes($str);
- } elseif (function_exists('mysql_real_escape_string')) {
- // The new and improved version
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."):str={$str}
\n";
- return mysql_real_escape_string($str, SQL_GET_LINK());
- } elseif (function_exists('mysql_escape_string')) {
- // The obsolete function
- return mysql_escape_string($str, SQL_GET_LINK());
- } else {
- // If nothing else works, fall back to smartAddSlashes()
- return smartAddSlashes($str);
- }
+ // Return it
+ return $GLOBALS['sql_escapes'][''.$str.''];
}
// SELECT query string from table, columns and so on... ;-)
@@ -316,51 +344,154 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
// Is columns an array?
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,
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
- // 12 3 3 2 2 3 3 2 2 3 3 21
- $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_HASZERONUMS($result)) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 1) && (strpos($sql, 'DROP') !== false))) {
+ // Do the query
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Executing: ' . $sql);
+ $result = SQL_QUERY($sql, $F, $L, false);
+
+ // Skip further attempt(s)
+ break;
+ } elseif ((((SQL_NUMROWS($result) == 1) && (strpos($sql, 'ADD') !== false)) || ((SQL_HASZERONUMS($result)) && (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=' . print_r($tableArray, true) . '
';
+ $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?
- // 123 4 4 3 3 4 4 32 23 4 4 3 3 4 4 321
- 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=' . 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) {
+ // 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);
}
@@ -388,7 +519,7 @@ function SQL_SET_LINK ($link) {
// Is this a resource or null?
if ((!is_resource($link)) && (!is_null($link))) {
// This should never happen!
- trigger_error(sprintf("link is not resource or null. Type: %s", gettype($link)));
+ debug_report_bug(sprintf("link is not resource or null. Type: %s", gettype($link)));
} // END - if
// Set it
@@ -397,12 +528,30 @@ function SQL_SET_LINK ($link) {
// Checks if the link is up
function SQL_IS_LINK_UP () {
- // Get the link
- $link = SQL_GET_LINK();
+ // Default is not up
+ $linkUp = false;
+
+ // Do we have cached this?
+ if (isset($GLOBALS['is_sql_link_up'])) {
+ // Then use this
+ $linkUp = $GLOBALS['is_sql_link_up'];
+ } else {
+ // Get it
+ $linkUp = is_resource(SQL_GET_LINK());
+
+ // And cache it
+ $GLOBALS['is_sql_link_up'] = $linkUp;
+ }
// Return the result
- return (is_resource($link));
+ return $linkUp;
+}
+
+// Wrapper function to make code more readable
+function SQL_HASZERONUMS ($result) {
+ // Just pass it through
+ return (SQL_NUMROWS($result) === 0);
}
-//
+// [EOF]
?>