X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=024908a9dfd667b11b173194445d1ee11bbca816;hb=ee0625c4882bb462985c504abf65a3ef0e7bf1eb;hp=a9485c6070aa87e2cdd87b2fbe4e205def5326bb;hpb=95b85ceebca7c97bdd966b1cc94234adfd1abd52;p=mailer.git
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index a9485c6070..024908a9df 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Datenbankschicht fuer MySQL +3.x 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 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -48,6 +53,9 @@ function SQL_QUERY ($sql_string, $F, $L) {
// Replace {!_MYSQL_PREFIX!} with constant, closes #84. Thanks to profi-concept
$sql_string = str_replace("{!_MYSQL_PREFIX!}", constant('_MYSQL_PREFIX'), $sql_string);
+ // Replace {!_TABLE_TYPE!} with constant
+ $sql_string = str_replace("{!_TABLE_TYPE!}", constant('_TABLE_TYPE'), $sql_string);
+
// Starting time
$querytimeBefore = array_sum(explode(' ', microtime()));
@@ -72,12 +80,11 @@ Query string:
// Debug output
//* DEBUG: */ print "Query=".$sql_string."
, affected=".SQL_AFFECTEDROWS().", numrows=".SQL_NUMROWS($result)."
\n";
-
- if (($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1") && (isBooleanConstantAndTrue('DEBUG_MODE')) && (isBooleanConstantAndTrue('DEBUG_SQL'))) {
+ if (($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1") && (isDebugModeEnabled()) && (isBooleanConstantAndTrue('DEBUG_SQL'))) {
//
// Debugging stuff...
//
- $fp = fopen(constant('PATH')."inc/cache/mysql.log", 'a') or mxchange_die("Cannot write mysql.log!");
+ $fp = fopen(constant('PATH')."inc/cache/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");
@@ -129,15 +136,12 @@ 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;
- $DATA = mysql_fetch_row($result);
- return $DATA;
+ // Fetch the data and return it
+ return mysql_fetch_row($result);
}
// SQL fetch array
@@ -172,7 +176,11 @@ function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
}
// SQL result
-function SQL_RESULT ($res, $row, $field) {
+function SQL_RESULT ($res, $row, $field = 0) {
+ // Is $res valid?
+ if (!is_resource($res)) return false;
+
+ // Run the result command and return the result
$result = mysql_result($res, $row, $field);
return $result;
}
@@ -204,12 +212,12 @@ function SQL_CLOSE ($F, $L) {
// 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']))) {
+ if ((GET_EXT_VERSION("cache") >= "0.0.7") && (getConfig('db_hits') > 0) && (getConfig('cache_hits') > 0) && (isCacheInstanceValid())) {
// 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'))));
+ UPDATE_CONFIG(array("db_hits", "cache_hits"), array(getConfig(('db_hits')), getConfig(('cache_hits'))));
} // END - if
// Close database link and forget the link
@@ -241,7 +249,7 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true) {
// Init variable
$query = "failed";
- if ($strip) {
+ if ($strip === true) {
$strip = "true";
} else {
$strip = "false";
@@ -259,7 +267,7 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true) {
//
// Debugging
//
- //* DEBUG: */ $fp = fopen(constant('PATH')."inc/cache/escape_debug.log", 'a') or mxchange_die("Cannot write debug.log!");
+ //* DEBUG: */ $fp = fopen(constant('PATH')."inc/cache/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);
@@ -320,7 +328,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' LIMIT 1";
+ $sql = "SELECT `".implode("`,`", $columns)."` FROM `{!_MYSQL_PREFIX!}_%s` WHERE ``='%s' LIMIT 1";
// Return the result
return SQL_QUERY_ESC($sql,
@@ -337,30 +345,83 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
$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));
+ // 12 3 3 2 2 3 3 2 2 3 3 21
+ $noIndex = ((ereg("INDEX", $sql) == false) && (ereg("FULLTEXT", $sql) == false) && (ereg("UNIQUE", $sql) == false));
- // 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]);
+ // Extract table name
+ $tableArray = explode(" ", $sql);
+ $tableName = str_replace("`", "", $tableArray[2]);
+ // Shall we add/drop?
+ if (((ereg("ADD", $sql)) || (ereg("DROP", $sql))) && ($noIndex)) {
// 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), $F, $L);
+ 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) && (eregi("ADD", $sql) > 0)) || ((SQL_NUMROWS($result) == 1) && (eregi("DROP", $sql) > 0))) {
+ // 123 4 4 3 3 4 432 23 4 4 3 3 4 4321
+ if (((SQL_NUMROWS($result) == 0) && (ereg("ADD", $sql))) || ((SQL_NUMROWS($result) == 1) && (ereg("DROP", $sql)))) {
// Do the query
+ //* DEBUG: */ print __LINE__.":".$sql."
\n";
+ $result = SQL_QUERY($sql, $F, $L, false);
+ } // END - if
+ } elseif ((constant('_TABLE_TYPE') == "InnoDB") && (ereg("FULLTEXT", $sql))) {
+ // Skip this query silently
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,file=%s,line=%s", $sql, $F, $L));
+ } elseif (!$noIndex) {
+ // And column name as well
+ $columnName = str_replace("`", "", $tableArray[4]);
+
+ // Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above
+ if (in_array(strtoupper($columnName), array("INDEX", "UNIQUE", "KEY", "FULLTEXT"))) {
+ // Init loop
+ $begin = 1; $columnName = ",";
+ while (strpos($columnName, ",") !== false) {
+ // Use last
+ $columnName = str_replace("`", "", $tableArray[count($tableArray) - $begin]);
+ //* DEBUG: */ print __LINE__.":".$columnName."----------------".$begin."
\n";
+
+ // Remove brackes
+ $columnName = str_replace("(", "", str_replace(")", "", $columnName));
+ //* DEBUG: */ print __LINE__.":".$columnName."----------------".$begin."
\n";
+
+ // Continue
+ $begin++;
+ } // END while
+ } // END - if
+
+ // Show indexes
+ $result = SQL_QUERY_ESC("SHOW INDEX FROM %s",
+ array($tableName), __FILE__, __LINE__);
+
+ // Walk through all
+ $skip = false;
+ while ($content = SQL_FETCHARRAY($result)) {
+ // Is it found?
+ //* DEBUG: */ print "".print_r($content, true)."
";
+ if (($content['Column_name'] == $columnName) || ($content['Key_name'] == $columnName)) {
+ // Skip this query!
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Skiped: %s", $sql));
+ $skip = true;
+ break;
+ } // END - if
+ } // END - while
+
+ // Free result
+ SQL_FREERESULT($result);
+
+ // Shall we run it?
+ if (!$skip) {
+ // Send it to the SQL_QUERY() function
+ //* DEBUG: */ print __LINE__.":".$sql."
\n";
$result = SQL_QUERY($sql, $F, $L, false);
} // END - if
} else {
- // Send it to the SQL_QUERY() function
+ // Other ALTER TABLE query
+ //* DEBUG: */ print __LINE__.":".$sql."
\n";
$result = SQL_QUERY($sql, $F, $L, false);
}