X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=30df3b4f1e953f797bfd46cfd90ffe42b32133ee;hp=e709c8a0d95d03dcc8c3a4584c58be7297c97a60;hb=4b7f401f2a4680ae46ca41c57f749cfe35163660;hpb=013448f0470ca36ab15b888928e2127e6da7d9b6
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index e709c8a0d9..30df3b4f1e 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -1,7 +1,7 @@
');
- $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: */ print('F=' . basename($F) . ',L=' . $L . 'sql=' . htmlentities($GLOBALS['last_sql']) . '
');
+ $result = mysql_query($GLOBALS['last_sql'], SQL_GET_LINK())
+ or debug_report_bug($F, $L, 'file='. $F . ',line=' . $L . ':mysql_error()=' . mysql_error() . "\n".
+'Query string:' . $GLOBALS['last_sql']);
+ /* DEBUG: */ logDebugMessage($F, $L, 'sql=' . $GLOBALS['last_sql'] . ',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);
+ 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 +101,27 @@ Query string:
incrementConfigEntry('sql_count');
// Debug output
- if ((getOutputMode() != '1') && (isDebugModeEnabled()) && (getConfig('DEBUG_SQL') == 'Y')) {
+ if ((getOutputMode() != 1) && (isDebugModeEnabled()) && (isSqlDebuggingEnabled())) {
//
// Debugging stuff...
//
- $fp = fopen(getConfig('CACHE_PATH') . 'mysql.log', 'a') or app_die(__FILE__, __LINE__, "Cannot write mysql.log!");
+ $fp = fopen(getConfig('CACHE_PATH') . 'mysql.log', 'a') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot write mysql.log!');
if (!isset($GLOBALS['sql_first_entry'])) {
// Write first entry
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", ' ', $sqlString)) . "\n");
+ fwrite($fp, $F . '(LINE=' . $L . '|NUM=' . SQL_NUMROWS($result) . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . $queryTime . '): ' . str_replace("\r", '', str_replace("\n", ' ', $GLOBALS['last_sql'])) . "\n");
fclose($fp);
} // 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 +129,20 @@ 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 (is_resource($resource)) {
// 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;
- } elseif (SQL_IS_LINK_UP()) {
- // No resource given, no lines found!
- $lines = 0;
+ $lines = mysql_num_rows($resource);
+ } 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,52 +162,41 @@ 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, $nr=0) {
// 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 and return the result
- $result = mysql_result($res, $row, $field);
+ // Run the result command
+ $result = mysql_result($resource, $row, $field);
+
+ // ... and return the result
return $result;
}
@@ -223,7 +209,7 @@ function SQL_CONNECT ($host, $login, $password, $F, $L) {
SQL_SET_LINK($connect);
// Destroy cache
- unset($GLOBALS['sql_link_res']);
+ unset($GLOBALS['is_sql_link_up']);
}
// SQL select database
@@ -250,85 +236,46 @@ function SQL_CLOSE ($F, $L) {
SQL_SET_LINK(null);
// Destroy cache
- unset($GLOBALS['sql_link_res']);
-
- // Move stats
- incrementStatsEntry('db_hits', getStatsEntry('db_hits_run'));
+ unset($GLOBALS['is_sql_link_up']);
// 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: */ $fp = fopen(getConfig('CACHE_PATH') . 'escape_debug.log', 'a') or debug_report_bug(__FUNCTION__, __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);
@@ -338,46 +285,43 @@ 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
+ //* 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;
+ // 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 +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
@@ -420,6 +364,8 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
$noIndex = (
(
strpos($sql, 'INDEX') === false
+ ) && (
+ strpos($sql, 'KEY') === false
) && (
strpos($sql, 'FULLTEXT') === false
) && (
@@ -428,44 +374,58 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
);
// Extract table name
- $tableArray = explode(" ", $sql);
+ $tableArray = explode(' ', $sql);
$tableName = str_replace('`', '', $tableArray[2]);
// 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]);
-
- // 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."
");
- $result = SQL_QUERY($sql, $F, $L, false);
- } // END - if
+ // 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), __FUNCTION__, __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($columnName), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) {
+ if (in_array(strtoupper($keyName), 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."
");
+ $keyName = str_replace('`', '', $tableArray[count($tableArray) - $begin]);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $keyName . '----------------' . $begin);
// Remove brackes
- $columnName = str_replace('(', '', str_replace(')', '', $columnName));
- //* DEBUG: */ outputHtml(__LINE__.':'.$columnName."----------------".$begin."
");
+ $keyName = str_replace('(', '', str_replace(')', '', $keyName));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $keyName . '----------------' . $begin);
// Continue
$begin++;
@@ -473,20 +433,33 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
} // END - if
// Show indexes
- $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`",
- array($tableName), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__);
- // Walk through all
+ // 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: */ outputHtml("".print_r($content, true)."
");
- if (($content['Column_name'] == $columnName) || ($content['Key_name'] == $columnName)) {
+ //* 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("Skiped: %s", $sql));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ADD: Skiped: %s", $sql));
$skip = true;
break;
- } // END - if
+ } 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
@@ -495,12 +468,15 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
// Shall we run it?
if ($skip === false) {
// Send it to the SQL_QUERY() function
- //* DEBUG: */ outputHtml(__LINE__.':'.$sql."
");
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
$result = SQL_QUERY($sql, $F, $L, false);
- } // END - if
+ } else {
+ // Not executed
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not executed: ' . $sql);
+ }
} else {
// Other ALTER TABLE query
- //* DEBUG: */ outputHtml(__LINE__.':'.$sql."
");
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
$result = SQL_QUERY($sql, $F, $L, false);
}
@@ -528,7 +504,7 @@ 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)));
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("link is not resource or null. Type: %s", gettype($link)));
} // END - if
// Set it
@@ -541,20 +517,41 @@ 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);
+}
+
+// Private function to prepare the SQL query string
+function SQL_PREPARE_SQL_STRING ($sqlString) {
+ // 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);
+ } // END - if
+
+ // Return it
+ return $GLOBALS['sql_strings'][$sqlString];
+}
+
// [EOF]
?>