mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

Closes #3674 PDO Don't overwrite e_db_pdo::$mySQLlastQuery with _getMySQLaccess()

Browse Source
This commit is contained in:
Cameron
2019-02-13 21:26:17 -08:00
parent 25c9a44a87
commit f5b16b5afb
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_handlers/e_db_pdo_class.php
View File

@@ -38,7 +38,7 @@ class e_db_pdo implements e_db
protected $mySQLlastErrText = ''; // Text of last error - now protected, use getLastErrorText() protected $mySQLlastErrText = ''; // Text of last error - now protected, use getLastErrorText()
protected $mySQLlastQuery = ''; protected $mySQLlastQuery = '';
protected $mySQLcurTable; protected $mySQLcurTable;
public $mySQLlanguage; public $mySQLlanguage;
public $mySQLinfo; public $mySQLinfo;
public $tabset; public $tabset;
@@ -170,7 +170,7 @@ class e_db_pdo implements e_db
{ {
$this->mySQLlastErrText = $ex->getMessage(); $this->mySQLlastErrText = $ex->getMessage();
$this->mySQLLastErrNum = $ex->getCode(); $this->mySQLLastErrNum = $ex->getCode();
$this->dbg->log($this->mySQLlastErrText); // Useful for Debug. breaks testing. $this->dbg->log($this->mySQLlastErrText);
return false; return false;
} }
@@ -314,6 +314,7 @@ class e_db_pdo implements e_db
global $db_time, $queryinfo; global $db_time, $queryinfo;
$this->queryCount++; $this->queryCount++;
$this->_getMySQLaccess();
$this->mySQLlastQuery = $query; $this->mySQLlastQuery = $query;
if ($debug == 'now') if ($debug == 'now')
@@ -330,8 +331,6 @@ class e_db_pdo implements e_db
$this->log($log_type, $log_remark, $query); $this->log($log_type, $log_remark, $query);
} }
$this->_getMySQLaccess();
$b = microtime(); $b = microtime();
@@ -437,13 +436,13 @@ class e_db_pdo implements e_db
if(isset($ex) && is_object($ex)) if(isset($ex) && is_object($ex))
{ {
$query = $ex->getMessage(); $query = $ex->getMessage();
$query .= print_a($ex->getTrace(), true); // $arr = $ex->getTrace(); // @todo runs out of memory when tested.
// $query .= print_a($arr, true);
} }
if($buglink instanceof PDO) if($buglink instanceof PDO)
{ {
$this->dbg->Mark_Query($query, 'PDO', $sQryRes, $aTrace, $mytime, $pTable); $this->dbg->Mark_Query($query, 'PDO', $sQryRes, $aTrace, $mytime, $pTable);
} }
@@ -1386,7 +1385,7 @@ class e_db_pdo implements e_db
{ {
$this->_getMySQLaccess(); $this->_getMySQLaccess();
$this->traffic->BumpWho('db Close', 1); $this->traffic->BumpWho('db Close', 1);
$this->mySQLaccess = NULL; // correct way to do it when using shared links. $this->mySQLaccess = null; // correct way to do it when using shared links.
$this->dbError('dbClose'); $this->dbError('dbClose');
} }