fixed some bugs

dibi/drivers/mysql.php

@@ -266,7 +266,7 @@ class DibiMySqlDriver extends NObject implements DibiDriverInterface
     public function rowCount()
     {
         if (!$this->buffered) {
-            throw new BadMethodCallException(__METHOD__ . ' is not allowed for unbuffered queries');
+            throw new DibiDatabaseException('Row count is not available for unbuffered queries');
         }
         return mysql_num_rows($this->resultset);
     }
@@ -296,8 +296,9 @@ class DibiMySqlDriver extends NObject implements DibiDriverInterface
     public function seek($row)
     {
         if (!$this->buffered) {
-            throw new BadMethodCallException(__METHOD__ . ' is not allowed for unbuffered queries');
+            throw new DibiDatabaseException('Cannot seek an unbuffered result set');
         }
+
         if (!mysql_data_seek($this->resultset, $row)) {
             throw new DibiDatabaseException('Unable to seek to row ' . $row);
         }

dibi/drivers/mysqli.php

@@ -251,7 +251,7 @@ class DibiMySqliDriver extends NObject implements DibiDriverInterface
     public function rowCount()
     {
         if (!$this->buffered) {
-            throw new BadMethodCallException(__METHOD__ . ' is not allowed for unbuffered queries');
+            throw new DibiDatabaseException('Row count is not available for unbuffered queries');
         }
         return mysqli_num_rows($this->resultset);
     }
@@ -281,7 +281,7 @@ class DibiMySqliDriver extends NObject implements DibiDriverInterface
     public function seek($row)
     {
         if (!$this->buffered) {
-            throw new BadMethodCallException(__METHOD__ . ' is not allowed for unbuffered queries');
+            throw new DibiDatabaseException('Cannot seek an unbuffered result set');
         }
         if (!mysqli_data_seek($this->resultset, $row)) {
             throw new DibiDatabaseException('Unable to seek to row ' . $row);

dibi/drivers/odbc.php

@@ -85,7 +85,7 @@ class DibiOdbcDriver extends NObject implements DibiDriverInterface
         }
 
         if (!is_resource($this->connection)) {
-            throw new DibiDatabaseException(odbc_errormsg(), odbc_error());
+            throw new DibiDatabaseException(odbc_errormsg() . ' ' . odbc_error());
         }
     }
 
@@ -112,11 +112,10 @@ class DibiOdbcDriver extends NObject implements DibiDriverInterface
      */
     public function query($sql)
     {
-        $this->affectedRows = FALSE;
         $this->resultset = @odbc_exec($this->connection, $sql);
 
         if ($this->resultset === FALSE) {
-            throw new DibiDatabaseException(odbc_errormsg($this->connection), odbc_error($this->connection), $sql);
+            throw new DibiDatabaseException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection), 0, $sql);
         }
 
         return is_resource($this->resultset);
@@ -155,7 +154,7 @@ class DibiOdbcDriver extends NObject implements DibiDriverInterface
     public function begin()
     {
         if (!odbc_autocommit($this->connection, FALSE)) {
-            throw new DibiDatabaseException(odbc_errormsg($this->connection), odbc_error($this->connection));
+            throw new DibiDatabaseException(odbc_errormsg($this->connection)  . ' ' . odbc_error($this->connection));
         }
     }
 
@@ -168,7 +167,7 @@ class DibiOdbcDriver extends NObject implements DibiDriverInterface
     public function commit()
     {
         if (!odbc_commit($this->connection)) {
-            throw new DibiDatabaseException(odbc_errormsg($this->connection), odbc_error($this->connection));
+            throw new DibiDatabaseException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
         }
         odbc_autocommit($this->connection, TRUE);
     }
@@ -182,7 +181,7 @@ class DibiOdbcDriver extends NObject implements DibiDriverInterface
     public function rollback()
     {
         if (!odbc_rollback($this->connection)) {
-            throw new DibiDatabaseException(odbc_errormsg($this->connection), odbc_error($this->connection));
+            throw new DibiDatabaseException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
         }
         odbc_autocommit($this->connection, TRUE);
     }
