rlkollman/meekrodb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

we can now throw an exception on errors if DB::$throw_exception_on_error is set

Browse Source
This commit is contained in:
Sergey Tsalkov
2011-03-04 17:07:23 -05:00
parent 0a7b323e81
commit a2fd15f84f
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
db.class.php
View File

@@ -16,8 +16,9 @@ class DB
public static $password = ''; public static $password = '';
public static $host = 'localhost'; public static $host = 'localhost';
public static $encoding = 'latin1'; public static $encoding = 'latin1';
public static $queryMode = 'queryAllRows'; //buffered, unbuffered, queryAllRows public static $queryMode = 'queryAllRows';
public static $error_handler = 'meekrodb_error_handler'; public static $error_handler = 'meekrodb_error_handler';
public static $throw_exception_on_error = false;
public static function get($dbName = '') { public static function get($dbName = '') {
static $mysql = null; static $mysql = null;
@@ -298,6 +299,11 @@ class DB
'error' => $error 'error' => $error
)); ));
} }
if (DB::$throw_exception_on_error) {
$e = new MeekroDBException($error, $sql);
throw $e;
}
} else if (DB::$debug) { } else if (DB::$debug) {
$runtime = sprintf('%f', $runtime * 1000); $runtime = sprintf('%f', $runtime * 1000);
$sqlShow = "$sql (" . ($is_buffered ? 'MYSQLI_STORE_RESULT' : 'MYSQLI_USE_RESULT') . ")"; $sqlShow = "$sql (" . ($is_buffered ? 'MYSQLI_STORE_RESULT' : 'MYSQLI_USE_RESULT') . ")";
@@ -485,6 +491,17 @@ class DBTransaction {
} }
class MeekroDBException extends Exception {
protected $query = '';
function __construct($message='', $query='') {
parent::__construct($message);
$this->query = $query;
}
public function getQuery() { return $this->query; }
}
function meekrodb_error_handler($params) { function meekrodb_error_handler($params) {
$out[] = "QUERY: " . $params['query']; $out[] = "QUERY: " . $params['query'];
$out[] = "ERROR: " . $params['error']; $out[] = "ERROR: " . $params['error'];

30
simpletest/BasicTest.php
View File

@@ -108,10 +108,38 @@ class BasicTest extends SimpleTest {
DB::$error_handler = 'new_error_callback'; DB::$error_handler = 'new_error_callback';
DB::query("SELET * FROM accounts"); DB::query("SELET * FROM accounts");
$this->assert($error_callback_worked === 1); $this->assert($error_callback_worked === 1);
} }
function test_6_exception_catch() {
DB::$error_handler = '';
DB::$throw_exception_on_error = true;
try {
DB::query("SELET * FROM accounts");
} catch(MeekroDBException $e) {
$this->assert(substr_count($e->getMessage(), 'You have an error in your SQL syntax'));
$this->assert($e->getQuery() === 'SELET * FROM accounts');
$exception_was_caught = 1;
}
$this->assert($exception_was_caught === 1);
try {
DB::insert('`libdb_test`.`accounts`', array(
'id' => 2,
'username' => 'Another Dude\'s \'Mom"',
'password' => 'asdfsdse',
'age' => 35,
'height' => 555.23
));
} catch(MeekroDBException $e) {
$this->assert(substr_count($e->getMessage(), 'Duplicate entry'));
$exception_was_caught = 2;
}
$this->assert($exception_was_caught === 2);
}
} }