diff --git a/classes/db_pdo.php b/classes/db_pdo.php
index ef66996..85da6c7 100644
--- a/classes/db_pdo.php
+++ b/classes/db_pdo.php
@@ -359,6 +359,20 @@ abstract class DB_PDO extends PDO {
 
 		return ($filtered_index) ? db_filter($all, 0) : $all;
 	}
+	
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Return the number of rows returned for a SELECT query
+	 *
+	 * @return int
+	 */
+	public function num_rows()
+	{
+		return isset($this->statement) && is_object($this->statement) 
+			? $this->statement->rowCount() 
+			: FALSE;
+	}
 
 	// -------------------------------------------------------------------------
 	// ! Abstract public functions to implement in child classes
@@ -373,13 +387,6 @@ abstract class DB_PDO extends PDO {
 	 */
 	abstract public function truncate($table);
 
-	/**
-	 * Return the number of rows for the last SELECT query
-	 *
-	 * @return int
-	 */
-	abstract public function num_rows();
-
 	/**
 	 * Connect to a different database
 	 *
diff --git a/docs/classes/DB_PDO.html b/docs/classes/DB_PDO.html
index 736631a..23dfdd0 100644
--- a/docs/classes/DB_PDO.html
+++ b/docs/classes/DB_PDO.html
@@ -96,7 +96,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
         </span><pre>inTransaction()</pre></a></li>
 <li class="method public "><a href="#lastInsertId" title="lastInsertId :: "><span class="description">lastInsertId()
         </span><pre>lastInsertId()</pre></a></li>
-<li class="method public "><a href="#num_rows" title="num_rows :: Return the number of rows for the last SELECT query"><span class="description">Return the number of rows for the last SELECT query</span><pre>num_rows()</pre></a></li>
+<li class="method public "><a href="#num_rows" title="num_rows :: Return the number of rows returned for a SELECT query"><span class="description">Return the number of rows returned for a SELECT query</span><pre>num_rows()</pre></a></li>
 <li class="method public "><a href="#prepare" title="prepare :: "><span class="description">prepare()
         </span><pre>prepare()</pre></a></li>
 <li class="method public "><a href="#prepare_execute" title="prepare_execute :: Create and execute a prepared statement with the provided parameters"><span class="description">Create and execute a prepared statement with the provided parameters</span><pre>prepare_execute()</pre></a></li>
@@ -456,7 +456,7 @@ the connection/database</h2>
 </div></div>
 </div>
 <a name="num_rows" id="num_rows"></a><div class="element clickable method public num_rows" data-toggle="collapse" data-target=".num_rows .collapse">
-<h2>Return the number of rows for the last SELECT query</h2>
+<h2>Return the number of rows returned for a SELECT query</h2>
 <pre>num_rows() : int</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8">
@@ -662,7 +662,7 @@ the connection/database</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/DB_Reg.html b/docs/classes/DB_Reg.html
index de7f90b..6b77ce0 100644
--- a/docs/classes/DB_Reg.html
+++ b/docs/classes/DB_Reg.html
@@ -151,7 +151,7 @@ and organizes database connections</p></p>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/DB_SQL.html b/docs/classes/DB_SQL.html
index 16d29f1..5be1053 100644
--- a/docs/classes/DB_SQL.html
+++ b/docs/classes/DB_SQL.html
@@ -268,7 +268,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/DB_Util.html b/docs/classes/DB_Util.html
index cf8846e..067005b 100644
--- a/docs/classes/DB_Util.html
+++ b/docs/classes/DB_Util.html
@@ -208,7 +208,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Firebird.html b/docs/classes/Firebird.html
index 88eb42d..55a6b6f 100644
--- a/docs/classes/Firebird.html
+++ b/docs/classes/Firebird.html
@@ -92,7 +92,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
         </span><pre>inTransaction()</pre></a></li>
 <li class="method public inherited"><a href="#lastInsertId" title="lastInsertId :: "><span class="description">lastInsertId()
         </span><pre>lastInsertId()</pre></a></li>
-<li class="method public "><a href="#num_rows" title="num_rows :: Return the number of rows returned for a SELECT query"><span class="description">Return the number of rows returned for a SELECT query</span><pre>num_rows()</pre></a></li>
+<li class="method public inherited"><a href="#num_rows" title="num_rows :: Return the number of rows returned for a SELECT query"><span class="description">Return the number of rows returned for a SELECT query</span><pre>num_rows()</pre></a></li>
 <li class="method public "><a href="#prepare" title="prepare :: Emulate PDO prepare"><span class="description">Emulate PDO prepare</span><pre>prepare()</pre></a></li>
 <li class="method public "><a href="#prepare_execute" title="prepare_execute :: Prepare and execute a query"><span class="description">Prepare and execute a query</span><pre>prepare_execute()</pre></a></li>
 <li class="method public "><a href="#prepare_query" title="prepare_query :: Bind a prepared query with arguments for executing"><span class="description">Bind a prepared query with arguments for executing</span><pre>prepare_query()</pre></a></li>
@@ -533,9 +533,13 @@ the connection/database</h2>
 <a name="num_rows" id="num_rows"></a><div class="element clickable method public num_rows" data-toggle="collapse" data-target=".num_rows .collapse">
 <h2>Return the number of rows returned for a SELECT query</h2>
 <pre>num_rows() : int</pre>
-<div class="labels"></div>
+<div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>inherited_from</th>
+<td>\DB_PDO::num_rows()</td>
+</tr></table>
 <h3>Returns</h3>
 <div class="subelement response"><code>int</code></div>
 </div></div>
@@ -766,7 +770,7 @@ the connection/database</h2>
 </div>
 <a name="%24conn" id="$conn"> </a><div class="element clickable property protected $conn" data-toggle="collapse" data-target=".$conn .collapse">
 <h2>Reference to the connection resource</h2>
-<pre>$conn </pre>
+<pre>$conn : resource</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
@@ -784,20 +788,20 @@ the connection/database</h2>
 </div>
 <a name="%24statement" id="$statement"> </a><div class="element clickable property protected $statement" data-toggle="collapse" data-target=".$statement .collapse">
 <h2>Reference to the last query executed</h2>
-<pre>$statement </pre>
+<pre>$statement : object</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24statement_link" id="$statement_link"> </a><div class="element clickable property protected $statement_link" data-toggle="collapse" data-target=".$statement_link .collapse">
 <h2>Reference to the resource returned by
 the last query executed</h2>
-<pre>$statement_link </pre>
+<pre>$statement_link : resource</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24trans" id="$trans"> </a><div class="element clickable property protected $trans" data-toggle="collapse" data-target=".$trans .collapse">
 <h2>Reference to the current transaction</h2>
-<pre>$trans </pre>
+<pre>$trans : resource</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
@@ -808,7 +812,7 @@ the last query executed</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Firebird_Result.html b/docs/classes/Firebird_Result.html
index ad10294..923e48b 100644
--- a/docs/classes/Firebird_Result.html
+++ b/docs/classes/Firebird_Result.html
@@ -85,7 +85,6 @@ the query</span><pre>__construct()</pre></a></li>
         </span><pre>getColumnMeta()</pre></a></li>
 <li class="method public "><a href="#nextRowset" title="nextRowset :: "><span class="description">nextRowset()
         </span><pre>nextRowset()</pre></a></li>
-<li class="method public "><a href="#num_rows" title="num_rows :: Return the number of rows for the select query"><span class="description">Return the number of rows for the select query</span><pre>num_rows()</pre></a></li>
 <li class="method public "><a href="#rowCount" title="rowCount :: Return the number of rows affected by the previous query"><span class="description">Return the number of rows affected by the previous query</span><pre>rowCount()</pre></a></li>
 <li class="method public "><a href="#setAttribute" title="setAttribute :: "><span class="description">setAttribute()
         </span><pre>setAttribute()</pre></a></li>
@@ -94,6 +93,8 @@ the query</span><pre>__construct()</pre></a></li>
 <li class="nav-header">
 <i class="icon-custom icon-property"></i> Properties</li>
 <li class="nav-header private">» Private</li>
+<li class="property private "><a href="#%24result" title="$result :: Data pulled from query"><span class="description">Data pulled from query</span><pre>$result</pre></a></li>
+<li class="property private "><a href="#%24row" title="$row :: Current row in result array"><span class="description">Current row in result array</span><pre>$row</pre></a></li>
 <li class="property private "><a href="#%24statement" title="$statement :: Reference to fbird resource"><span class="description">Reference to fbird resource</span><pre>$statement</pre></a></li>
 </ul>
 </div>
@@ -377,7 +378,7 @@ the query</h2>
 </div>
 <a name="fetchObject" id="fetchObject"></a><div class="element clickable method public fetchObject" data-toggle="collapse" data-target=".fetchObject .collapse">
 <h2>Emulate PDOStatement::fetchObject, but only for the default use</h2>
-<pre>fetchObject(string $class_name, array $ctor_args) : mixed</pre>
+<pre>fetchObject(string $class_name, array $ctor_args) : <a href="http://php.net/manual/en/class.stdclass.php">\stdClass</a></pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -391,7 +392,7 @@ the query</h2>
 <code>array</code>
 </div>
 <h3>Returns</h3>
-<div class="subelement response"><code>mixed</code></div>
+<div class="subelement response"><code><a href="http://php.net/manual/en/class.stdclass.php">\stdClass</a></code></div>
 </div></div>
 </div>
 <a name="getAttribute" id="getAttribute"></a><div class="element clickable method public getAttribute" data-toggle="collapse" data-target=".getAttribute .collapse">
@@ -433,16 +434,6 @@ the query</h2>
 </tr></table>
 </div></div>
 </div>
-<a name="num_rows" id="num_rows"></a><div class="element clickable method public num_rows" data-toggle="collapse" data-target=".num_rows .collapse">
-<h2>Return the number of rows for the select query</h2>
-<pre>num_rows() : int</pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<h3>Returns</h3>
-<div class="subelement response"><code>int</code></div>
-</div></div>
-</div>
 <a name="rowCount" id="rowCount"></a><div class="element clickable method public rowCount" data-toggle="collapse" data-target=".rowCount .collapse">
 <h2>Return the number of rows affected by the previous query</h2>
 <pre>rowCount() : int</pre>
@@ -481,9 +472,27 @@ the query</h2>
 </div>
 <h3>
 <i class="icon-custom icon-property"></i> Properties</h3>
+<a name="%24result" id="$result"> </a><div class="element clickable property private $result" data-toggle="collapse" data-target=".$result .collapse">
+<h2>Data pulled from query</h2>
+<pre>$result </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>param</th>
+<td>&lt;p&gt;mixed&lt;/p&gt;</td>
+</tr></table>
+</div></div>
+</div>
+<a name="%24row" id="$row"> </a><div class="element clickable property private $row" data-toggle="collapse" data-target=".$row .collapse">
+<h2>Current row in result array</h2>
+<pre>$row : int</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
+</div>
 <a name="%24statement" id="$statement"> </a><div class="element clickable property private $statement" data-toggle="collapse" data-target=".$statement .collapse">
 <h2>Reference to fbird resource</h2>
-<pre>$statement </pre>
+<pre>$statement : resource</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
@@ -494,7 +503,7 @@ the query</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Firebird_SQL.html b/docs/classes/Firebird_SQL.html
index e6f35ce..525e8b7 100644
--- a/docs/classes/Firebird_SQL.html
+++ b/docs/classes/Firebird_SQL.html
@@ -296,7 +296,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Firebird_Util.html b/docs/classes/Firebird_Util.html
index d524ac1..3b19fe7 100644
--- a/docs/classes/Firebird_Util.html
+++ b/docs/classes/Firebird_Util.html
@@ -211,7 +211,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/MySQL.html b/docs/classes/MySQL.html
index 0a93d52..ab4e967 100644
--- a/docs/classes/MySQL.html
+++ b/docs/classes/MySQL.html
@@ -96,7 +96,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
         </span><pre>inTransaction()</pre></a></li>
 <li class="method public inherited"><a href="#lastInsertId" title="lastInsertId :: "><span class="description">lastInsertId()
         </span><pre>lastInsertId()</pre></a></li>
-<li class="method public "><a href="#num_rows" title="num_rows :: Return the number of rows returned for a SELECT query"><span class="description">Return the number of rows returned for a SELECT query</span><pre>num_rows()</pre></a></li>
+<li class="method public inherited"><a href="#num_rows" title="num_rows :: Return the number of rows returned for a SELECT query"><span class="description">Return the number of rows returned for a SELECT query</span><pre>num_rows()</pre></a></li>
 <li class="method public inherited"><a href="#prepare" title="prepare :: "><span class="description">prepare()
         </span><pre>prepare()</pre></a></li>
 <li class="method public inherited"><a href="#prepare_execute" title="prepare_execute :: Create and execute a prepared statement with the provided parameters"><span class="description">Create and execute a prepared statement with the provided parameters</span><pre>prepare_execute()</pre></a></li>
@@ -576,9 +576,13 @@ the connection/database</h2>
 <a name="num_rows" id="num_rows"></a><div class="element clickable method public num_rows" data-toggle="collapse" data-target=".num_rows .collapse">
 <h2>Return the number of rows returned for a SELECT query</h2>
 <pre>num_rows() : int</pre>
-<div class="labels"></div>
+<div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>inherited_from</th>
+<td>\DB_PDO::num_rows()</td>
+</tr></table>
 <h3>Returns</h3>
 <div class="subelement response"><code>int</code></div>
 </div></div>
@@ -844,7 +848,7 @@ the connection/database</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/MySQL_SQL.html b/docs/classes/MySQL_SQL.html
index 9bf55e0..9751588 100644
--- a/docs/classes/MySQL_SQL.html
+++ b/docs/classes/MySQL_SQL.html
@@ -280,7 +280,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/MySQL_Util.html b/docs/classes/MySQL_Util.html
index f4b2b89..d0db5c1 100644
--- a/docs/classes/MySQL_Util.html
+++ b/docs/classes/MySQL_Util.html
@@ -207,7 +207,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/ODBC.html b/docs/classes/ODBC.html
index c91eabf..4a83a03 100644
--- a/docs/classes/ODBC.html
+++ b/docs/classes/ODBC.html
@@ -96,7 +96,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
         </span><pre>inTransaction()</pre></a></li>
 <li class="method public inherited"><a href="#lastInsertId" title="lastInsertId :: "><span class="description">lastInsertId()
         </span><pre>lastInsertId()</pre></a></li>
-<li class="method public "><a href="#num_rows" title="num_rows :: Return the number of rows returned for a SELECT query"><span class="description">Return the number of rows returned for a SELECT query</span><pre>num_rows()</pre></a></li>
+<li class="method public inherited"><a href="#num_rows" title="num_rows :: Return the number of rows returned for a SELECT query"><span class="description">Return the number of rows returned for a SELECT query</span><pre>num_rows()</pre></a></li>
 <li class="method public inherited"><a href="#prepare" title="prepare :: "><span class="description">prepare()
         </span><pre>prepare()</pre></a></li>
 <li class="method public inherited"><a href="#prepare_execute" title="prepare_execute :: Create and execute a prepared statement with the provided parameters"><span class="description">Create and execute a prepared statement with the provided parameters</span><pre>prepare_execute()</pre></a></li>
@@ -576,9 +576,13 @@ the connection/database</h2>
 <a name="num_rows" id="num_rows"></a><div class="element clickable method public num_rows" data-toggle="collapse" data-target=".num_rows .collapse">
 <h2>Return the number of rows returned for a SELECT query</h2>
 <pre>num_rows() : int</pre>
-<div class="labels"></div>
+<div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>inherited_from</th>
+<td>\DB_PDO::num_rows()</td>
+</tr></table>
 <h3>Returns</h3>
 <div class="subelement response"><code>int</code></div>
 </div></div>
@@ -846,7 +850,7 @@ the connection/database</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/ODBC_SQL.html b/docs/classes/ODBC_SQL.html
index 55b6532..6d274f6 100644
--- a/docs/classes/ODBC_SQL.html
+++ b/docs/classes/ODBC_SQL.html
@@ -280,7 +280,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/ODBC_Util.html b/docs/classes/ODBC_Util.html
index d96e5f8..bff92d2 100644
--- a/docs/classes/ODBC_Util.html
+++ b/docs/classes/ODBC_Util.html
@@ -202,7 +202,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/PgSQL.html b/docs/classes/PgSQL.html
index fd4a196..e25415f 100644
--- a/docs/classes/PgSQL.html
+++ b/docs/classes/PgSQL.html
@@ -96,7 +96,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
         </span><pre>inTransaction()</pre></a></li>
 <li class="method public inherited"><a href="#lastInsertId" title="lastInsertId :: "><span class="description">lastInsertId()
         </span><pre>lastInsertId()</pre></a></li>
-<li class="method public "><a href="#num_rows" title="num_rows :: Return the number of rows returned for a SELECT query"><span class="description">Return the number of rows returned for a SELECT query</span><pre>num_rows()</pre></a></li>
+<li class="method public inherited"><a href="#num_rows" title="num_rows :: Return the number of rows returned for a SELECT query"><span class="description">Return the number of rows returned for a SELECT query</span><pre>num_rows()</pre></a></li>
 <li class="method public inherited"><a href="#prepare" title="prepare :: "><span class="description">prepare()
         </span><pre>prepare()</pre></a></li>
 <li class="method public inherited"><a href="#prepare_execute" title="prepare_execute :: Create and execute a prepared statement with the provided parameters"><span class="description">Create and execute a prepared statement with the provided parameters</span><pre>prepare_execute()</pre></a></li>
@@ -572,9 +572,13 @@ the connection/database</h2>
 <a name="num_rows" id="num_rows"></a><div class="element clickable method public num_rows" data-toggle="collapse" data-target=".num_rows .collapse">
 <h2>Return the number of rows returned for a SELECT query</h2>
 <pre>num_rows() : int</pre>
-<div class="labels"></div>
+<div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>inherited_from</th>
+<td>\DB_PDO::num_rows()</td>
+</tr></table>
 <h3>Returns</h3>
 <div class="subelement response"><code>int</code></div>
 </div></div>
@@ -846,7 +850,7 @@ the connection/database</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/PgSQL_SQL.html b/docs/classes/PgSQL_SQL.html
index 2e8ef52..b2648a0 100644
--- a/docs/classes/PgSQL_SQL.html
+++ b/docs/classes/PgSQL_SQL.html
@@ -296,7 +296,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/PgSQL_Util.html b/docs/classes/PgSQL_Util.html
index 67de6f9..ecba724 100644
--- a/docs/classes/PgSQL_Util.html
+++ b/docs/classes/PgSQL_Util.html
@@ -207,7 +207,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Query_Builder.html b/docs/classes/Query_Builder.html
index d9e6d51..2943d59 100644
--- a/docs/classes/Query_Builder.html
+++ b/docs/classes/Query_Builder.html
@@ -1086,7 +1086,7 @@ for complex select queries</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/SQLite.html b/docs/classes/SQLite.html
index a048f12..a413eff 100644
--- a/docs/classes/SQLite.html
+++ b/docs/classes/SQLite.html
@@ -95,7 +95,7 @@ method if the database does not support 'TRUNCATE';</span><pre>empty_table()</pr
 <li class="method public inherited"><a href="#lastInsertId" title="lastInsertId :: "><span class="description">lastInsertId()
         </span><pre>lastInsertId()</pre></a></li>
 <li class="method public "><a href="#load_database" title="load_database :: Load a database for the current connection"><span class="description">Load a database for the current connection</span><pre>load_database()</pre></a></li>
-<li class="method public "><a href="#num_rows" title="num_rows :: Return the number of rows returned for a SELECT query"><span class="description">Return the number of rows returned for a SELECT query</span><pre>num_rows()</pre></a></li>
+<li class="method public inherited"><a href="#num_rows" title="num_rows :: Return the number of rows returned for a SELECT query"><span class="description">Return the number of rows returned for a SELECT query</span><pre>num_rows()</pre></a></li>
 <li class="method public inherited"><a href="#prepare" title="prepare :: "><span class="description">prepare()
         </span><pre>prepare()</pre></a></li>
 <li class="method public inherited"><a href="#prepare_execute" title="prepare_execute :: Create and execute a prepared statement with the provided parameters"><span class="description">Create and execute a prepared statement with the provided parameters</span><pre>prepare_execute()</pre></a></li>
@@ -580,9 +580,13 @@ method if the database does not support 'TRUNCATE';</h2>
 <a name="num_rows" id="num_rows"></a><div class="element clickable method public num_rows" data-toggle="collapse" data-target=".num_rows .collapse">
 <h2>Return the number of rows returned for a SELECT query</h2>
 <pre>num_rows() : int</pre>
-<div class="labels"></div>
+<div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>inherited_from</th>
+<td>\DB_PDO::num_rows()</td>
+</tr></table>
 <h3>Returns</h3>
 <div class="subelement response"><code>int</code></div>
 </div></div>
@@ -861,7 +865,7 @@ method if the database does not support 'TRUNCATE';</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/SQLite_SQL.html b/docs/classes/SQLite_SQL.html
index 36af013..da98d05 100644
--- a/docs/classes/SQLite_SQL.html
+++ b/docs/classes/SQLite_SQL.html
@@ -280,7 +280,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/SQLite_Util.html b/docs/classes/SQLite_Util.html
index 545abe8..485392a 100644
--- a/docs/classes/SQLite_Util.html
+++ b/docs/classes/SQLite_Util.html
@@ -207,7 +207,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Settings.html b/docs/classes/Settings.html
index 515884d..db920a6 100644
--- a/docs/classes/Settings.html
+++ b/docs/classes/Settings.html
@@ -243,7 +243,7 @@ directly - the settings should be safe!</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/deprecated.html b/docs/deprecated.html
index 94810d3..59e3469 100644
--- a/docs/deprecated.html
+++ b/docs/deprecated.html
@@ -66,7 +66,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/errors.html b/docs/errors.html
index c365598..449246f 100644
--- a/docs/errors.html
+++ b/docs/errors.html
@@ -92,7 +92,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/graph_class.html b/docs/graph_class.html
index 12f6398..2f9b96f 100644
--- a/docs/graph_class.html
+++ b/docs/graph_class.html
@@ -63,7 +63,7 @@
         </script><div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/markers.html b/docs/markers.html
index 05ea13e..2499abb 100644
--- a/docs/markers.html
+++ b/docs/markers.html
@@ -68,7 +68,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html
index e7b951e..b7fe931 100644
--- a/docs/namespaces/default.html
+++ b/docs/namespaces/default.html
@@ -282,7 +282,7 @@ instantiates the specific db driver</p>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/.html b/docs/packages/.html
index af8a4ed..caa2544 100644
--- a/docs/packages/.html
+++ b/docs/packages/.html
@@ -66,7 +66,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/Default.html b/docs/packages/Default.html
index 315b082..2c64cf8 100644
--- a/docs/packages/Default.html
+++ b/docs/packages/Default.html
@@ -93,7 +93,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/Query.Drivers.html b/docs/packages/Query.Drivers.html
index 4480de3..23443d2 100644
--- a/docs/packages/Query.Drivers.html
+++ b/docs/packages/Query.Drivers.html
@@ -210,7 +210,7 @@ data-fetching methods</p>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/Query.Helper Classes.html b/docs/packages/Query.Helper Classes.html
index b6462cd..4c1b5a9 100644
--- a/docs/packages/Query.Helper Classes.html	
+++ b/docs/packages/Query.Helper Classes.html	
@@ -96,7 +96,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/Query.Query.html b/docs/packages/Query.Query.html
index beb1499..bcbedb4 100644
--- a/docs/packages/Query.Query.html
+++ b/docs/packages/Query.Query.html
@@ -114,7 +114,7 @@ instantiates the specific db driver</p>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/Query.html b/docs/packages/Query.html
index 4390153..92998cf 100644
--- a/docs/packages/Query.html
+++ b/docs/packages/Query.html
@@ -315,7 +315,7 @@ instantiates the specific db driver</p>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-20T13:15:56-04:00.<br></footer></div>
+            generated on 2012-04-20T16:33:01-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/structure.xml b/docs/structure.xml
index 8c7b280..8470f51 100644
--- a/docs/structure.xml
+++ b/docs/structure.xml
@@ -510,7 +510,7 @@ directly - the settings should be safe!]]></description>
       </method>
     </class>
   </file>
-  <file path="classes/db_pdo.php" hash="1bfc5cb0636e76db6f3802ff732d1ea2" package="Query">
+  <file path="classes/db_pdo.php" hash="1c3c46d37444ad1465d98aa30a48c233" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -871,50 +871,50 @@ the connection/database]]></description>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="374" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="370" package="">
+        <name>num_rows</name>
+        <type>function</type>
+        <docblock line="365">
+          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="365" name="return" description="" type="int">
+            <type by_reference="false">int</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="388" package="">
         <name>truncate</name>
         <type>function</type>
-        <docblock line="367">
+        <docblock line="381">
           <description><![CDATA[Empty the passed table]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="367" name="param" description="" type="string" variable="$table">
+          <tag line="381" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="367" name="return" description="" type="void">
+          <tag line="381" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="374">
+        <argument line="388">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="381" package="">
-        <name>num_rows</name>
-        <type>function</type>
-        <docblock line="376">
-          <description><![CDATA[Return the number of rows for the last SELECT query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="376" name="return" description="" type="int">
-            <type by_reference="false">int</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="389" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="396" package="">
         <name>switch_db</name>
         <type>function</type>
-        <docblock line="383">
+        <docblock line="390">
           <description><![CDATA[Connect to a different database]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="383" name="param" description="" type="string" variable="$name">
+          <tag line="390" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="383" name="return" description="" type="void">
+          <tag line="390" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="389">
+        <argument line="396">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
@@ -2616,7 +2616,7 @@ with array_map and glob]]></description>
       </method>
     </class>
   </file>
-  <file path="drivers/pgsql/pgsql_driver.php" hash="919d2b14b31b9f65e01f481520267710" package="Query">
+  <file path="drivers/pgsql/pgsql_driver.php" hash="6c0a0c18134ae745f26ab4f02ccde45f" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -2709,23 +2709,12 @@ with array_map and glob]]></description>
         </argument>
       </method>
       <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="70" package="">
-        <name>num_rows</name>
-        <type>function</type>
-        <docblock line="65">
-          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="65" name="return" description="" type="int">
-            <type by_reference="false">int</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="82" package="">
         <name>get_schemas</name>
         <type>function</type>
-        <docblock line="77">
+        <docblock line="65">
           <description><![CDATA[Get a list of schemas for the current connection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="77" name="return" description="" type="array">
+          <tag line="65" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
@@ -3013,7 +3002,7 @@ with array_map and glob]]></description>
       </method>
     </class>
   </file>
-  <file path="drivers/odbc/odbc_driver.php" hash="9a75524ebaa886b116e74ab7572a1802" package="Query">
+  <file path="drivers/odbc/odbc_driver.php" hash="4eed99411477e5f649f464159f1976ef" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -3119,17 +3108,6 @@ with array_map and glob]]></description>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="78" package="">
-        <name>num_rows</name>
-        <type>function</type>
-        <docblock line="73">
-          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="73" name="return" description="" type="int">
-            <type by_reference="false">int</type>
-          </tag>
-        </docblock>
-      </method>
     </class>
   </file>
   <file path="drivers/mysql/mysql_util.php" hash="e6dbdd9b0b965f7e09ee0638ed4a7a35" package="Query">
@@ -3265,7 +3243,7 @@ with array_map and glob]]></description>
       </method>
     </class>
   </file>
-  <file path="drivers/mysql/mysql_driver.php" hash="73b96a679f7c6d0e2bde4bc65399f15c" package="Query">
+  <file path="drivers/mysql/mysql_driver.php" hash="c2864f80d57183bbea8b2ee75d4927d8" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -3368,17 +3346,6 @@ with array_map and glob]]></description>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="80" package="">
-        <name>num_rows</name>
-        <type>function</type>
-        <docblock line="75">
-          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="75" name="return" description="" type="int">
-            <type by_reference="false">int</type>
-          </tag>
-        </docblock>
-      </method>
     </class>
   </file>
   <file path="drivers/mysql/mysql_sql.php" hash="41d15ee4e1357bb84f07e71872252810" package="Query">
@@ -3670,7 +3637,7 @@ with array_map and glob]]></description>
       </method>
     </class>
   </file>
-  <file path="drivers/sqlite/sqlite_driver.php" hash="5f0f579f396c2dcce2f6165111279129" package="Query">
+  <file path="drivers/sqlite/sqlite_driver.php" hash="570c7de63389b318dcf037c7ecb41484" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -3824,17 +3791,6 @@ with array_map and glob]]></description>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="146" package="">
-        <name>num_rows</name>
-        <type>function</type>
-        <docblock line="141">
-          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="141" name="return" description="" type="int">
-            <type by_reference="false">int</type>
-          </tag>
-        </docblock>
-      </method>
     </class>
   </file>
   <file path="drivers/sqlite/sqlite_sql.php" hash="922f241976864c2452c65c2ebec32eda" package="Query">
@@ -4168,7 +4124,7 @@ with array_map and glob]]></description>
       </method>
     </class>
   </file>
-  <file path="drivers/firebird/firebird_result.php" hash="3a502465d028cdeb58a2b7722c3af66c" package="Query">
+  <file path="drivers/firebird/firebird_result.php" hash="d713425d6dc82a16618de449f0ef39f9" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -4189,350 +4145,362 @@ data-fetching methods]]></description>
         <tag line="16" name="package" description="Query"/>
         <tag line="16" name="subpackage" description="Drivers"/>
       </docblock>
-      <property final="false" static="false" visibility="private" line="28" package="Default">
+      <property final="false" static="false" visibility="private" line="30" package="Default">
         <name>$statement</name>
         <default><![CDATA[]]></default>
         <docblock line="25">
           <description><![CDATA[Reference to fbird resource]]></description>
           <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="36" package="">
-        <name>__construct</name>
-        <type>function</type>
-        <docblock line="30">
-          <description><![CDATA[Create the object by passing the resource for
-the query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="30" name="param" description="" type="resource" variable="$link">
+          <tag line="25" name="var" description="" type="resource">
             <type by_reference="false">resource</type>
           </tag>
         </docblock>
-        <argument line="36">
+      </property>
+      <property final="false" static="false" visibility="private" line="37" package="Default">
+        <name>$row</name>
+        <default><![CDATA[]]></default>
+        <docblock line="32">
+          <description><![CDATA[Current row in result array]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="32" name="var" description="" type="int">
+            <type by_reference="false">int</type>
+          </tag>
+        </docblock>
+      </property>
+      <property final="false" static="false" visibility="private" line="44" package="Default">
+        <name>$result</name>
+        <default><![CDATA[array()]]></default>
+        <docblock line="39">
+          <description><![CDATA[Data pulled from query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="39" name="param" description="mixed" type="" variable=""/>
+        </docblock>
+      </property>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="52" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="46">
+          <description><![CDATA[Create the object by passing the resource for
+the query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="46" name="param" description="" type="resource" variable="$link">
+            <type by_reference="false">resource</type>
+          </tag>
+        </docblock>
+        <argument line="52">
           <name>$link</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="54" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="83" package="">
         <name>bindColumn</name>
         <type>function</type>
-        <docblock line="44">
+        <docblock line="73">
           <description><![CDATA[Invalidate method for data consistency]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="44" name="param" description="" type="mixed" variable="$column">
+          <tag line="73" name="param" description="" type="mixed" variable="$column">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="44" name="param" description="&amp;$param" type="mixed" variable="$param">
+          <tag line="73" name="param" description="&amp;$param" type="mixed" variable="$param">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="44" name="param" description="" type="int" variable="$type">
+          <tag line="73" name="param" description="" type="int" variable="$type">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="44" name="param" description="" type="mixed" variable="$maxlen">
+          <tag line="73" name="param" description="" type="mixed" variable="$maxlen">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="44" name="param" description="" type="array" variable="$driverdata">
+          <tag line="73" name="param" description="" type="array" variable="$driverdata">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="44" name="return" description="" type="FALSE">
+          <tag line="73" name="return" description="" type="FALSE">
             <type by_reference="false">FALSE</type>
           </tag>
         </docblock>
-        <argument line="54">
+        <argument line="83">
           <name>$column</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="54">
+        <argument line="83">
           <name>$param</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="54">
+        <argument line="83">
           <name>$type</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
-        <argument line="54">
+        <argument line="83">
           <name>$maxlen</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
-        <argument line="54">
+        <argument line="83">
           <name>$driverdata</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="71" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="100" package="">
         <name>bindParam</name>
         <type>function</type>
-        <docblock line="61">
+        <docblock line="90">
           <description><![CDATA[Invalidate method for data consistency]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="61" name="param" description="" type="mixed" variable="$parameter">
+          <tag line="90" name="param" description="" type="mixed" variable="$parameter">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="61" name="param" description="&amp;$variable" type="mixed" variable="$variable">
+          <tag line="90" name="param" description="&amp;$variable" type="mixed" variable="$variable">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="61" name="param" description="" type="int" variable="$data_type">
+          <tag line="90" name="param" description="" type="int" variable="$data_type">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="61" name="param" description="" type="mixed" variable="$maxlen">
+          <tag line="90" name="param" description="" type="mixed" variable="$maxlen">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="61" name="param" description="" type="array" variable="$driverdata">
+          <tag line="90" name="param" description="" type="array" variable="$driverdata">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="61" name="return" description="" type="FALSE">
+          <tag line="90" name="return" description="" type="FALSE">
             <type by_reference="false">FALSE</type>
           </tag>
         </docblock>
-        <argument line="71">
+        <argument line="100">
           <name>$parameter</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="71">
+        <argument line="100">
           <name>$variable</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="71">
+        <argument line="100">
           <name>$data_type</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
-        <argument line="71">
+        <argument line="100">
           <name>$maxlen</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
-        <argument line="71">
+        <argument line="100">
           <name>$driverdata</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="86" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="115" package="">
         <name>bindValue</name>
         <type>function</type>
-        <docblock line="78">
+        <docblock line="107">
           <description><![CDATA[Invalidate method for data consistency]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="78" name="param" description="" type="mixed" variable="$parameter">
+          <tag line="107" name="param" description="" type="mixed" variable="$parameter">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="78" name="param" description="&amp;$variable" type="mixed" variable="$variable">
+          <tag line="107" name="param" description="&amp;$variable" type="mixed" variable="$variable">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="78" name="param" description="" type="int" variable="$data_type">
+          <tag line="107" name="param" description="" type="int" variable="$data_type">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="78" name="return" description="" type="FALSE">
+          <tag line="107" name="return" description="" type="FALSE">
             <type by_reference="false">FALSE</type>
           </tag>
         </docblock>
-        <argument line="86">
+        <argument line="115">
           <name>$parameter</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="86">
+        <argument line="115">
           <name>$variable</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="86">
+        <argument line="115">
           <name>$data_type</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="99" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="128" package="">
         <name>execute</name>
         <type>function</type>
-        <docblock line="93">
+        <docblock line="122">
           <description><![CDATA[Run a prepared statement query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="93" name="param" description="" type="array" variable="$args">
+          <tag line="122" name="param" description="" type="array" variable="$args">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="93" name="return" description="" type="bool">
+          <tag line="122" name="return" description="" type="bool">
             <type by_reference="false">bool</type>
           </tag>
         </docblock>
-        <argument line="99">
+        <argument line="128">
           <name>$args</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="122" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="151" package="">
         <name>fetch</name>
         <type>function</type>
-        <docblock line="114">
+        <docblock line="143">
           <description><![CDATA[Emulate PDO fetch public function]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="114" name="param" description="" type="int" variable="$fetch_style">
+          <tag line="143" name="param" description="" type="int" variable="$fetch_style">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="114" name="param" description="" type="mixed" variable="$statement">
+          <tag line="143" name="param" description="" type="mixed" variable="$statement">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="114" name="param" description="" type="mixed" variable="$offset">
+          <tag line="143" name="param" description="" type="mixed" variable="$offset">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="114" name="return" description="" type="mixed">
+          <tag line="143" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="122">
+        <argument line="151">
           <name>$fetch_style</name>
           <default><![CDATA[PDO::FETCH_ASSOC]]></default>
           <type/>
         </argument>
-        <argument line="122">
+        <argument line="151">
           <name>$statement</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
-        <argument line="122">
+        <argument line="151">
           <name>$offset</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="155" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="201" package="">
         <name>fetchAll</name>
         <type>function</type>
-        <docblock line="147">
+        <docblock line="193">
           <description><![CDATA[Emulate PDO fetchAll public function]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="147" name="param" description="" type="int" variable="$fetch_style">
+          <tag line="193" name="param" description="" type="int" variable="$fetch_style">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="147" name="param" description="" type="mixed" variable="$statement">
+          <tag line="193" name="param" description="" type="mixed" variable="$statement">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="147" name="param" description="" type="mixed" variable="$ctor_args">
+          <tag line="193" name="param" description="" type="mixed" variable="$ctor_args">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="147" name="return" description="" type="mixed">
+          <tag line="193" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="155">
+        <argument line="201">
           <name>$fetch_style</name>
           <default><![CDATA[PDO::FETCH_ASSOC]]></default>
           <type/>
         </argument>
-        <argument line="155">
+        <argument line="201">
           <name>$statement</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
-        <argument line="155">
+        <argument line="201">
           <name>$ctor_args</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="177" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="223" package="">
         <name>fetchColumn</name>
         <type>function</type>
-        <docblock line="171">
+        <docblock line="217">
           <description><![CDATA[Emulate PDOStatement::fetchColumn]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="171" name="param" description="" type="int" variable="$column_num">
+          <tag line="217" name="param" description="" type="int" variable="$column_num">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="171" name="return" description="" type="mixed">
+          <tag line="217" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="177">
+        <argument line="223">
           <name>$column_num</name>
           <default><![CDATA[0]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="192" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="238" package="">
         <name>fetchObject</name>
         <type>function</type>
-        <docblock line="185">
+        <docblock line="231">
           <description><![CDATA[Emulate PDOStatement::fetchObject, but only for the default use]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="185" name="param" description="" type="string" variable="$class_name">
+          <tag line="231" name="param" description="" type="string" variable="$class_name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="185" name="param" description="" type="array" variable="$ctor_args">
+          <tag line="231" name="param" description="" type="array" variable="$ctor_args">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="185" name="return" description="" type="mixed">
-            <type by_reference="false">mixed</type>
+          <tag line="231" name="return" description="" type="\stdClass">
+            <type by_reference="false">\stdClass</type>
           </tag>
         </docblock>
-        <argument line="192">
+        <argument line="238">
           <name>$class_name</name>
           <default><![CDATA['stdClass']]></default>
           <type/>
         </argument>
-        <argument line="192">
+        <argument line="238">
           <name>$ctor_args</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="204" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="250" package="">
         <name>rowCount</name>
         <type>function</type>
-        <docblock line="199">
+        <docblock line="245">
           <description><![CDATA[Return the number of rows affected by the previous query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="199" name="return" description="" type="int">
+          <tag line="245" name="return" description="" type="int">
             <type by_reference="false">int</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="216" package="">
-        <name>num_rows</name>
-        <type>function</type>
-        <docblock line="211">
-          <description><![CDATA[Return the number of rows for the select query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="211" name="return" description="" type="int">
-            <type by_reference="false">int</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="228" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="270" package="">
         <name>errorCode</name>
         <type>function</type>
-        <docblock line="223">
+        <docblock line="265">
           <description><![CDATA[Method to emulate PDOStatement->errorCode]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="223" name="return" description="" type="string">
+          <tag line="265" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="240" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="282" package="">
         <name>errorInfo</name>
         <type>function</type>
-        <docblock line="235">
+        <docblock line="277">
           <description><![CDATA[Method to emulate PDO->errorInfo / PDOStatement->errorInfo]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="235" name="return" description="" type="array">
+          <tag line="277" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
     </class>
   </file>
-  <file path="drivers/firebird/firebird_driver.php" hash="74d454b1d64da892fad7ac87ec2491f5" package="Query">
+  <file path="drivers/firebird/firebird_driver.php" hash="4f7e9df014cc1df6b92f09f815b9837d" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -4552,163 +4520,164 @@ the query]]></description>
         <tag line="16" name="package" description="Query"/>
         <tag line="16" name="subpackage" description="Drivers"/>
       </docblock>
-      <property final="false" static="false" visibility="protected" line="29" package="Default">
+      <property final="false" static="false" visibility="protected" line="31" package="Default">
         <name>$statement</name>
         <default><![CDATA[]]></default>
         <docblock line="26">
           <description><![CDATA[Reference to the last query executed]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="26" name="var" description="" type="object">
+            <type by_reference="false">object</type>
+          </tag>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="protected" line="35" package="Default">
+      <property final="false" static="false" visibility="protected" line="39" package="Default">
         <name>$statement_link</name>
         <default><![CDATA[]]></default>
-        <docblock line="31">
+        <docblock line="33">
           <description><![CDATA[Reference to the resource returned by
 the last query executed]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="33" name="var" description="" type="resource">
+            <type by_reference="false">resource</type>
+          </tag>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="protected" line="40" package="Default">
+      <property final="false" static="false" visibility="protected" line="46" package="Default">
         <name>$trans</name>
         <default><![CDATA[]]></default>
-        <docblock line="37">
+        <docblock line="41">
           <description><![CDATA[Reference to the current transaction]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="41" name="var" description="" type="resource">
+            <type by_reference="false">resource</type>
+          </tag>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="protected" line="45" package="Default">
+      <property final="false" static="false" visibility="protected" line="53" package="Default">
         <name>$conn</name>
         <default><![CDATA[]]></default>
-        <docblock line="42">
+        <docblock line="48">
           <description><![CDATA[Reference to the connection resource]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="48" name="var" description="" type="resource">
+            <type by_reference="false">resource</type>
+          </tag>
         </docblock>
       </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="54" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="62" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="47">
+        <docblock line="55">
           <description><![CDATA[Open the link to the database]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="47" name="param" description="" type="string" variable="$dbpath">
+          <tag line="55" name="param" description="" type="string" variable="$dbpath">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="47" name="param" description="" type="string" variable="$user">
+          <tag line="55" name="param" description="" type="string" variable="$user">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="47" name="param" description="" type="string" variable="$pass">
+          <tag line="55" name="param" description="" type="string" variable="$pass">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="54">
+        <argument line="62">
           <name>$dbpath</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="54">
+        <argument line="62">
           <name>$user</name>
           <default><![CDATA['sysdba']]></default>
           <type/>
         </argument>
-        <argument line="54">
+        <argument line="62">
           <name>$pass</name>
           <default><![CDATA['masterkey']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="87" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="95" package="">
         <name>switch_db</name>
         <type>function</type>
-        <docblock line="81">
+        <docblock line="89">
           <description><![CDATA[Doesn't apply to Firebird]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="81" name="param" description="" type="string" variable="$name">
+          <tag line="89" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="81" name="return" description="" type="FALSE">
+          <tag line="89" name="return" description="" type="FALSE">
             <type by_reference="false">FALSE</type>
           </tag>
         </docblock>
-        <argument line="87">
+        <argument line="95">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="99" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="107" package="">
         <name>truncate</name>
         <type>function</type>
-        <docblock line="94">
+        <docblock line="102">
           <description><![CDATA[Empty a database table]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="94" name="param" description="" type="string" variable="$table">
+          <tag line="102" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="99">
+        <argument line="107">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="114" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="122" package="">
         <name>query</name>
         <type>function</type>
-        <docblock line="108">
+        <docblock line="116">
           <description><![CDATA[Wrapper public function to better match PDO]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="108" name="param" description="" type="string" variable="$sql">
+          <tag line="116" name="param" description="" type="string" variable="$sql">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="108" name="return" description="" type="\$this">
+          <tag line="116" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="114">
+        <argument line="122">
           <name>$sql</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="138" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="148" package="">
         <name>prepare</name>
         <type>function</type>
-        <docblock line="131">
+        <docblock line="141">
           <description><![CDATA[Emulate PDO prepare]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="131" name="param" description="" type="string" variable="$query">
+          <tag line="141" name="param" description="" type="string" variable="$query">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="131" name="param" description="" type="array" variable="$options">
+          <tag line="141" name="param" description="" type="array" variable="$options">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="131" name="return" description="" type="\$this">
+          <tag line="141" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="138">
+        <argument line="148">
           <name>$query</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="138">
+        <argument line="148">
           <name>$options</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="158" package="">
-        <name>num_rows</name>
-        <type>function</type>
-        <docblock line="153">
-          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="153" name="return" description="" type="int">
-            <type by_reference="false">int</type>
-          </tag>
-        </docblock>
-      </method>
       <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="170" package="">
         <name>beginTransaction</name>
         <type>function</type>
diff --git a/drivers/firebird/firebird_driver.php b/drivers/firebird/firebird_driver.php
index 4b79eb5..5a7c359 100644
--- a/drivers/firebird/firebird_driver.php
+++ b/drivers/firebird/firebird_driver.php
@@ -25,22 +25,30 @@ class Firebird extends DB_PDO {
 
 	/**
 	 * Reference to the last query executed
+	 *
+	 * @var object
 	 */
 	protected $statement;
 	
 	/**
 	 * Reference to the resource returned by
 	 * the last query executed
+	 *
+	 * @var resource
 	 */
 	protected $statement_link;
 	
 	/**
 	 * Reference to the current transaction
+	 *
+	 * @var resource
 	 */
 	protected $trans; 
 	
 	/**
 	 * Reference to the connection resource
+	 *
+	 * @var resource
 	 */
 	protected $conn;
 
@@ -122,8 +130,10 @@ class Firebird extends DB_PDO {
 		{
 			throw new PDOException(fbird_errmsg());
 		}
+		
+		$this->statement = new FireBird_Result($this->statement_link);
 
-		return new FireBird_Result($this->statement_link);
+		return $this->statement;
 	}
 
 	// --------------------------------------------------------------------------
@@ -145,19 +155,9 @@ class Firebird extends DB_PDO {
 			throw new PDOException(fbird_errmsg());
 		}
 
-		return new FireBird_Result($this->statement_link);
-	}
+		$this->statement = new FireBird_Result($this->statement_link);
 
