Misc fixes for compatibility with existing XML queries and schemas

This commit is contained in:
Kijin Sung 2020-06-30 14:43:42 +09:00
parent fa220fb1e1
commit 85df901924
7 changed files with 68 additions and 31 deletions

View file

@ -33,6 +33,9 @@ class DBHelper extends \PDO
*/
public function prepare($statement, $driver_options = null)
{
$start_time = microtime(true);
$db_class = DB::getInstance($this->_type);
try
{
if ($driver_options)
@ -48,6 +51,10 @@ class DBHelper extends \PDO
}
catch (\PDOException $e)
{
$elapsed_time = microtime(true) - $start_time;
$db_class->addElapsedTime($elapsed_time);
$db_class->setError(-1, $e->getMessage());
Debug::addQuery($db_class->getQueryLog($statement, $elapsed_time));
throw new DBError($e->getMessage(), 0, $e);
}
@ -81,7 +88,7 @@ class DBHelper extends \PDO
$elapsed_time = microtime(true) - $start_time;
$db_class->addElapsedTime($elapsed_time);
Debug::addQuery($db_class->getQueryLog($statement, '', $elapsed_time));
Debug::addQuery($db_class->getQueryLog($statement, $elapsed_time));
return $stmt;
}
@ -109,7 +116,7 @@ class DBHelper extends \PDO
$elapsed_time = microtime(true) - $start_time;
$db_class->addElapsedTime($elapsed_time);
Debug::addQuery($db_class->getQueryLog($query, '', $elapsed_time));
Debug::addQuery($db_class->getQueryLog($query, $elapsed_time));
return $result;
}

View file

@ -42,7 +42,7 @@ class DBStmtHelper extends \PDOStatement
$elapsed_time = microtime(true) - $start_time;
$db_class->addElapsedTime($elapsed_time);
Debug::addQuery($db_class->getQueryLog($this->queryString, '', $elapsed_time));
Debug::addQuery($db_class->getQueryLog($this->queryString, $elapsed_time));
}
catch (\PDOException $e)
{
@ -50,7 +50,7 @@ class DBStmtHelper extends \PDOStatement
$elapsed_time = microtime(true) - $start_time;
$db_class->addElapsedTime($elapsed_time);
Debug::addQuery($db_class->getQueryLog($this->queryString, '', $elapsed_time));
Debug::addQuery($db_class->getQueryLog($this->queryString, $elapsed_time));
throw new DBError($e->getMessage(), 0, $e);
}