@@ -285,11 +284,6 @@ class DibiOdbcDriver extends NObject implements DibiDriverInterface
     /** this is experimental */
     public function buildMeta()
     {
-        // cache
-        if ($meta !== NULL) {
-            return $meta;
-        }
-
         static $types = array(
             'CHAR'      => dibi::FIELD_TEXT,
             'COUNTER'   => dibi::FIELD_COUNTER,

dibi/drivers/oracle.php

@@ -244,7 +244,6 @@ class DibiOracleDriver extends NObject implements DibiDriverInterface
      */
     public function fetch()
     {
-        $this->fetched = TRUE;
         return oci_fetch_assoc($this->resultset);
     }
 
@@ -259,7 +258,6 @@ class DibiOracleDriver extends NObject implements DibiDriverInterface
      */
     public function seek($row)
     {
-        if ($row === 0 && !$this->fetched) return TRUE;
         throw new BadMethodCallException(__METHOD__ . ' is not implemented');
     }
 

dibi/drivers/pdo.php

@@ -231,6 +231,7 @@ class DibiPdoDriver extends NObject implements DibiDriverInterface
      */
     public function seek($row)
     {
+        $this->row = $row;
     }
 
 

dibi/drivers/sqlite.php

@@ -224,7 +224,7 @@ class DibiSqliteDriver extends NObject implements DibiDriverInterface
     public function rowCount()
     {
         if (!$this->buffered) {
-            throw new BadMethodCallException(__METHOD__ . ' is not allowed for unbuffered queries');
+            throw new DibiDatabaseException('Row count is not available for unbuffered queries');
         }
         return sqlite_num_rows($this->resultset);
     }
@@ -254,11 +254,11 @@ class DibiSqliteDriver extends NObject implements DibiDriverInterface
     public function seek($row)
     {
         if (!$this->buffered) {
-            throw new BadMethodCallException(__METHOD__ . ' is not allowed for unbuffered queries');
+            throw new DibiDatabaseException('Cannot seek an unbuffered result set');
+        }
+        if (!sqlite_seek($this->resultset, $row)) {
+            throw new DibiDatabaseException('Unable to seek to row ' . $row);
         }
-        DibiDatabaseException::catchError();
-        sqlite_seek($this->resultset, $row);
-        DibiDatabaseException::restore();
     }
 
 

dibi/libs/DibiException.php

@@ -51,7 +51,7 @@ class DibiDatabaseException extends DibiException
 
     public function __construct($message = NULL, $code = 0, $sql = NULL)
     {
-        parent::__construct($message);
+        parent::__construct($message, (int) $code);
         $this->sql = $sql;
         dibi::notify(NULL, 'exception', $this);
     }

dibi/libs/DibiResult.php

@@ -52,19 +52,19 @@ class DibiResult extends NObject implements IteratorAggregate, Countable
      * Describes columns types
      * @var array
      */
-    protected $convert;
+    private $convert;
 
     /**
      * Describes columns types
      * @var array
      */
-    protected $meta;
+    private $meta;
 
     /**
      * Already fetched? Used for allowance for first seek(0)
      * @var bool
      */
-    protected $fetched = FALSE;
+    private $fetched = FALSE;
 
 
 
@@ -86,6 +86,18 @@ class DibiResult extends NObject implements IteratorAggregate, Countable
     }
 
 
+    /**
+     * Automatically frees the resources allocated for this result set
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        @$this->driver->free();
+    }
+
+
+
     /**
      * Returns the resultset resource
      *
@@ -107,11 +119,9 @@ class DibiResult extends NObject implements IteratorAggregate, Countable
      */
     final public function seek($row)
     {
-        if ($row === 0 && !$this->fetched) {
+        if ($row !== 0 || $this->fetched) {
-            return TRUE;
+            $this->driver->seek($row);
         }
-
-        $this->driver->seek($row);
     }
 
 
@@ -128,6 +138,18 @@ class DibiResult extends NObject implements IteratorAggregate, Countable
 
 
 
+    /**
+     * Frees the resources allocated for this result set
+     *
+     * @return void
+     */
+    final public function free()
+    {
+        $this->driver->free();
+    }
+
+
+
     /**
      * Fetches the row at current position, process optional type conversion
      * and moves the internal cursor to the next position
@@ -334,18 +356,6 @@ class DibiResult extends NObject implements IteratorAggregate, Countable
 
 
 
-    /**
-     * Automatically frees the resources allocated for this result set
-     *
-     * @return void
-     */
-    public function __destruct()
-    {
-        @$this->driver->free();
-    }
-
-
-
     final public function setType($field, $type = NULL)
     {
         if ($field === TRUE) {
@@ -438,7 +448,7 @@ class DibiResult extends NObject implements IteratorAggregate, Countable
      *
      * @return void
      */
-    public function dump()
+    final public function dump()
     {
         echo "\n<table class=\"dump\">\n<thead>\n\t<tr>\n\t\t<th>#row</th>\n";