-	// --------------------------------------------------------------------------
-
-	/**
-	 * Return the number of rows returned for a SELECT query
-	 *
-	 * @return int
-	 */
-	public function num_rows()
-	{
-		return $this->statement->num_rows();
+		return $this->statement;
 	}
 
 	// --------------------------------------------------------------------------
@@ -215,7 +215,7 @@ class Firebird extends DB_PDO {
 		$query = $this->prepare($sql);
 
 		// Set the statement in the class variable for easy later access
-		$this->statement =& $query;
+		$this->statement_link =& $query;
 
 		return $query->execute($args);
 	}
diff --git a/drivers/firebird/firebird_result.php b/drivers/firebird/firebird_result.php
index 4935483..a333b2f 100644
--- a/drivers/firebird/firebird_result.php
+++ b/drivers/firebird/firebird_result.php
@@ -24,8 +24,24 @@ class Firebird_Result extends PDOStatement {
 
 	/**
 	 * Reference to fbird resource
+	 *
+	 * @var resource
 	 */
 	private $statement;
+	
+	/**
+	 * Current row in result array
+	 *
+	 * @var int
+	 */
+	private $row;
+	
+	/**
+	 * Data pulled from query
+	 *
+	 * @param mixed
+	 */
+	private $result = array();
 
 	/**
 	 * Create the object by passing the resource for
@@ -37,6 +53,19 @@ class Firebird_Result extends PDOStatement {
 	{
 		$this->statement = $link;
 		$this->setFetchMode(PDO::FETCH_ASSOC);
+		$this->row = -1;
+		$this->result = array();
+		
+		// Create the result array, so that we can get row counts
+		// Check the resource type, because prepared statements are "interbase query"
+		// but we only want "interbase result" types when attempting to fetch data
+		if (is_resource($link) && get_resource_type($link) === "interbase result")
+		{
+			while($row = ibase_fetch_assoc($link, IBASE_FETCH_BLOBS))
+			{
+				$this->result[] = $row;
+			}
+		}
 	}
 	
 	// --------------------------------------------------------------------------
@@ -125,21 +154,38 @@ class Firebird_Result extends PDOStatement {
 		{
 			$this->statement = $statement;
 		}
-
+		
+		// If there is no result, continue
+		if (empty($this->result))
+		{
+			return FALSE;
+		}
+		
+		// Keep track of the current row being fetched
+		++$this->row;
+		
+		// Return false if the next row doesn't exist
+		if ( ! isset($this->result[$this->row]))
+		{
+			return FALSE;
+		}
+		
 		switch($fetch_style)
 		{
 			case PDO::FETCH_OBJ:
-				return fbird_fetch_object($this->statement, IBASE_FETCH_BLOBS);
+				$row = (object) $this->result[$this->row];
 			break;
 
 			case PDO::FETCH_NUM:
-				return fbird_fetch_row($this->statement, IBASE_FETCH_BLOBS);
+				$row = array_values($this->result[$this->row]);
 			break;
 
 			default:
-				return fbird_fetch_assoc($this->statement, IBASE_FETCH_BLOBS);
+				$row = $this->result[$this->row];
 			break;
 		}
+		
+		return $row;
 	}
 
 	// --------------------------------------------------------------------------
@@ -187,7 +233,7 @@ class Firebird_Result extends PDOStatement {
 	 * 
 	 * @param string $class_name
 	 * @param array $ctor_args
-	 * @return mixed 
+	 * @return stdClass 
 	 */
 	public function fetchObject($class_name='stdClass', $ctor_args=array())
 	{
@@ -203,19 +249,15 @@ class Firebird_Result extends PDOStatement {
 	 */
 	public function rowCount()
 	{
-		return fbird_affected_rows();
-	}
-	
-	// --------------------------------------------------------------------------
-	
-	/**
-	 * Return the number of rows for the select query
-	 * 
-	 * @return int
-	 */
-	public function num_rows()
-	{
-		return count($this->fetchAll());
+		$rows = fbird_affected_rows();
+		
+		// Get the number of rows for the select query if you can
+		if ($rows === FALSE && is_resource($link) && get_resource_type($link) === "interbase result")
+		{
+			$rows = count($this->result);
+		}
+		
+		return $rows;
 	}
 	
 	// --------------------------------------------------------------------------
diff --git a/drivers/mysql/mysql_driver.php b/drivers/mysql/mysql_driver.php
index efa8d6d..9a26fb9 100644
--- a/drivers/mysql/mysql_driver.php
+++ b/drivers/mysql/mysql_driver.php
@@ -69,17 +69,5 @@ class MySQL extends DB_PDO {
 	{
 		$this->query("TRUNCATE `{$table}`");
 	}
-
-	// --------------------------------------------------------------------------
-
-	/**
-	 * Return the number of rows returned for a SELECT query
-	 *
-	 * @return int
-	 */
-	public function num_rows()
-	{
-		return isset($this->statement) ? $this->statement->rowCount() : FALSE;
-	}
 }
 //End of mysql_driver.php
\ No newline at end of file
diff --git a/drivers/odbc/odbc_driver.php b/drivers/odbc/odbc_driver.php
index ca7951c..f64ec7c 100644
--- a/drivers/odbc/odbc_driver.php
+++ b/drivers/odbc/odbc_driver.php
@@ -67,17 +67,5 @@ class ODBC extends DB_PDO {
 		$sql = "DELETE FROM {$table}";
 		$this->query($sql);
 	}
-
-	// --------------------------------------------------------------------------
-
-	/**
-	 * Return the number of rows returned for a SELECT query
-	 *
-	 * @return int
-	 */
-	public function num_rows()
-	{
-		// @TODO: Implement
-	}
 }
 // End of odbc_driver.php
\ No newline at end of file
diff --git a/drivers/pgsql/pgsql_driver.php b/drivers/pgsql/pgsql_driver.php
index 7a009be..f7d975f 100644
--- a/drivers/pgsql/pgsql_driver.php
+++ b/drivers/pgsql/pgsql_driver.php
@@ -62,18 +62,6 @@ class PgSQL extends DB_PDO {
 
 	// --------------------------------------------------------------------------
 
-	/**
-	 * Return the number of rows returned for a SELECT query
-	 *
-	 * @return int
-	 */
-	public function num_rows()
-	{
-		return (isset($this->statement)) ? $this->statement->rowCount() : FALSE;
-	}
-
-	// --------------------------------------------------------------------------
-
 	/**
 	 * Get a list of schemas for the current connection
 	 *
diff --git a/drivers/sqlite/sqlite_driver.php b/drivers/sqlite/sqlite_driver.php
index 8eb8556..719515a 100644
--- a/drivers/sqlite/sqlite_driver.php
+++ b/drivers/sqlite/sqlite_driver.php
@@ -135,17 +135,5 @@ SQL;
 
 		$this->statement->execute();
 	}
-
-	// --------------------------------------------------------------------------
-
-	/**
-	 * Return the number of rows returned for a SELECT query
-	 *
-	 * @return int
-	 */
-	public function num_rows()
-	{
-		return (isset($this->statement)) ? $this->statement->rowCount() : FALSE;
-	}
 }
 //End of sqlite_driver.php
\ No newline at end of file
diff --git a/tests/core/db_qb_test.php b/tests/core/db_qb_test.php
index a7ace5d..f7f1940 100644
--- a/tests/core/db_qb_test.php
+++ b/tests/core/db_qb_test.php
@@ -358,6 +358,13 @@ abstract class QBTest extends UnitTestCase {
 		$this->assertTrue(is_numeric($query));
 	}
 	
+	function TestNumRows()
+	{
+		$query = $this->db->get('create_test');
+		
+		$this->assertTrue(is_numeric($this->db->num_rows()));
+	}
+	
 }
 
 // End of db_qb_test.php
\ No newline at end of file
diff --git a/tests/databases/firebird/firebird-qb.php b/tests/databases/firebird/firebird-qb.php
index 99f2821..21225bc 100644
--- a/tests/databases/firebird/firebird-qb.php
+++ b/tests/databases/firebird/firebird-qb.php
@@ -34,5 +34,7 @@ class FirebirdQBTest extends QBTest {
 		$this->db = new Query_Builder($params);
 		
 		// echo '<hr /> Firebird Queries <hr />';
-	}	
+	}
+	
+		
 }
\ No newline at end of file
diff --git a/tests/db_files/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB
index 4191b49..fad34f9 100644
Binary files a/tests/db_files/FB_TEST_DB.FDB and b/tests/db_files/FB_TEST_DB.FDB differ