mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-30 17:29:53 +02:00
Code Issues Releases Wiki Activity

* seek() or rowCount() in unbuffered mode throws exceptions

Browse Source 
* out of range seek() throws exception
* deprecated DibiDriver::errorInfo
* fixed seek(0) on first iteration
* added DibiDatabaseException::catchError() & restore() for converting errors to exceptions
This commit is contained in:
David Grudl
2007-11-12 01:39:26 +00:00
parent 5ee6a19f93
commit ea00d5d37d
14 changed files with 184 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
dibi/drivers/postgre.php
View File

@@ -81,25 +81,16 @@ class DibiPostgreDriver extends DibiDriver
$config = $this->getConfig();
// some errors aren't handled. Must use $php_errormsg
if (function_exists('ini_set')) {
$save = ini_set('track_errors', TRUE);
}
$php_errormsg = '';
DibiDatabaseException::catchError();
if (isset($config['persistent'])) {
$connection = @pg_connect($config['database'], PGSQL_CONNECT_FORCE_NEW);
} else {
$connection = @pg_pconnect($config['database'], PGSQL_CONNECT_FORCE_NEW);
}
if (function_exists('ini_set')) {
ini_set('track_errors', $save);
}
DibiDatabaseException::restore();
if (!is_resource($connection)) {
throw new DibiDatabaseException($php_errormsg);
throw new DibiDatabaseException('unknown error');
}
if (isset($config['charset'])) {
@@ -146,7 +137,7 @@ class DibiPostgreDriver extends DibiDriver
$this->affectedRows = pg_affected_rows($res);
if ($this->affectedRows < 0) $this->affectedRows = FALSE;
}
return new DibiPostgreResult($res);
return new DibiPostgreResult($res, TRUE);
}
}
@@ -225,21 +216,6 @@ class DibiPostgreDriver extends DibiDriver
/**
* Returns last error
*
* @return array with items 'message' and 'code'
*/
public function errorInfo()
{
return array(
'message' => pg_last_error($this->getConnection()),
'code' => NULL,
);
}
/**
* Escapes the string
*
@@ -326,7 +302,7 @@ class DibiPostgreResult extends DibiResult
*
* @return int
*/
public function rowCount()
protected function doRowCount()
{
return pg_num_rows($this->resource);
}
@@ -350,11 +326,14 @@ class DibiPostgreResult extends DibiResult
* Moves cursor position without fetching row
*
* @param int the 0-based cursor pos to seek to
* @return boolean TRUE on success, FALSE if unable to seek to specified record
* @return void
* @throws DibiException
*/
public function seek($row)
protected function doSeek($row)
{
return pg_result_seek($this->resource, $row);
if (!pg_result_seek($this->resource, $row)) {
throw new DibiDriverException('Unable to seek to row ' . $row);
}
}
@@ -364,7 +343,7 @@ class DibiPostgreResult extends DibiResult
*
* @return void
*/
protected function free()
protected function doFree()
{
pg_free_result($this->resource);
}