WIP: schedulers..
This commit is contained in:
@@ -120,13 +120,10 @@ class MysqlManager extends DBManager
|
||||
|
||||
if (mysql_errno($this->getDatabase())) {
|
||||
if ($this->dieOnError || $dieOnError){
|
||||
$GLOBALS['log']->fatal("MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database));
|
||||
sugar_die ($msg."MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database));
|
||||
}
|
||||
else {
|
||||
$this->last_error = $msg."MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database);
|
||||
$GLOBALS['log']->error("MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database));
|
||||
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -152,7 +149,6 @@ class MysqlManager extends DBManager
|
||||
)
|
||||
{
|
||||
parent::countQuery($sql);
|
||||
$GLOBALS['log']->info('Query:' . $sql);
|
||||
$this->checkConnection();
|
||||
//$this->freeResult();
|
||||
$this->query_time = microtime(true);
|
||||
@@ -165,8 +161,6 @@ class MysqlManager extends DBManager
|
||||
|
||||
$this->lastmysqlrow = -1;
|
||||
$this->query_time = microtime(true) - $this->query_time;
|
||||
$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
|
||||
|
||||
|
||||
$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
|
||||
if($autofree)
|
||||
@@ -187,7 +181,6 @@ class MysqlManager extends DBManager
|
||||
{
|
||||
if ($start < 0)
|
||||
$start = 0;
|
||||
$GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
|
||||
|
||||
$sql = "$sql LIMIT $start,$count";
|
||||
$this->lastsql = $sql;
|
||||
@@ -225,20 +218,7 @@ class MysqlManager extends DBManager
|
||||
|
||||
if ( empty($badQuery) )
|
||||
return true;
|
||||
|
||||
foreach($badQuery as $table=>$data ){
|
||||
if(!empty($data)){
|
||||
$warning = ' Table:' . $table . ' Data:' . $data;
|
||||
if(!empty($GLOBALS['sugar_config']['check_query_log'])){
|
||||
$GLOBALS['log']->fatal($sql);
|
||||
$GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
|
||||
}
|
||||
else{
|
||||
$GLOBALS['log']->warn('CHECK QUERY:' .$warning);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -331,7 +311,6 @@ class MysqlManager extends DBManager
|
||||
public function getTablesArray()
|
||||
{
|
||||
global $sugar_config;
|
||||
$GLOBALS['log']->debug('Fetching table list');
|
||||
|
||||
if ($this->getDatabase()) {
|
||||
$tables = array();
|
||||
@@ -363,7 +342,6 @@ class MysqlManager extends DBManager
|
||||
$tableName
|
||||
)
|
||||
{
|
||||
$GLOBALS['log']->info("tableExists: $tableName");
|
||||
|
||||
if ($this->getDatabase()) {
|
||||
$result = $this->query("SHOW TABLES LIKE '".$tableName."'");
|
||||
@@ -441,10 +419,6 @@ class MysqlManager extends DBManager
|
||||
mysql_query($charset, $this->database); // no quotes around "[charset]"
|
||||
mysql_query("SET NAMES 'utf8'", $this->database);
|
||||
|
||||
if($this->checkError('Could Not Connect:', $dieOnError))
|
||||
$GLOBALS['log']->info("connected to db");
|
||||
|
||||
$GLOBALS['log']->info("Connect:".$this->database);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user