tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-25 18:59:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

LogStreamDB Driver: Added backticks arround tablenames in all SQL Statements

Browse Source
This commit is contained in:
Andre Lorbach 2013-10-08 14:11:52 +02:00
parent f7f6156710
commit f90a3427ed
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/classes/logstreamdb.class.php
View File

@ -464,7 +464,7 @@ class LogStreamDB extends LogStream {
$szTableType = $this->_logStreamConfigObj->DBTableType; $szTableType = $this->_logStreamConfigObj->DBTableType;
// Create SQL and Get INDEXES for table! // Create SQL and Get INDEXES for table!
$szSql = "SHOW COLUMNS FROM " . $this->_logStreamConfigObj->DBTableName . " WHERE Field = '" . $dbmapping[$szTableType]['DBMAPPINGS'][MISC_CHECKSUM] . "'"; $szSql = "SHOW COLUMNS FROM `" . $this->_logStreamConfigObj->DBTableName . "` WHERE Field = '" . $dbmapping[$szTableType]['DBMAPPINGS'][MISC_CHECKSUM] . "'";
$myQuery = mysql_query($szSql, $this->_dbhandle); $myQuery = mysql_query($szSql, $this->_dbhandle);
if ($myQuery) if ($myQuery)
{ {
@ -682,7 +682,7 @@ class LogStreamDB extends LogStream {
if ( strlen($this->_SQLwhereClause) > 0 && !$this->_logStreamConfigObj->DBEnableRowCounting ) if ( strlen($this->_SQLwhereClause) > 0 && !$this->_logStreamConfigObj->DBEnableRowCounting )
return $this->_firstPageUID; return $this->_firstPageUID;
$szSql = "SELECT MAX(" . $dbmapping[$szTableType]['DBMAPPINGS'][SYSLOG_UID] . ") FROM " . $this->_logStreamConfigObj->DBTableName . $this->_SQLwhereClause; $szSql = "SELECT MAX(" . $dbmapping[$szTableType]['DBMAPPINGS'][SYSLOG_UID] . ") FROM `" . $this->_logStreamConfigObj->DBTableName . "` " . $this->_SQLwhereClause;
$myQuery = mysql_query($szSql, $this->_dbhandle); $myQuery = mysql_query($szSql, $this->_dbhandle);
if ($myQuery) if ($myQuery)
{ {
@ -714,7 +714,7 @@ class LogStreamDB extends LogStream {
if ( strlen($this->_SQLwhereClause) > 0 && !$this->_logStreamConfigObj->DBEnableRowCounting ) if ( strlen($this->_SQLwhereClause) > 0 && !$this->_logStreamConfigObj->DBEnableRowCounting )
return $this->_lastPageUID; return $this->_lastPageUID;
$szSql = "SELECT MIN(" . $dbmapping[$szTableType]['DBMAPPINGS'][SYSLOG_UID] . ") FROM " . $this->_logStreamConfigObj->DBTableName . $this->_SQLwhereClause; $szSql = "SELECT MIN(" . $dbmapping[$szTableType]['DBMAPPINGS'][SYSLOG_UID] . ") FROM `" . $this->_logStreamConfigObj->DBTableName . "` " . $this->_SQLwhereClause;
$myQuery = mysql_query($szSql, $this->_dbhandle); $myQuery = mysql_query($szSql, $this->_dbhandle);
if ($myQuery) if ($myQuery)
{ {
@ -777,7 +777,7 @@ class LogStreamDB extends LogStream {
if ( $this->_dbhandle != null ) if ( $this->_dbhandle != null )
{ {
// Obtain Stats data for this table! // Obtain Stats data for this table!
$szSql = "SHOW TABLE STATUS FROM " . $this->_logStreamConfigObj->DBName; $szSql = "SHOW TABLE STATUS FROM `" . $this->_logStreamConfigObj->DBName . "`";
$myQuery = mysql_query($szSql, $this->_dbhandle); $myQuery = mysql_query($szSql, $this->_dbhandle);
if ($myQuery) if ($myQuery)
{ {
@ -836,7 +836,7 @@ class LogStreamDB extends LogStream {
if ( $this->_dbhandle != null ) if ( $this->_dbhandle != null )
{ {
// SHOW TABLE STATUS FROM // SHOW TABLE STATUS FROM
$szSql = "SELECT count(" . $dbmapping[$szTableType]['DBMAPPINGS'][SYSLOG_UID] . ") as Counter FROM " . $this->_logStreamConfigObj->DBTableName; $szSql = "SELECT count(" . $dbmapping[$szTableType]['DBMAPPINGS'][SYSLOG_UID] . ") as Counter FROM `" . $this->_logStreamConfigObj->DBTableName . "`";
$myQuery = mysql_query($szSql, $this->_dbhandle); $myQuery = mysql_query($szSql, $this->_dbhandle);
if ($myQuery) if ($myQuery)
{ {
@ -898,7 +898,7 @@ class LogStreamDB extends LogStream {
// --- // ---
// DELETE DATA NOW! // DELETE DATA NOW!
$szSql = "DELETE FROM " . $this->_logStreamConfigObj->DBTableName . $szWhere; $szSql = "DELETE FROM `" . $this->_logStreamConfigObj->DBTableName . "`" . $szWhere;
OutputDebugMessage("LogStreamDB|CleanupLogdataByDate: Created SQL Query:<br>" . $szSql, DEBUG_DEBUG); OutputDebugMessage("LogStreamDB|CleanupLogdataByDate: Created SQL Query:<br>" . $szSql, DEBUG_DEBUG);
$myQuery = mysql_query($szSql, $this->_dbhandle); $myQuery = mysql_query($szSql, $this->_dbhandle);
if ($myQuery) if ($myQuery)
@ -1072,7 +1072,7 @@ class LogStreamDB extends LogStream {
$szSql = "SELECT " . $szSql = "SELECT " .
$myDBQueryFields . $myDBQueryFields .
"count(" . $myDBConsFieldName . ") as itemcount " . "count(" . $myDBConsFieldName . ") as itemcount " .
" FROM " . $this->_logStreamConfigObj->DBTableName . " FROM `" . $this->_logStreamConfigObj->DBTableName . "`" .
$this->_SQLwhereClause . $this->_SQLwhereClause .
" GROUP BY " . $myDBGroupByFieldName . " GROUP BY " . $myDBGroupByFieldName .
" ORDER BY " . $myDBSortedFieldName . " " . $szSortingOrder . " ORDER BY " . $myDBSortedFieldName . " " . $szSortingOrder .
@ -1211,7 +1211,7 @@ class LogStreamDB extends LogStream {
$szSql = "SELECT " . $szSql = "SELECT " .
$myDBQueryFields . $myDBQueryFields .
"count(" . $myDBConsFieldName . ") as itemcount " . "count(" . $myDBConsFieldName . ") as itemcount " .
" FROM " . $this->_logStreamConfigObj->DBTableName . " FROM `" . $this->_logStreamConfigObj->DBTableName . "`" .
$this->_SQLwhereClause . $this->_SQLwhereClause .
" GROUP BY " . $myDBGroupByFieldName . " GROUP BY " . $myDBGroupByFieldName .
" ORDER BY " . $myDBSortedFieldName . " " . $szSortingOrder . " ORDER BY " . $myDBSortedFieldName . " " . $szSortingOrder .
@ -1299,7 +1299,7 @@ class LogStreamDB extends LogStream {
$szSql = "SELECT " . $szSql = "SELECT " .
$myDBQueryFieldName . ", " . $myDBQueryFieldName . ", " .
"count(" . $myDBFieldName . ") as TotalCount " . "count(" . $myDBFieldName . ") as TotalCount " .
" FROM " . $this->_logStreamConfigObj->DBTableName . " FROM `" . $this->_logStreamConfigObj->DBTableName . "`" .
$this->_SQLwhereClause . $this->_SQLwhereClause .
" GROUP BY " . $mySelectFieldName . " GROUP BY " . $mySelectFieldName .
" ORDER BY TotalCount DESC" . " ORDER BY TotalCount DESC" .
@ -1744,7 +1744,7 @@ class LogStreamDB extends LogStream {
} }
// Append FROM 'table'! // Append FROM 'table'!
$sqlString .= " FROM " . $this->_logStreamConfigObj->DBTableName; $sqlString .= " FROM `" . $this->_logStreamConfigObj->DBTableName . "`";
// Append precreated where clause // Append precreated where clause
$sqlString .= $this->_SQLwhereClause; $sqlString .= $this->_SQLwhereClause;
@ -1962,7 +1962,7 @@ class LogStreamDB extends LogStream {
$arrIndexKeys = array(); $arrIndexKeys = array();
// Create SQL and Get INDEXES for table! // Create SQL and Get INDEXES for table!
$szSql = "SHOW INDEX FROM " . $this->_logStreamConfigObj->DBTableName; $szSql = "SHOW INDEX FROM `" . $this->_logStreamConfigObj->DBTableName . "`";
$myQuery = mysql_query($szSql, $this->_dbhandle); $myQuery = mysql_query($szSql, $this->_dbhandle);
if ($myQuery) if ($myQuery)
{ {
@ -2001,7 +2001,7 @@ class LogStreamDB extends LogStream {
$arrFieldKeys = array(); $arrFieldKeys = array();
// Create SQL and Get INDEXES for table! // Create SQL and Get INDEXES for table!
$szSql = "SHOW FIELDS FROM " . $this->_logStreamConfigObj->DBTableName; $szSql = "SHOW FIELDS FROM `" . $this->_logStreamConfigObj->DBTableName . "`";
$myQuery = mysql_query($szSql, $this->_dbhandle); $myQuery = mysql_query($szSql, $this->_dbhandle);
if ($myQuery) if ($myQuery)
{ {

16
src/include/functions_db.php
View File

@ -387,24 +387,24 @@ function WriteConfigValue($szPropName, $is_global = true, $userid = false, $grou
$CFG[$szPropName] = $content[$szPropName]; $CFG[$szPropName] = $content[$szPropName];
// Check if we need to INSERT or UPDATE // Check if we need to INSERT or UPDATE
$result = DB_Query("SELECT propname FROM " . DB_CONFIG . " WHERE propname = '" . $szPropName . "' AND is_global = " . $is_global); $result = DB_Query("SELECT propname FROM `" . DB_CONFIG . "` WHERE propname = '" . $szPropName . "' AND is_global = " . $is_global);
$rows = DB_GetAllRows($result, true); $rows = DB_GetAllRows($result, true);
if ( !isset($rows) ) if ( !isset($rows) )
{ {
// New Entry // New Entry
if ( strlen($szDbValue) < 255 ) if ( strlen($szDbValue) < 255 )
$result = DB_Query("INSERT INTO " . DB_CONFIG . " (propname, propvalue, is_global) VALUES ( '" . $szPropName . "', '" . $szDbValue . "', " . $is_global . ")"); $result = DB_Query("INSERT INTO `" . DB_CONFIG . "` (propname, propvalue, is_global) VALUES ( '" . $szPropName . "', '" . $szDbValue . "', " . $is_global . ")");
else else
$result = DB_Query("INSERT INTO " . DB_CONFIG . " (propname, propvalue_text, is_global) VALUES ( '" . $szPropName . "', '" . $szDbValue . "', " . $is_global . ")"); $result = DB_Query("INSERT INTO `" . DB_CONFIG . "` (propname, propvalue_text, is_global) VALUES ( '" . $szPropName . "', '" . $szDbValue . "', " . $is_global . ")");
DB_FreeQuery($result); DB_FreeQuery($result);
} }
else else
{ {
// Update Entry // Update Entry
if ( strlen($szDbValue) < 255 ) if ( strlen($szDbValue) < 255 )
$result = DB_Query("UPDATE " . DB_CONFIG . " SET propvalue = '" . $szDbValue . "', propvalue_text = '' WHERE propname = '" . $szPropName . "' AND is_global = " . $is_global); $result = DB_Query("UPDATE `" . DB_CONFIG . "` SET propvalue = '" . $szDbValue . "', propvalue_text = '' WHERE propname = '" . $szPropName . "' AND is_global = " . $is_global);
else else
$result = DB_Query("UPDATE " . DB_CONFIG . " SET propvalue_text = '" . $szDbValue . "', propvalue = '' WHERE propname = '" . $szPropName . "' AND is_global = " . $is_global); $result = DB_Query("UPDATE `" . DB_CONFIG . "` SET propvalue_text = '" . $szDbValue . "', propvalue = '' WHERE propname = '" . $szPropName . "' AND is_global = " . $is_global);
DB_FreeQuery($result); DB_FreeQuery($result);
} }
} }
@ -425,18 +425,18 @@ function WriteConfigValue($szPropName, $is_global = true, $userid = false, $grou
} }
// Check if we need to INSERT or UPDATE // Check if we need to INSERT or UPDATE
$result = DB_Query("SELECT propname FROM " . DB_CONFIG . " WHERE propname = '" . $szPropName . "' AND userid = " . $userid); $result = DB_Query("SELECT propname FROM `" . DB_CONFIG . "` WHERE propname = '" . $szPropName . "' AND userid = " . $userid);
$rows = DB_GetAllRows($result, true); $rows = DB_GetAllRows($result, true);
if ( !isset($rows) ) if ( !isset($rows) )
{ {
// New Entry // New Entry
$result = DB_Query("INSERT INTO " . DB_CONFIG . " (propname, propvalue, userid) VALUES ( '" . $szPropName . "', '" . $szDbValue . "', " . $userid . ")"); $result = DB_Query("INSERT INTO `" . DB_CONFIG . "` (propname, propvalue, userid) VALUES ( '" . $szPropName . "', '" . $szDbValue . "', " . $userid . ")");
DB_FreeQuery($result); DB_FreeQuery($result);
} }
else else
{ {
// Update Entry // Update Entry
$result = DB_Query("UPDATE " . DB_CONFIG . " SET propvalue = '" . $szDbValue . "' WHERE propname = '" . $szPropName . "' AND userid = " . $userid); $result = DB_Query("UPDATE `" . DB_CONFIG . "` SET propvalue = '" . $szDbValue . "' WHERE propname = '" . $szPropName . "' AND userid = " . $userid);
DB_FreeQuery($result); DB_FreeQuery($result);
} }