diff --git a/docs/classes.svg b/docs/classes.svg
index 46da555..924d2de 100644
--- a/docs/classes.svg
+++ b/docs/classes.svg
@@ -52,9 +52,24 @@
 <path fill="none" stroke="black" d="M244.421,-448C199.3,-448 128.295,-448 81.9376,-448"/>
 <polygon fill="none" stroke="black" points="81.8642,-444.5 71.8642,-448 81.8642,-451.5 81.8642,-444.5"/>
 </g>
+<!-- \\Query_Builder -->
+<g id="node5" class="node"><title>\\Query_Builder</title>
+<a xlink:href="classes.query_builder.html" xlink:title="Query_Builder" target="_parent">
+<polygon fill="none" stroke="black" points="636,-1168 532,-1168 532,-1132 636,-1132 636,-1168"/>
+<text text-anchor="middle" x="584" y="-1146.6" font-family="Courier,monospace" font-size="11.00">Query_Builder</text>
+</a>
+</g>
+<!-- \\DB_Util -->
+<g id="node6" class="node"><title>\\DB_Util</title>
+<a xlink:href="classes.db_util.html" xlink:title="«abstract»&lt;br/&gt;DB_Util" target="_parent">
+<polygon fill="none" stroke="black" points="329,-1006 245,-1006 245,-970 329,-970 329,-1006"/>
+<text text-anchor="start" x="253" y="-993.433" font-family="Courier,monospace" font-size="11.00">«abstract»</text>
+<text text-anchor="start" x="263" y="-980.233" font-family="Courier,monospace" font-size="11.00">DB_Util</text>
+</a>
+</g>
 <!-- \\BadDBDriverException -->
-<g id="node5" class="node"><title>\\BadDBDriverException</title>
-<a xlink:href="classes.query_builder.html" xlink:title="BadDBDriverException" target="_parent">
+<g id="node7" class="node"><title>\\BadDBDriverException</title>
+<a xlink:href="common.html" xlink:title="BadDBDriverException" target="_parent">
 <polygon fill="none" stroke="black" points="659,-304 509,-304 509,-268 659,-268 659,-304"/>
 <text text-anchor="middle" x="584" y="-282.6" font-family="Courier,monospace" font-size="11.00">BadDBDriverException</text>
 </a>
@@ -70,8 +85,8 @@
 <polygon fill="none" stroke="black" points="415.351,-136.174 404.768,-135.674 412.73,-142.664 415.351,-136.174"/>
 </g>
 <!-- \\BadConnectionException -->
-<g id="node6" class="node"><title>\\BadConnectionException</title>
-<a xlink:href="classes.query_builder.html" xlink:title="BadConnectionException" target="_parent">
+<g id="node8" class="node"><title>\\BadConnectionException</title>
+<a xlink:href="common.html" xlink:title="BadConnectionException" target="_parent">
 <polygon fill="none" stroke="black" points="666,-250 502,-250 502,-214 666,-214 666,-250"/>
 <text text-anchor="middle" x="584" y="-228.6" font-family="Courier,monospace" font-size="11.00">BadConnectionException</text>
 </a>
@@ -86,21 +101,6 @@
 <path fill="none" stroke="black" d="M516.365,-213.859C511.289,-211.277 506.428,-208.339 502,-205 456.528,-170.71 477.626,-130.229 430,-99 422.863,-94.32 415.119,-90.405 407.053,-87.1346"/>
 <polygon fill="none" stroke="black" points="408.047,-83.7705 397.454,-83.5843 405.619,-90.3358 408.047,-83.7705"/>
 </g>
-<!-- \\Query_Builder -->
-<g id="node7" class="node"><title>\\Query_Builder</title>
-<a xlink:href="classes.query_builder.html" xlink:title="Query_Builder" target="_parent">
-<polygon fill="none" stroke="black" points="636,-1060 532,-1060 532,-1024 636,-1024 636,-1060"/>
-<text text-anchor="middle" x="584" y="-1038.6" font-family="Courier,monospace" font-size="11.00">Query_Builder</text>
-</a>
-</g>
-<!-- \\DB_Util -->
-<g id="node8" class="node"><title>\\DB_Util</title>
-<a xlink:href="classes.db_util.html" xlink:title="«abstract»&lt;br/&gt;DB_Util" target="_parent">
-<polygon fill="none" stroke="black" points="329,-1006 245,-1006 245,-970 329,-970 329,-1006"/>
-<text text-anchor="start" x="253" y="-993.433" font-family="Courier,monospace" font-size="11.00">«abstract»</text>
-<text text-anchor="start" x="263" y="-980.233" font-family="Courier,monospace" font-size="11.00">DB_Util</text>
-</a>
-</g>
 <!-- \\PgSQL_SQL -->
 <g id="node9" class="node"><title>\\PgSQL_SQL</title>
 <a xlink:href="drivers.pgsql.pgsql_sql.html" xlink:title="PgSQL_SQL" target="_parent">
@@ -116,14 +116,14 @@
 <!-- \\PgSQL_Util -->
 <g id="node10" class="node"><title>\\PgSQL_Util</title>
 <a xlink:href="drivers.pgsql.pgsql_util.html" xlink:title="PgSQL_Util" target="_parent">
-<polygon fill="none" stroke="black" points="626,-1168 542,-1168 542,-1132 626,-1132 626,-1168"/>
-<text text-anchor="middle" x="584" y="-1146.6" font-family="Courier,monospace" font-size="11.00">PgSQL_Util</text>
+<polygon fill="none" stroke="black" points="626,-1114 542,-1114 542,-1078 626,-1078 626,-1114"/>
+<text text-anchor="middle" x="584" y="-1092.6" font-family="Courier,monospace" font-size="11.00">PgSQL_Util</text>
 </a>
 </g>
 <!-- \\PgSQL_Util&#45;&gt;\\DB_Util -->
 <g id="edge11" class="edge"><title>\\PgSQL_Util&#45;&gt;\\DB_Util</title>
-<path fill="none" stroke="black" d="M541.945,-1138.31C528.886,-1134.11 514.615,-1128.93 502,-1123 433.666,-1090.88 360.507,-1041.29 319.583,-1012"/>
-<polygon fill="none" stroke="black" points="321.513,-1009.08 311.353,-1006.07 317.421,-1014.76 321.513,-1009.08"/>
+<path fill="none" stroke="black" d="M541.747,-1082.47C528.941,-1078.26 514.862,-1073.54 502,-1069 446.048,-1049.26 382.529,-1025.11 339.128,-1008.34"/>
+<polygon fill="none" stroke="black" points="340.227,-1005.02 329.637,-1004.67 337.7,-1011.54 340.227,-1005.02"/>
 </g>
 <!-- \\PgSQL -->
 <g id="node11" class="node"><title>\\PgSQL</title>
@@ -140,14 +140,14 @@
 <!-- \\ODBC_Util -->
 <g id="node12" class="node"><title>\\ODBC_Util</title>
 <a xlink:href="drivers.odbc.odbc_util.html" xlink:title="ODBC_Util" target="_parent">
-<polygon fill="none" stroke="black" points="622,-1114 546,-1114 546,-1078 622,-1078 622,-1114"/>
-<text text-anchor="middle" x="584" y="-1092.6" font-family="Courier,monospace" font-size="11.00">ODBC_Util</text>
+<polygon fill="none" stroke="black" points="622,-1060 546,-1060 546,-1024 622,-1024 622,-1060"/>
+<text text-anchor="middle" x="584" y="-1038.6" font-family="Courier,monospace" font-size="11.00">ODBC_Util</text>
 </a>
 </g>
 <!-- \\ODBC_Util&#45;&gt;\\DB_Util -->
 <g id="edge15" class="edge"><title>\\ODBC_Util&#45;&gt;\\DB_Util</title>
-<path fill="none" stroke="black" d="M545.093,-1083.56C531.426,-1079.09 515.993,-1073.94 502,-1069 446.048,-1049.26 382.529,-1025.11 339.128,-1008.34"/>
-<polygon fill="none" stroke="black" points="340.227,-1005.02 329.637,-1004.67 337.7,-1011.54 340.227,-1005.02"/>
+<path fill="none" stroke="black" d="M545.477,-1035C492.953,-1025.45 398.67,-1008.3 339.653,-997.573"/>
+<polygon fill="none" stroke="black" points="340.244,-994.123 329.779,-995.778 338.991,-1001.01 340.244,-994.123"/>
 </g>
 <!-- \\ODBC_SQL -->
 <g id="node13" class="node"><title>\\ODBC_SQL</title>
diff --git a/docs/classes/BadConnectionException.html b/docs/classes/BadConnectionException.html
index 99024ec..4fea9e2 100644
--- a/docs/classes/BadConnectionException.html
+++ b/docs/classes/BadConnectionException.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -219,7 +219,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/BadDBDriverException.html b/docs/classes/BadDBDriverException.html
index 11e62dd..bd12ec1 100644
--- a/docs/classes/BadDBDriverException.html
+++ b/docs/classes/BadDBDriverException.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -219,7 +219,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/DB_PDO.html b/docs/classes/DB_PDO.html
index 2e62692..c85b7f9 100644
--- a/docs/classes/DB_PDO.html
+++ b/docs/classes/DB_PDO.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -111,6 +111,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
 <li class="method public "><a href="#quote" title="quote :: "><span class="description">quote()
         </span><pre>quote()</pre></a></li>
 <li class="method public "><a href="#quote_ident" title="quote_ident :: Surrounds the string with the databases identifier escape characters"><span class="description">Surrounds the string with the databases identifier escape characters</span><pre>quote_ident()</pre></a></li>
+<li class="method public "><a href="#quote_table" title="quote_table :: Quote database table name, and set prefix"><span class="description">Quote database table name, and set prefix</span><pre>quote_table()</pre></a></li>
 <li class="method public "><a href="#rollBack" title="rollBack :: "><span class="description">rollBack()
         </span><pre>rollBack()</pre></a></li>
 <li class="method public "><a href="#setAttribute" title="setAttribute :: "><span class="description">setAttribute()
@@ -118,15 +119,17 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
 <li class="method public "><a href="#switch_db" title="switch_db :: Connect to a different database"><span class="description">Connect to a different database</span><pre>switch_db()</pre></a></li>
 <li class="method public "><a href="#truncate" title="truncate :: Empty the passed table"><span class="description">Empty the passed table</span><pre>truncate()</pre></a></li>
 <li class="nav-header protected">» Protected</li>
+<li class="method protected "><a href="#_prefix" title="_prefix :: Sets the table prefix on the passed string"><span class="description">Sets the table prefix on the passed string</span><pre>_prefix()</pre></a></li>
 <li class="method protected "><a href="#_quote" title="_quote :: Helper method for quote_ident"><span class="description">Helper method for quote_ident</span><pre>_quote()</pre></a></li>
 <li class="nav-header">
 <i class="icon-custom icon-property"></i> Properties</li>
-<li class="property public "><a href="#%24last_query" title="$last_query :: Last query executed"><span class="description">Last query executed</span><pre>$last_query</pre></a></li>
-<li class="property public "><a href="#%24sql" title="$sql :: Reference to sql sub class"><span class="description">Reference to sql sub class</span><pre>$sql</pre></a></li>
-<li class="property public "><a href="#%24util" title="$util :: Reference to util sub class"><span class="description">Reference to util sub class</span><pre>$util</pre></a></li>
+<li class="property public "><a href="#%24last_query" title="$last_query :: "><span class="description">$last_query</span><pre>$last_query</pre></a></li>
+<li class="property public "><a href="#%24sql" title="$sql :: "><span class="description">$sql</span><pre>$sql</pre></a></li>
+<li class="property public "><a href="#%24table_prefix" title="$table_prefix :: "><span class="description">$table_prefix</span><pre>$table_prefix</pre></a></li>
+<li class="property public "><a href="#%24util" title="$util :: "><span class="description">$util</span><pre>$util</pre></a></li>
 <li class="nav-header protected">» Protected</li>
-<li class="property protected "><a href="#%24escape_char" title="$escape_char :: Character to escape identifiers"><span class="description">Character to escape identifiers</span><pre>$escape_char</pre></a></li>
-<li class="property protected "><a href="#%24statement" title="$statement :: Reference to the last executed query"><span class="description">Reference to the last executed query</span><pre>$statement</pre></a></li>
+<li class="property protected "><a href="#%24escape_char" title="$escape_char :: "><span class="description">$escape_char</span><pre>$escape_char</pre></a></li>
+<li class="property protected "><a href="#%24statement" title="$statement :: "><span class="description">$statement</span><pre>$statement</pre></a></li>
 </ul>
 </div>
 <div class="span8">
@@ -612,6 +615,21 @@ the connection/database</h2>
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
+<a name="quote_table" id="quote_table"></a><div class="element clickable method public quote_table" data-toggle="collapse" data-target=".quote_table .collapse">
+<h2>Quote database table name, and set prefix</h2>
+<pre>quote_table(mixed $table) : string</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$table</h4>
+<code>mixed</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a name="rollBack" id="rollBack"></a><div class="element clickable method public rollBack" data-toggle="collapse" data-target=".rollBack .collapse">
 <h2>rollBack()
         </h2>
@@ -664,6 +682,21 @@ the connection/database</h2>
 </div>
 </div></div>
 </div>
+<a name="_prefix" id="_prefix"></a><div class="element clickable method protected _prefix" data-toggle="collapse" data-target="._prefix .collapse">
+<h2>Sets the table prefix on the passed string</h2>
+<pre>_prefix(string $str) : string</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$str</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a name="_quote" id="_quote"></a><div class="element clickable method protected _quote" data-toggle="collapse" data-target="._quote .collapse">
 <h2>Helper method for quote_ident</h2>
 <pre>_quote(mixed $str) : mixed</pre>
@@ -682,32 +715,38 @@ the connection/database</h2>
 <h3>
 <i class="icon-custom icon-property"></i> Properties</h3>
 <a name="%24last_query" id="$last_query"> </a><div class="element clickable property public $last_query" data-toggle="collapse" data-target=".$last_query .collapse">
-<h2>Last query executed</h2>
-<pre>$last_query : string</pre>
+<h2>$last_query</h2>
+<pre>$last_query </pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24sql" id="$sql"> </a><div class="element clickable property public $sql" data-toggle="collapse" data-target=".$sql .collapse">
-<h2>Reference to sql sub class</h2>
-<pre>$sql : Object</pre>
+<h2>$sql</h2>
+<pre>$sql </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
+</div>
+<a name="%24table_prefix" id="$table_prefix"> </a><div class="element clickable property public $table_prefix" data-toggle="collapse" data-target=".$table_prefix .collapse">
+<h2>$table_prefix</h2>
+<pre>$table_prefix </pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24util" id="$util"> </a><div class="element clickable property public $util" data-toggle="collapse" data-target=".$util .collapse">
-<h2>Reference to util sub class</h2>
-<pre>$util : Object</pre>
+<h2>$util</h2>
+<pre>$util </pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24escape_char" id="$escape_char"> </a><div class="element clickable property protected $escape_char" data-toggle="collapse" data-target=".$escape_char .collapse">
-<h2>Character to escape identifiers</h2>
-<pre>$escape_char : string</pre>
+<h2>$escape_char</h2>
+<pre>$escape_char </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 protected $statement" data-toggle="collapse" data-target=".$statement .collapse">
-<h2>Reference to the last executed query</h2>
-<pre>$statement : mixed</pre>
+<h2>$statement</h2>
+<pre>$statement </pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
@@ -718,7 +757,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/DB_SQL.html b/docs/classes/DB_SQL.html
index ec81cf4..6e2609d 100644
--- a/docs/classes/DB_SQL.html
+++ b/docs/classes/DB_SQL.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -58,20 +58,15 @@
 <ul class="side-nav nav nav-list">
 <li class="nav-header">
 <i class="icon-custom icon-method"></i> Methods</li>
-<li class="method public "><a href="#avg" title="avg :: Get the 'average' keyword"><span class="description">Get the 'average' keyword</span><pre>avg()</pre></a></li>
 <li class="method public "><a href="#column_list" title="column_list :: Get information about the columns in the
 specified table"><span class="description">Get information about the columns in the
 specified table</span><pre>column_list()</pre></a></li>
 <li class="method public "><a href="#db_list" title="db_list :: Returns sql to list other databases"><span class="description">Returns sql to list other databases</span><pre>db_list()</pre></a></li>
-<li class="method public "><a href="#distinct" title="distinct :: Get the 'distinct' keyword"><span class="description">Get the 'distinct' keyword</span><pre>distinct()</pre></a></li>
 <li class="method public "><a href="#function_list" title="function_list :: Return sql to list functions"><span class="description">Return sql to list functions</span><pre>function_list()</pre></a></li>
 <li class="method public "><a href="#limit" title="limit :: Get database specific sql for limit clause"><span class="description">Get database specific sql for limit clause</span><pre>limit()</pre></a></li>
-<li class="method public "><a href="#max" title="max :: Get the max keyword sql"><span class="description">Get the max keyword sql</span><pre>max()</pre></a></li>
-<li class="method public "><a href="#min" title="min :: Get the min keyword sql"><span class="description">Get the min keyword sql</span><pre>min()</pre></a></li>
 <li class="method public "><a href="#procedure_list" title="procedure_list :: Return sql to list stored procedures"><span class="description">Return sql to list stored procedures</span><pre>procedure_list()</pre></a></li>
 <li class="method public "><a href="#random" title="random :: Get the sql for random ordering"><span class="description">Get the sql for random ordering</span><pre>random()</pre></a></li>
 <li class="method public "><a href="#sequence_list" title="sequence_list :: Return sql to list sequences"><span class="description">Return sql to list sequences</span><pre>sequence_list()</pre></a></li>
-<li class="method public "><a href="#sum" title="sum :: Get the 'sum' keyword"><span class="description">Get the 'sum' keyword</span><pre>sum()</pre></a></li>
 <li class="method public "><a href="#system_table_list" title="system_table_list :: Returns sql to list system tables"><span class="description">Returns sql to list system tables</span><pre>system_table_list()</pre></a></li>
 <li class="method public "><a href="#table_list" title="table_list :: Returns sql to list tables"><span class="description">Returns sql to list tables</span><pre>table_list()</pre></a></li>
 <li class="method public "><a href="#trigger_list" title="trigger_list :: Returns sql to list triggers"><span class="description">Returns sql to list triggers</span><pre>trigger_list()</pre></a></li>
@@ -96,16 +91,6 @@ specified table</span><pre>column_list()</pre></a></li>
 </table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
-<a name="avg" id="avg"></a><div class="element clickable method public avg" data-toggle="collapse" data-target=".avg .collapse">
-<h2>Get the 'average' keyword</h2>
-<pre>avg() : string</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>string</code></div>
-</div></div>
-</div>
 <a name="column_list" id="column_list"></a><div class="element clickable method public column_list" data-toggle="collapse" data-target=".column_list .collapse">
 <h2>Get information about the columns in the
 specified table</h2>
@@ -131,16 +116,6 @@ specified table</h2>
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
-<a name="distinct" id="distinct"></a><div class="element clickable method public distinct" data-toggle="collapse" data-target=".distinct .collapse">
-<h2>Get the 'distinct' keyword</h2>
-<pre>distinct() : string</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>string</code></div>
-</div></div>
-</div>
 <a name="function_list" id="function_list"></a><div class="element clickable method public function_list" data-toggle="collapse" data-target=".function_list .collapse">
 <h2>Return sql to list functions</h2>
 <pre>function_list() : FALSE</pre>
@@ -178,26 +153,6 @@ specified table</h2>
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
-<a name="max" id="max"></a><div class="element clickable method public max" data-toggle="collapse" data-target=".max .collapse">
-<h2>Get the max keyword sql</h2>
-<pre>max() : string</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>string</code></div>
-</div></div>
-</div>
-<a name="min" id="min"></a><div class="element clickable method public min" data-toggle="collapse" data-target=".min .collapse">
-<h2>Get the min keyword sql</h2>
-<pre>min() : string</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>string</code></div>
-</div></div>
-</div>
 <a name="procedure_list" id="procedure_list"></a><div class="element clickable method public procedure_list" data-toggle="collapse" data-target=".procedure_list .collapse">
 <h2>Return sql to list stored procedures</h2>
 <pre>procedure_list() : string</pre>
@@ -232,16 +187,6 @@ specified table</h2>
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
-<a name="sum" id="sum"></a><div class="element clickable method public sum" data-toggle="collapse" data-target=".sum .collapse">
-<h2>Get the 'sum' keyword</h2>
-<pre>sum() : string</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>string</code></div>
-</div></div>
-</div>
 <a name="system_table_list" id="system_table_list"></a><div class="element clickable method public system_table_list" data-toggle="collapse" data-target=".system_table_list .collapse">
 <h2>Returns sql to list system tables</h2>
 <pre>system_table_list() : string</pre>
@@ -299,7 +244,7 @@ specified table</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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/DB_Util.html b/docs/classes/DB_Util.html
index db3e611..cce0f65 100644
--- a/docs/classes/DB_Util.html
+++ b/docs/classes/DB_Util.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -210,7 +210,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Firebird.html b/docs/classes/Firebird.html
index d3eb66e..39cefbc 100644
--- a/docs/classes/Firebird.html
+++ b/docs/classes/Firebird.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -104,21 +104,24 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
 <li class="method public "><a href="#query" title="query :: Wrapper public function to better match PDO"><span class="description">Wrapper public function to better match PDO</span><pre>query()</pre></a></li>
 <li class="method public "><a href="#quote" title="quote :: Method to emulate PDO-&gt;quote"><span class="description">Method to emulate PDO-&gt;quote</span><pre>quote()</pre></a></li>
 <li class="method public inherited"><a href="#quote_ident" title="quote_ident :: Surrounds the string with the databases identifier escape characters"><span class="description">Surrounds the string with the databases identifier escape characters</span><pre>quote_ident()</pre></a></li>
+<li class="method public inherited"><a href="#quote_table" title="quote_table :: Quote database table name, and set prefix"><span class="description">Quote database table name, and set prefix</span><pre>quote_table()</pre></a></li>
 <li class="method public "><a href="#rollBack" title="rollBack :: Rollback a transaction"><span class="description">Rollback a transaction</span><pre>rollBack()</pre></a></li>
 <li class="method public inherited"><a href="#setAttribute" title="setAttribute :: "><span class="description">setAttribute()
         </span><pre>setAttribute()</pre></a></li>
 <li class="method public "><a href="#switch_db" title="switch_db :: Doesn't apply to Firebird"><span class="description">Doesn't apply to Firebird</span><pre>switch_db()</pre></a></li>
 <li class="method public "><a href="#truncate" title="truncate :: Empty a database table"><span class="description">Empty a database table</span><pre>truncate()</pre></a></li>
 <li class="nav-header protected">» Protected</li>
+<li class="method protected inherited"><a href="#_prefix" title="_prefix :: Sets the table prefix on the passed string"><span class="description">Sets the table prefix on the passed string</span><pre>_prefix()</pre></a></li>
 <li class="method protected inherited"><a href="#_quote" title="_quote :: Helper method for quote_ident"><span class="description">Helper method for quote_ident</span><pre>_quote()</pre></a></li>
 <li class="nav-header">
 <i class="icon-custom icon-property"></i> Properties</li>
-<li class="property public inherited"><a href="#%24last_query" title="$last_query :: Last query executed"><span class="description">Last query executed</span><pre>$last_query</pre></a></li>
-<li class="property public inherited"><a href="#%24sql" title="$sql :: Reference to sql sub class"><span class="description">Reference to sql sub class</span><pre>$sql</pre></a></li>
-<li class="property public inherited"><a href="#%24util" title="$util :: Reference to util sub class"><span class="description">Reference to util sub class</span><pre>$util</pre></a></li>
+<li class="property public inherited"><a href="#%24last_query" title="$last_query :: "><span class="description">$last_query</span><pre>$last_query</pre></a></li>
+<li class="property public inherited"><a href="#%24sql" title="$sql :: "><span class="description">$sql</span><pre>$sql</pre></a></li>
+<li class="property public inherited"><a href="#%24table_prefix" title="$table_prefix :: "><span class="description">$table_prefix</span><pre>$table_prefix</pre></a></li>
+<li class="property public inherited"><a href="#%24util" title="$util :: "><span class="description">$util</span><pre>$util</pre></a></li>
 <li class="nav-header protected">» Protected</li>
 <li class="property protected "><a href="#%24conn" title="$conn :: Reference to the connection resource"><span class="description">Reference to the connection resource</span><pre>$conn</pre></a></li>
-<li class="property protected inherited"><a href="#%24escape_char" title="$escape_char :: Character to escape identifiers"><span class="description">Character to escape identifiers</span><pre>$escape_char</pre></a></li>
+<li class="property protected inherited"><a href="#%24escape_char" title="$escape_char :: "><span class="description">$escape_char</span><pre>$escape_char</pre></a></li>
 <li class="property protected "><a href="#%24statement" title="$statement :: Reference to the last query executed"><span class="description">Reference to the last query executed</span><pre>$statement</pre></a></li>
 <li class="property protected "><a href="#%24statement_link" title="$statement_link :: Reference to the resource returned by
 the last query executed"><span class="description">Reference to the resource returned by
@@ -730,6 +733,25 @@ the connection/database</h2>
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
+<a name="quote_table" id="quote_table"></a><div class="element clickable method public quote_table" data-toggle="collapse" data-target=".quote_table .collapse">
+<h2>Quote database table name, and set prefix</h2>
+<pre>quote_table(mixed $table) : string</pre>
+<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::quote_table()</td>
+</tr></table>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$table</h4>
+<code>mixed</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a name="rollBack" id="rollBack"></a><div class="element clickable method public rollBack" data-toggle="collapse" data-target=".rollBack .collapse">
 <h2>Rollback a transaction</h2>
 <pre>rollBack() : bool</pre>
@@ -787,6 +809,25 @@ the connection/database</h2>
 </div>
 </div></div>
 </div>
+<a name="_prefix" id="_prefix"></a><div class="element clickable method protected _prefix" data-toggle="collapse" data-target="._prefix .collapse">
+<h2>Sets the table prefix on the passed string</h2>
+<pre>_prefix(string $str) : string</pre>
+<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::_prefix()</td>
+</tr></table>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$str</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a name="_quote" id="_quote"></a><div class="element clickable method protected _quote" data-toggle="collapse" data-target="._quote .collapse">
 <h2>Helper method for quote_ident</h2>
 <pre>_quote(mixed $str) : mixed</pre>
@@ -809,8 +850,8 @@ the connection/database</h2>
 <h3>
 <i class="icon-custom icon-property"></i> Properties</h3>
 <a name="%24last_query" id="$last_query"> </a><div class="element clickable property public $last_query" data-toggle="collapse" data-target=".$last_query .collapse">
-<h2>Last query executed</h2>
-<pre>$last_query : string</pre>
+<h2>$last_query</h2>
+<pre>$last_query </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -821,8 +862,8 @@ the connection/database</h2>
 </div></div>
 </div>
 <a name="%24sql" id="$sql"> </a><div class="element clickable property public $sql" data-toggle="collapse" data-target=".$sql .collapse">
-<h2>Reference to sql sub class</h2>
-<pre>$sql : Object</pre>
+<h2>$sql</h2>
+<pre>$sql </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -832,9 +873,21 @@ the connection/database</h2>
 </tr></table>
 </div></div>
 </div>
+<a name="%24table_prefix" id="$table_prefix"> </a><div class="element clickable property public $table_prefix" data-toggle="collapse" data-target=".$table_prefix .collapse">
+<h2>$table_prefix</h2>
+<pre>$table_prefix </pre>
+<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::$$table_prefix</td>
+</tr></table>
+</div></div>
+</div>
 <a name="%24util" id="$util"> </a><div class="element clickable property public $util" data-toggle="collapse" data-target=".$util .collapse">
-<h2>Reference to util sub class</h2>
-<pre>$util : Object</pre>
+<h2>$util</h2>
+<pre>$util </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -851,8 +904,8 @@ the connection/database</h2>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24escape_char" id="$escape_char"> </a><div class="element clickable property protected $escape_char" data-toggle="collapse" data-target=".$escape_char .collapse">
-<h2>Character to escape identifiers</h2>
-<pre>$escape_char : string</pre>
+<h2>$escape_char</h2>
+<pre>$escape_char </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -888,7 +941,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Firebird_Result.html b/docs/classes/Firebird_Result.html
index 29dedec..2ff2be4 100644
--- a/docs/classes/Firebird_Result.html
+++ b/docs/classes/Firebird_Result.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -505,7 +505,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Firebird_SQL.html b/docs/classes/Firebird_SQL.html
index 385f1b3..3bd5556 100644
--- a/docs/classes/Firebird_SQL.html
+++ b/docs/classes/Firebird_SQL.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -58,18 +58,13 @@
 <ul class="side-nav nav nav-list">
 <li class="nav-header">
 <i class="icon-custom icon-method"></i> Methods</li>
-<li class="method public inherited"><a href="#avg" title="avg :: Get the 'average' keyword"><span class="description">Get the 'average' keyword</span><pre>avg()</pre></a></li>
 <li class="method public "><a href="#column_list" title="column_list :: Return sql to list columns of the specified table"><span class="description">Return sql to list columns of the specified table</span><pre>column_list()</pre></a></li>
 <li class="method public "><a href="#db_list" title="db_list :: Returns sql to list other databases"><span class="description">Returns sql to list other databases</span><pre>db_list()</pre></a></li>
-<li class="method public inherited"><a href="#distinct" title="distinct :: Get the 'distinct' keyword"><span class="description">Get the 'distinct' keyword</span><pre>distinct()</pre></a></li>
 <li class="method public "><a href="#function_list" title="function_list :: Return sql to list functions"><span class="description">Return sql to list functions</span><pre>function_list()</pre></a></li>
 <li class="method public "><a href="#limit" title="limit :: Limit clause"><span class="description">Limit clause</span><pre>limit()</pre></a></li>
-<li class="method public inherited"><a href="#max" title="max :: Get the max keyword sql"><span class="description">Get the max keyword sql</span><pre>max()</pre></a></li>
-<li class="method public inherited"><a href="#min" title="min :: Get the min keyword sql"><span class="description">Get the min keyword sql</span><pre>min()</pre></a></li>
 <li class="method public "><a href="#procedure_list" title="procedure_list :: Return sql to list stored procedures"><span class="description">Return sql to list stored procedures</span><pre>procedure_list()</pre></a></li>
 <li class="method public "><a href="#random" title="random :: Random ordering keyword"><span class="description">Random ordering keyword</span><pre>random()</pre></a></li>
 <li class="method public "><a href="#sequence_list" title="sequence_list :: Return sql to list sequences"><span class="description">Return sql to list sequences</span><pre>sequence_list()</pre></a></li>
-<li class="method public inherited"><a href="#sum" title="sum :: Get the 'sum' keyword"><span class="description">Get the 'sum' keyword</span><pre>sum()</pre></a></li>
 <li class="method public "><a href="#system_table_list" title="system_table_list :: Returns sql to list system tables"><span class="description">Returns sql to list system tables</span><pre>system_table_list()</pre></a></li>
 <li class="method public "><a href="#table_list" title="table_list :: Returns sql to list tables"><span class="description">Returns sql to list tables</span><pre>table_list()</pre></a></li>
 <li class="method public "><a href="#trigger_list" title="trigger_list :: Returns sql to list triggers"><span class="description">Returns sql to list triggers</span><pre>trigger_list()</pre></a></li>
@@ -94,20 +89,6 @@
 </table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
-<a name="avg" id="avg"></a><div class="element clickable method public avg" data-toggle="collapse" data-target=".avg .collapse">
-<h2>Get the 'average' keyword</h2>
-<pre>avg() : string</pre>
-<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_SQL::avg()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="column_list" id="column_list"></a><div class="element clickable method public column_list" data-toggle="collapse" data-target=".column_list .collapse">
 <h2>Return sql to list columns of the specified table</h2>
 <pre>column_list(string $table) : string</pre>
@@ -133,20 +114,6 @@
 <div class="subelement response"><code>FALSE</code></div>
 </div></div>
 </div>
-<a name="distinct" id="distinct"></a><div class="element clickable method public distinct" data-toggle="collapse" data-target=".distinct .collapse">
-<h2>Get the 'distinct' keyword</h2>
-<pre>distinct() : string</pre>
-<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_SQL::distinct()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="function_list" id="function_list"></a><div class="element clickable method public function_list" data-toggle="collapse" data-target=".function_list .collapse">
 <h2>Return sql to list functions</h2>
 <pre>function_list() : string</pre>
@@ -180,34 +147,6 @@
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
-<a name="max" id="max"></a><div class="element clickable method public max" data-toggle="collapse" data-target=".max .collapse">
-<h2>Get the max keyword sql</h2>
-<pre>max() : string</pre>
-<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_SQL::max()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
-<a name="min" id="min"></a><div class="element clickable method public min" data-toggle="collapse" data-target=".min .collapse">
-<h2>Get the min keyword sql</h2>
-<pre>min() : string</pre>
-<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_SQL::min()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="procedure_list" id="procedure_list"></a><div class="element clickable method public procedure_list" data-toggle="collapse" data-target=".procedure_list .collapse">
 <h2>Return sql to list stored procedures</h2>
 <pre>procedure_list() : string</pre>
@@ -238,20 +177,6 @@
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
-<a name="sum" id="sum"></a><div class="element clickable method public sum" data-toggle="collapse" data-target=".sum .collapse">
-<h2>Get the 'sum' keyword</h2>
-<pre>sum() : string</pre>
-<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_SQL::sum()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="system_table_list" id="system_table_list"></a><div class="element clickable method public system_table_list" data-toggle="collapse" data-target=".system_table_list .collapse">
 <h2>Returns sql to list system tables</h2>
 <pre>system_table_list() : string</pre>
@@ -309,7 +234,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Firebird_Util.html b/docs/classes/Firebird_Util.html
index ce2fb28..e71da33 100644
--- a/docs/classes/Firebird_Util.html
+++ b/docs/classes/Firebird_Util.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -213,7 +213,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/MySQL.html b/docs/classes/MySQL.html
index e625330..7be84e2 100644
--- a/docs/classes/MySQL.html
+++ b/docs/classes/MySQL.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -111,6 +111,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
 <li class="method public inherited"><a href="#quote" title="quote :: "><span class="description">quote()
         </span><pre>quote()</pre></a></li>
 <li class="method public inherited"><a href="#quote_ident" title="quote_ident :: Surrounds the string with the databases identifier escape characters"><span class="description">Surrounds the string with the databases identifier escape characters</span><pre>quote_ident()</pre></a></li>
+<li class="method public inherited"><a href="#quote_table" title="quote_table :: Quote database table name, and set prefix"><span class="description">Quote database table name, and set prefix</span><pre>quote_table()</pre></a></li>
 <li class="method public inherited"><a href="#rollBack" title="rollBack :: "><span class="description">rollBack()
         </span><pre>rollBack()</pre></a></li>
 <li class="method public inherited"><a href="#setAttribute" title="setAttribute :: "><span class="description">setAttribute()
@@ -118,15 +119,17 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
 <li class="method public "><a href="#switch_db" title="switch_db :: Connect to a different database"><span class="description">Connect to a different database</span><pre>switch_db()</pre></a></li>
 <li class="method public "><a href="#truncate" title="truncate :: Empty a table"><span class="description">Empty a table</span><pre>truncate()</pre></a></li>
 <li class="nav-header protected">» Protected</li>
+<li class="method protected inherited"><a href="#_prefix" title="_prefix :: Sets the table prefix on the passed string"><span class="description">Sets the table prefix on the passed string</span><pre>_prefix()</pre></a></li>
 <li class="method protected inherited"><a href="#_quote" title="_quote :: Helper method for quote_ident"><span class="description">Helper method for quote_ident</span><pre>_quote()</pre></a></li>
 <li class="nav-header">
 <i class="icon-custom icon-property"></i> Properties</li>
-<li class="property public inherited"><a href="#%24last_query" title="$last_query :: Last query executed"><span class="description">Last query executed</span><pre>$last_query</pre></a></li>
-<li class="property public inherited"><a href="#%24sql" title="$sql :: Reference to sql sub class"><span class="description">Reference to sql sub class</span><pre>$sql</pre></a></li>
-<li class="property public inherited"><a href="#%24util" title="$util :: Reference to util sub class"><span class="description">Reference to util sub class</span><pre>$util</pre></a></li>
+<li class="property public inherited"><a href="#%24last_query" title="$last_query :: "><span class="description">$last_query</span><pre>$last_query</pre></a></li>
+<li class="property public inherited"><a href="#%24sql" title="$sql :: "><span class="description">$sql</span><pre>$sql</pre></a></li>
+<li class="property public inherited"><a href="#%24table_prefix" title="$table_prefix :: "><span class="description">$table_prefix</span><pre>$table_prefix</pre></a></li>
+<li class="property public inherited"><a href="#%24util" title="$util :: "><span class="description">$util</span><pre>$util</pre></a></li>
 <li class="nav-header protected">» Protected</li>
 <li class="property protected "><a href="#%24escape_char" title="$escape_char :: Set the backtick as the MySQL escape character"><span class="description">Set the backtick as the MySQL escape character</span><pre>$escape_char</pre></a></li>
-<li class="property protected inherited"><a href="#%24statement" title="$statement :: Reference to the last executed query"><span class="description">Reference to the last executed query</span><pre>$statement</pre></a></li>
+<li class="property protected inherited"><a href="#%24statement" title="$statement :: "><span class="description">$statement</span><pre>$statement</pre></a></li>
 </ul>
 </div>
 <div class="span8">
@@ -778,6 +781,25 @@ the connection/database</h2>
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
+<a name="quote_table" id="quote_table"></a><div class="element clickable method public quote_table" data-toggle="collapse" data-target=".quote_table .collapse">
+<h2>Quote database table name, and set prefix</h2>
+<pre>quote_table(mixed $table) : string</pre>
+<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::quote_table()</td>
+</tr></table>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$table</h4>
+<code>mixed</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a name="rollBack" id="rollBack"></a><div class="element clickable method public rollBack" data-toggle="collapse" data-target=".rollBack .collapse">
 <h2>rollBack()
         </h2>
@@ -842,6 +864,25 @@ the connection/database</h2>
 </div>
 </div></div>
 </div>
+<a name="_prefix" id="_prefix"></a><div class="element clickable method protected _prefix" data-toggle="collapse" data-target="._prefix .collapse">
+<h2>Sets the table prefix on the passed string</h2>
+<pre>_prefix(string $str) : string</pre>
+<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::_prefix()</td>
+</tr></table>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$str</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a name="_quote" id="_quote"></a><div class="element clickable method protected _quote" data-toggle="collapse" data-target="._quote .collapse">
 <h2>Helper method for quote_ident</h2>
 <pre>_quote(mixed $str) : mixed</pre>
@@ -864,8 +905,8 @@ the connection/database</h2>
 <h3>
 <i class="icon-custom icon-property"></i> Properties</h3>
 <a name="%24last_query" id="$last_query"> </a><div class="element clickable property public $last_query" data-toggle="collapse" data-target=".$last_query .collapse">
-<h2>Last query executed</h2>
-<pre>$last_query : string</pre>
+<h2>$last_query</h2>
+<pre>$last_query </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -876,8 +917,8 @@ the connection/database</h2>
 </div></div>
 </div>
 <a name="%24sql" id="$sql"> </a><div class="element clickable property public $sql" data-toggle="collapse" data-target=".$sql .collapse">
-<h2>Reference to sql sub class</h2>
-<pre>$sql : Object</pre>
+<h2>$sql</h2>
+<pre>$sql </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -887,9 +928,21 @@ the connection/database</h2>
 </tr></table>
 </div></div>
 </div>
+<a name="%24table_prefix" id="$table_prefix"> </a><div class="element clickable property public $table_prefix" data-toggle="collapse" data-target=".$table_prefix .collapse">
+<h2>$table_prefix</h2>
+<pre>$table_prefix </pre>
+<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::$$table_prefix</td>
+</tr></table>
+</div></div>
+</div>
 <a name="%24util" id="$util"> </a><div class="element clickable property public $util" data-toggle="collapse" data-target=".$util .collapse">
-<h2>Reference to util sub class</h2>
-<pre>$util : Object</pre>
+<h2>$util</h2>
+<pre>$util </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -906,8 +959,8 @@ the connection/database</h2>
 <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 protected $statement" data-toggle="collapse" data-target=".$statement .collapse">
-<h2>Reference to the last executed query</h2>
-<pre>$statement : mixed</pre>
+<h2>$statement</h2>
+<pre>$statement </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -924,7 +977,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/MySQL_SQL.html b/docs/classes/MySQL_SQL.html
index 85ddf6f..66eb6b1 100644
--- a/docs/classes/MySQL_SQL.html
+++ b/docs/classes/MySQL_SQL.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -58,18 +58,13 @@
 <ul class="side-nav nav nav-list">
 <li class="nav-header">
 <i class="icon-custom icon-method"></i> Methods</li>
-<li class="method public inherited"><a href="#avg" title="avg :: Get the 'average' keyword"><span class="description">Get the 'average' keyword</span><pre>avg()</pre></a></li>
 <li class="method public "><a href="#column_list" title="column_list :: SQL to show infromation about columns in a table"><span class="description">SQL to show infromation about columns in a table</span><pre>column_list()</pre></a></li>
 <li class="method public "><a href="#db_list" title="db_list :: Returns sql to list other databases"><span class="description">Returns sql to list other databases</span><pre>db_list()</pre></a></li>
-<li class="method public inherited"><a href="#distinct" title="distinct :: Get the 'distinct' keyword"><span class="description">Get the 'distinct' keyword</span><pre>distinct()</pre></a></li>
 <li class="method public "><a href="#function_list" title="function_list :: Return sql to list functions"><span class="description">Return sql to list functions</span><pre>function_list()</pre></a></li>
 <li class="method public "><a href="#limit" title="limit :: Limit clause"><span class="description">Limit clause</span><pre>limit()</pre></a></li>
-<li class="method public inherited"><a href="#max" title="max :: Get the max keyword sql"><span class="description">Get the max keyword sql</span><pre>max()</pre></a></li>
-<li class="method public inherited"><a href="#min" title="min :: Get the min keyword sql"><span class="description">Get the min keyword sql</span><pre>min()</pre></a></li>
 <li class="method public "><a href="#procedure_list" title="procedure_list :: Return sql to list stored procedures"><span class="description">Return sql to list stored procedures</span><pre>procedure_list()</pre></a></li>
 <li class="method public "><a href="#random" title="random :: Random ordering keyword"><span class="description">Random ordering keyword</span><pre>random()</pre></a></li>
 <li class="method public "><a href="#sequence_list" title="sequence_list :: Return sql to list sequences"><span class="description">Return sql to list sequences</span><pre>sequence_list()</pre></a></li>
-<li class="method public inherited"><a href="#sum" title="sum :: Get the 'sum' keyword"><span class="description">Get the 'sum' keyword</span><pre>sum()</pre></a></li>
 <li class="method public "><a href="#system_table_list" title="system_table_list :: Overridden in MySQL class"><span class="description">Overridden in MySQL class</span><pre>system_table_list()</pre></a></li>
 <li class="method public "><a href="#table_list" title="table_list :: Returns sql to list tables"><span class="description">Returns sql to list tables</span><pre>table_list()</pre></a></li>
 <li class="method public "><a href="#trigger_list" title="trigger_list :: Returns sql to list triggers"><span class="description">Returns sql to list triggers</span><pre>trigger_list()</pre></a></li>
@@ -94,20 +89,6 @@
 </table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
-<a name="avg" id="avg"></a><div class="element clickable method public avg" data-toggle="collapse" data-target=".avg .collapse">
-<h2>Get the 'average' keyword</h2>
-<pre>avg() : string</pre>
-<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_SQL::avg()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="column_list" id="column_list"></a><div class="element clickable method public column_list" data-toggle="collapse" data-target=".column_list .collapse">
 <h2>SQL to show infromation about columns in a table</h2>
 <pre>column_list(string $table) : string</pre>
@@ -133,20 +114,6 @@
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
-<a name="distinct" id="distinct"></a><div class="element clickable method public distinct" data-toggle="collapse" data-target=".distinct .collapse">
-<h2>Get the 'distinct' keyword</h2>
-<pre>distinct() : string</pre>
-<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_SQL::distinct()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="function_list" id="function_list"></a><div class="element clickable method public function_list" data-toggle="collapse" data-target=".function_list .collapse">
 <h2>Return sql to list functions</h2>
 <pre>function_list() : string</pre>
@@ -180,34 +147,6 @@
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
-<a name="max" id="max"></a><div class="element clickable method public max" data-toggle="collapse" data-target=".max .collapse">
-<h2>Get the max keyword sql</h2>
-<pre>max() : string</pre>
-<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_SQL::max()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
-<a name="min" id="min"></a><div class="element clickable method public min" data-toggle="collapse" data-target=".min .collapse">
-<h2>Get the min keyword sql</h2>
-<pre>min() : string</pre>
-<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_SQL::min()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="procedure_list" id="procedure_list"></a><div class="element clickable method public procedure_list" data-toggle="collapse" data-target=".procedure_list .collapse">
 <h2>Return sql to list stored procedures</h2>
 <pre>procedure_list() : string</pre>
@@ -238,20 +177,6 @@
 <div class="subelement response"><code>FALSE</code></div>
 </div></div>
 </div>
-<a name="sum" id="sum"></a><div class="element clickable method public sum" data-toggle="collapse" data-target=".sum .collapse">
-<h2>Get the 'sum' keyword</h2>
-<pre>sum() : string</pre>
-<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_SQL::sum()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="system_table_list" id="system_table_list"></a><div class="element clickable method public system_table_list" data-toggle="collapse" data-target=".system_table_list .collapse">
 <h2>Overridden in MySQL class</h2>
 <pre>system_table_list() : string</pre>
@@ -314,7 +239,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/MySQL_Util.html b/docs/classes/MySQL_Util.html
index a6a617c..f641822 100644
--- a/docs/classes/MySQL_Util.html
+++ b/docs/classes/MySQL_Util.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -209,7 +209,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/ODBC.html b/docs/classes/ODBC.html
index 332a1d3..75d67fb 100644
--- a/docs/classes/ODBC.html
+++ b/docs/classes/ODBC.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -111,6 +111,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
 <li class="method public inherited"><a href="#quote" title="quote :: "><span class="description">quote()
         </span><pre>quote()</pre></a></li>
 <li class="method public inherited"><a href="#quote_ident" title="quote_ident :: Surrounds the string with the databases identifier escape characters"><span class="description">Surrounds the string with the databases identifier escape characters</span><pre>quote_ident()</pre></a></li>
+<li class="method public inherited"><a href="#quote_table" title="quote_table :: Quote database table name, and set prefix"><span class="description">Quote database table name, and set prefix</span><pre>quote_table()</pre></a></li>
 <li class="method public inherited"><a href="#rollBack" title="rollBack :: "><span class="description">rollBack()
         </span><pre>rollBack()</pre></a></li>
 <li class="method public inherited"><a href="#setAttribute" title="setAttribute :: "><span class="description">setAttribute()
@@ -118,15 +119,17 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
 <li class="method public "><a href="#switch_db" title="switch_db :: Doesn't apply to ODBC"><span class="description">Doesn't apply to ODBC</span><pre>switch_db()</pre></a></li>
 <li class="method public "><a href="#truncate" title="truncate :: Empty the current database"><span class="description">Empty the current database</span><pre>truncate()</pre></a></li>
 <li class="nav-header protected">» Protected</li>
+<li class="method protected inherited"><a href="#_prefix" title="_prefix :: Sets the table prefix on the passed string"><span class="description">Sets the table prefix on the passed string</span><pre>_prefix()</pre></a></li>
 <li class="method protected inherited"><a href="#_quote" title="_quote :: Helper method for quote_ident"><span class="description">Helper method for quote_ident</span><pre>_quote()</pre></a></li>
 <li class="nav-header">
 <i class="icon-custom icon-property"></i> Properties</li>
-<li class="property public inherited"><a href="#%24last_query" title="$last_query :: Last query executed"><span class="description">Last query executed</span><pre>$last_query</pre></a></li>
-<li class="property public inherited"><a href="#%24sql" title="$sql :: Reference to sql sub class"><span class="description">Reference to sql sub class</span><pre>$sql</pre></a></li>
-<li class="property public inherited"><a href="#%24util" title="$util :: Reference to util sub class"><span class="description">Reference to util sub class</span><pre>$util</pre></a></li>
+<li class="property public inherited"><a href="#%24last_query" title="$last_query :: "><span class="description">$last_query</span><pre>$last_query</pre></a></li>
+<li class="property public inherited"><a href="#%24sql" title="$sql :: "><span class="description">$sql</span><pre>$sql</pre></a></li>
+<li class="property public inherited"><a href="#%24table_prefix" title="$table_prefix :: "><span class="description">$table_prefix</span><pre>$table_prefix</pre></a></li>
+<li class="property public inherited"><a href="#%24util" title="$util :: "><span class="description">$util</span><pre>$util</pre></a></li>
 <li class="nav-header protected">» Protected</li>
 <li class="property protected "><a href="#%24escape_char" title="$escape_char :: Don't define the escape char - or define it in sub-drivers in a refactor"><span class="description">Don't define the escape char - or define it in sub-drivers in a refactor</span><pre>$escape_char</pre></a></li>
-<li class="property protected inherited"><a href="#%24statement" title="$statement :: Reference to the last executed query"><span class="description">Reference to the last executed query</span><pre>$statement</pre></a></li>
+<li class="property protected inherited"><a href="#%24statement" title="$statement :: "><span class="description">$statement</span><pre>$statement</pre></a></li>
 </ul>
 </div>
 <div class="span8">
@@ -778,6 +781,25 @@ the connection/database</h2>
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
+<a name="quote_table" id="quote_table"></a><div class="element clickable method public quote_table" data-toggle="collapse" data-target=".quote_table .collapse">
+<h2>Quote database table name, and set prefix</h2>
+<pre>quote_table(mixed $table) : string</pre>
+<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::quote_table()</td>
+</tr></table>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$table</h4>
+<code>mixed</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a name="rollBack" id="rollBack"></a><div class="element clickable method public rollBack" data-toggle="collapse" data-target=".rollBack .collapse">
 <h2>rollBack()
         </h2>
@@ -844,6 +866,25 @@ the connection/database</h2>
 </div>
 </div></div>
 </div>
+<a name="_prefix" id="_prefix"></a><div class="element clickable method protected _prefix" data-toggle="collapse" data-target="._prefix .collapse">
+<h2>Sets the table prefix on the passed string</h2>
+<pre>_prefix(string $str) : string</pre>
+<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::_prefix()</td>
+</tr></table>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$str</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a name="_quote" id="_quote"></a><div class="element clickable method protected _quote" data-toggle="collapse" data-target="._quote .collapse">
 <h2>Helper method for quote_ident</h2>
 <pre>_quote(mixed $str) : mixed</pre>
@@ -866,8 +907,8 @@ the connection/database</h2>
 <h3>
 <i class="icon-custom icon-property"></i> Properties</h3>
 <a name="%24last_query" id="$last_query"> </a><div class="element clickable property public $last_query" data-toggle="collapse" data-target=".$last_query .collapse">
-<h2>Last query executed</h2>
-<pre>$last_query : string</pre>
+<h2>$last_query</h2>
+<pre>$last_query </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -878,8 +919,8 @@ the connection/database</h2>
 </div></div>
 </div>
 <a name="%24sql" id="$sql"> </a><div class="element clickable property public $sql" data-toggle="collapse" data-target=".$sql .collapse">
-<h2>Reference to sql sub class</h2>
-<pre>$sql : Object</pre>
+<h2>$sql</h2>
+<pre>$sql </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -889,9 +930,21 @@ the connection/database</h2>
 </tr></table>
 </div></div>
 </div>
+<a name="%24table_prefix" id="$table_prefix"> </a><div class="element clickable property public $table_prefix" data-toggle="collapse" data-target=".$table_prefix .collapse">
+<h2>$table_prefix</h2>
+<pre>$table_prefix </pre>
+<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::$$table_prefix</td>
+</tr></table>
+</div></div>
+</div>
 <a name="%24util" id="$util"> </a><div class="element clickable property public $util" data-toggle="collapse" data-target=".$util .collapse">
-<h2>Reference to util sub class</h2>
-<pre>$util : Object</pre>
+<h2>$util</h2>
+<pre>$util </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -903,13 +956,13 @@ the connection/database</h2>
 </div>
 <a name="%24escape_char" id="$escape_char"> </a><div class="element clickable property protected $escape_char" data-toggle="collapse" data-target=".$escape_char .collapse">
 <h2>Don't define the escape char - or define it in sub-drivers in a refactor</h2>
-<pre>$escape_char : string</pre>
+<pre>$escape_char </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 protected $statement" data-toggle="collapse" data-target=".$statement .collapse">
-<h2>Reference to the last executed query</h2>
-<pre>$statement : mixed</pre>
+<h2>$statement</h2>
+<pre>$statement </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -926,7 +979,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/ODBC_SQL.html b/docs/classes/ODBC_SQL.html
index 1b88e38..2befbec 100644
--- a/docs/classes/ODBC_SQL.html
+++ b/docs/classes/ODBC_SQL.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -58,18 +58,13 @@
 <ul class="side-nav nav nav-list">
 <li class="nav-header">
 <i class="icon-custom icon-method"></i> Methods</li>
-<li class="method public inherited"><a href="#avg" title="avg :: Get the 'average' keyword"><span class="description">Get the 'average' keyword</span><pre>avg()</pre></a></li>
 <li class="method public "><a href="#column_list" title="column_list :: SQL to show infromation about columns in a table"><span class="description">SQL to show infromation about columns in a table</span><pre>column_list()</pre></a></li>
 <li class="method public "><a href="#db_list" title="db_list :: Returns sql to list other databases"><span class="description">Returns sql to list other databases</span><pre>db_list()</pre></a></li>
-<li class="method public inherited"><a href="#distinct" title="distinct :: Get the 'distinct' keyword"><span class="description">Get the 'distinct' keyword</span><pre>distinct()</pre></a></li>
 <li class="method public "><a href="#function_list" title="function_list :: Return sql to list functions"><span class="description">Return sql to list functions</span><pre>function_list()</pre></a></li>
 <li class="method public "><a href="#limit" title="limit :: Limit clause"><span class="description">Limit clause</span><pre>limit()</pre></a></li>
-<li class="method public inherited"><a href="#max" title="max :: Get the max keyword sql"><span class="description">Get the max keyword sql</span><pre>max()</pre></a></li>
-<li class="method public inherited"><a href="#min" title="min :: Get the min keyword sql"><span class="description">Get the min keyword sql</span><pre>min()</pre></a></li>
 <li class="method public "><a href="#procedure_list" title="procedure_list :: Return sql to list stored procedures"><span class="description">Return sql to list stored procedures</span><pre>procedure_list()</pre></a></li>
 <li class="method public "><a href="#random" title="random :: Random ordering keyword"><span class="description">Random ordering keyword</span><pre>random()</pre></a></li>
 <li class="method public "><a href="#sequence_list" title="sequence_list :: Return sql to list sequences"><span class="description">Return sql to list sequences</span><pre>sequence_list()</pre></a></li>
-<li class="method public inherited"><a href="#sum" title="sum :: Get the 'sum' keyword"><span class="description">Get the 'sum' keyword</span><pre>sum()</pre></a></li>
 <li class="method public "><a href="#system_table_list" title="system_table_list :: Returns sql to list system tables"><span class="description">Returns sql to list system tables</span><pre>system_table_list()</pre></a></li>
 <li class="method public "><a href="#table_list" title="table_list :: Returns sql to list tables"><span class="description">Returns sql to list tables</span><pre>table_list()</pre></a></li>
 <li class="method public "><a href="#trigger_list" title="trigger_list :: Returns sql to list triggers"><span class="description">Returns sql to list triggers</span><pre>trigger_list()</pre></a></li>
@@ -94,20 +89,6 @@
 </table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
-<a name="avg" id="avg"></a><div class="element clickable method public avg" data-toggle="collapse" data-target=".avg .collapse">
-<h2>Get the 'average' keyword</h2>
-<pre>avg() : string</pre>
-<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_SQL::avg()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="column_list" id="column_list"></a><div class="element clickable method public column_list" data-toggle="collapse" data-target=".column_list .collapse">
 <h2>SQL to show infromation about columns in a table</h2>
 <pre>column_list(string $table) : FALSE</pre>
@@ -133,20 +114,6 @@
 <div class="subelement response"><code>FALSE</code></div>
 </div></div>
 </div>
-<a name="distinct" id="distinct"></a><div class="element clickable method public distinct" data-toggle="collapse" data-target=".distinct .collapse">
-<h2>Get the 'distinct' keyword</h2>
-<pre>distinct() : string</pre>
-<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_SQL::distinct()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="function_list" id="function_list"></a><div class="element clickable method public function_list" data-toggle="collapse" data-target=".function_list .collapse">
 <h2>Return sql to list functions</h2>
 <pre>function_list() : FALSE</pre>
@@ -180,34 +147,6 @@
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
-<a name="max" id="max"></a><div class="element clickable method public max" data-toggle="collapse" data-target=".max .collapse">
-<h2>Get the max keyword sql</h2>
-<pre>max() : string</pre>
-<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_SQL::max()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
-<a name="min" id="min"></a><div class="element clickable method public min" data-toggle="collapse" data-target=".min .collapse">
-<h2>Get the min keyword sql</h2>
-<pre>min() : string</pre>
-<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_SQL::min()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="procedure_list" id="procedure_list"></a><div class="element clickable method public procedure_list" data-toggle="collapse" data-target=".procedure_list .collapse">
 <h2>Return sql to list stored procedures</h2>
 <pre>procedure_list() : FALSE</pre>
@@ -238,20 +177,6 @@
 <div class="subelement response"><code>FALSE</code></div>
 </div></div>
 </div>
-<a name="sum" id="sum"></a><div class="element clickable method public sum" data-toggle="collapse" data-target=".sum .collapse">
-<h2>Get the 'sum' keyword</h2>
-<pre>sum() : string</pre>
-<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_SQL::sum()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="system_table_list" id="system_table_list"></a><div class="element clickable method public system_table_list" data-toggle="collapse" data-target=".system_table_list .collapse">
 <h2>Returns sql to list system tables</h2>
 <pre>system_table_list() : FALSE</pre>
@@ -309,7 +234,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/ODBC_Util.html b/docs/classes/ODBC_Util.html
index 778b17a..b682127 100644
--- a/docs/classes/ODBC_Util.html
+++ b/docs/classes/ODBC_Util.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -204,7 +204,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/PgSQL.html b/docs/classes/PgSQL.html
index ee91daf..239549f 100644
--- a/docs/classes/PgSQL.html
+++ b/docs/classes/PgSQL.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -111,6 +111,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
 <li class="method public inherited"><a href="#quote" title="quote :: "><span class="description">quote()
         </span><pre>quote()</pre></a></li>
 <li class="method public inherited"><a href="#quote_ident" title="quote_ident :: Surrounds the string with the databases identifier escape characters"><span class="description">Surrounds the string with the databases identifier escape characters</span><pre>quote_ident()</pre></a></li>
+<li class="method public inherited"><a href="#quote_table" title="quote_table :: Quote database table name, and set prefix"><span class="description">Quote database table name, and set prefix</span><pre>quote_table()</pre></a></li>
 <li class="method public inherited"><a href="#rollBack" title="rollBack :: "><span class="description">rollBack()
         </span><pre>rollBack()</pre></a></li>
 <li class="method public inherited"><a href="#setAttribute" title="setAttribute :: "><span class="description">setAttribute()
@@ -118,15 +119,17 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
 <li class="method public "><a href="#switch_db" title="switch_db :: Connect to a different database"><span class="description">Connect to a different database</span><pre>switch_db()</pre></a></li>
 <li class="method public "><a href="#truncate" title="truncate :: Empty a table"><span class="description">Empty a table</span><pre>truncate()</pre></a></li>
 <li class="nav-header protected">» Protected</li>
+<li class="method protected inherited"><a href="#_prefix" title="_prefix :: Sets the table prefix on the passed string"><span class="description">Sets the table prefix on the passed string</span><pre>_prefix()</pre></a></li>
 <li class="method protected inherited"><a href="#_quote" title="_quote :: Helper method for quote_ident"><span class="description">Helper method for quote_ident</span><pre>_quote()</pre></a></li>
 <li class="nav-header">
 <i class="icon-custom icon-property"></i> Properties</li>
-<li class="property public inherited"><a href="#%24last_query" title="$last_query :: Last query executed"><span class="description">Last query executed</span><pre>$last_query</pre></a></li>
-<li class="property public inherited"><a href="#%24sql" title="$sql :: Reference to sql sub class"><span class="description">Reference to sql sub class</span><pre>$sql</pre></a></li>
-<li class="property public inherited"><a href="#%24util" title="$util :: Reference to util sub class"><span class="description">Reference to util sub class</span><pre>$util</pre></a></li>
+<li class="property public inherited"><a href="#%24last_query" title="$last_query :: "><span class="description">$last_query</span><pre>$last_query</pre></a></li>
+<li class="property public inherited"><a href="#%24sql" title="$sql :: "><span class="description">$sql</span><pre>$sql</pre></a></li>
+<li class="property public inherited"><a href="#%24table_prefix" title="$table_prefix :: "><span class="description">$table_prefix</span><pre>$table_prefix</pre></a></li>
+<li class="property public inherited"><a href="#%24util" title="$util :: "><span class="description">$util</span><pre>$util</pre></a></li>
 <li class="nav-header protected">» Protected</li>
-<li class="property protected inherited"><a href="#%24escape_char" title="$escape_char :: Character to escape identifiers"><span class="description">Character to escape identifiers</span><pre>$escape_char</pre></a></li>
-<li class="property protected inherited"><a href="#%24statement" title="$statement :: Reference to the last executed query"><span class="description">Reference to the last executed query</span><pre>$statement</pre></a></li>
+<li class="property protected inherited"><a href="#%24escape_char" title="$escape_char :: "><span class="description">$escape_char</span><pre>$escape_char</pre></a></li>
+<li class="property protected inherited"><a href="#%24statement" title="$statement :: "><span class="description">$statement</span><pre>$statement</pre></a></li>
 </ul>
 </div>
 <div class="span8">
@@ -774,6 +777,25 @@ the connection/database</h2>
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
+<a name="quote_table" id="quote_table"></a><div class="element clickable method public quote_table" data-toggle="collapse" data-target=".quote_table .collapse">
+<h2>Quote database table name, and set prefix</h2>
+<pre>quote_table(mixed $table) : string</pre>
+<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::quote_table()</td>
+</tr></table>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$table</h4>
+<code>mixed</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a name="rollBack" id="rollBack"></a><div class="element clickable method public rollBack" data-toggle="collapse" data-target=".rollBack .collapse">
 <h2>rollBack()
         </h2>
@@ -838,6 +860,25 @@ the connection/database</h2>
 </div>
 </div></div>
 </div>
+<a name="_prefix" id="_prefix"></a><div class="element clickable method protected _prefix" data-toggle="collapse" data-target="._prefix .collapse">
+<h2>Sets the table prefix on the passed string</h2>
+<pre>_prefix(string $str) : string</pre>
+<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::_prefix()</td>
+</tr></table>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$str</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a name="_quote" id="_quote"></a><div class="element clickable method protected _quote" data-toggle="collapse" data-target="._quote .collapse">
 <h2>Helper method for quote_ident</h2>
 <pre>_quote(mixed $str) : mixed</pre>
@@ -860,8 +901,8 @@ the connection/database</h2>
 <h3>
 <i class="icon-custom icon-property"></i> Properties</h3>
 <a name="%24last_query" id="$last_query"> </a><div class="element clickable property public $last_query" data-toggle="collapse" data-target=".$last_query .collapse">
-<h2>Last query executed</h2>
-<pre>$last_query : string</pre>
+<h2>$last_query</h2>
+<pre>$last_query </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -872,8 +913,8 @@ the connection/database</h2>
 </div></div>
 </div>
 <a name="%24sql" id="$sql"> </a><div class="element clickable property public $sql" data-toggle="collapse" data-target=".$sql .collapse">
-<h2>Reference to sql sub class</h2>
-<pre>$sql : Object</pre>
+<h2>$sql</h2>
+<pre>$sql </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -883,9 +924,21 @@ the connection/database</h2>
 </tr></table>
 </div></div>
 </div>
+<a name="%24table_prefix" id="$table_prefix"> </a><div class="element clickable property public $table_prefix" data-toggle="collapse" data-target=".$table_prefix .collapse">
+<h2>$table_prefix</h2>
+<pre>$table_prefix </pre>
+<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::$$table_prefix</td>
+</tr></table>
+</div></div>
+</div>
 <a name="%24util" id="$util"> </a><div class="element clickable property public $util" data-toggle="collapse" data-target=".$util .collapse">
-<h2>Reference to util sub class</h2>
-<pre>$util : Object</pre>
+<h2>$util</h2>
+<pre>$util </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -896,8 +949,8 @@ the connection/database</h2>
 </div></div>
 </div>
 <a name="%24escape_char" id="$escape_char"> </a><div class="element clickable property protected $escape_char" data-toggle="collapse" data-target=".$escape_char .collapse">
-<h2>Character to escape identifiers</h2>
-<pre>$escape_char : string</pre>
+<h2>$escape_char</h2>
+<pre>$escape_char </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -908,8 +961,8 @@ the connection/database</h2>
 </div></div>
 </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 executed query</h2>
-<pre>$statement : mixed</pre>
+<h2>$statement</h2>
+<pre>$statement </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -926,7 +979,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/PgSQL_SQL.html b/docs/classes/PgSQL_SQL.html
index 0c584e7..2ebff5d 100644
--- a/docs/classes/PgSQL_SQL.html
+++ b/docs/classes/PgSQL_SQL.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -58,18 +58,13 @@
 <ul class="side-nav nav nav-list">
 <li class="nav-header">
 <i class="icon-custom icon-method"></i> Methods</li>
-<li class="method public inherited"><a href="#avg" title="avg :: Get the 'average' keyword"><span class="description">Get the 'average' keyword</span><pre>avg()</pre></a></li>
 <li class="method public "><a href="#column_list" title="column_list :: Return sql to list columns of the specified table"><span class="description">Return sql to list columns of the specified table</span><pre>column_list()</pre></a></li>
 <li class="method public "><a href="#db_list" title="db_list :: Returns sql to list other databases"><span class="description">Returns sql to list other databases</span><pre>db_list()</pre></a></li>
-<li class="method public inherited"><a href="#distinct" title="distinct :: Get the 'distinct' keyword"><span class="description">Get the 'distinct' keyword</span><pre>distinct()</pre></a></li>
 <li class="method public "><a href="#function_list" title="function_list :: Return sql to list functions"><span class="description">Return sql to list functions</span><pre>function_list()</pre></a></li>
 <li class="method public "><a href="#limit" title="limit :: Limit clause"><span class="description">Limit clause</span><pre>limit()</pre></a></li>
-<li class="method public inherited"><a href="#max" title="max :: Get the max keyword sql"><span class="description">Get the max keyword sql</span><pre>max()</pre></a></li>
-<li class="method public inherited"><a href="#min" title="min :: Get the min keyword sql"><span class="description">Get the min keyword sql</span><pre>min()</pre></a></li>
 <li class="method public "><a href="#procedure_list" title="procedure_list :: Return sql to list stored procedures"><span class="description">Return sql to list stored procedures</span><pre>procedure_list()</pre></a></li>
 <li class="method public "><a href="#random" title="random :: Random ordering keyword"><span class="description">Random ordering keyword</span><pre>random()</pre></a></li>
 <li class="method public "><a href="#sequence_list" title="sequence_list :: Return sql to list sequences"><span class="description">Return sql to list sequences</span><pre>sequence_list()</pre></a></li>
-<li class="method public inherited"><a href="#sum" title="sum :: Get the 'sum' keyword"><span class="description">Get the 'sum' keyword</span><pre>sum()</pre></a></li>
 <li class="method public "><a href="#system_table_list" title="system_table_list :: Returns sql to list system tables"><span class="description">Returns sql to list system tables</span><pre>system_table_list()</pre></a></li>
 <li class="method public "><a href="#table_list" title="table_list :: Returns sql to list tables"><span class="description">Returns sql to list tables</span><pre>table_list()</pre></a></li>
 <li class="method public "><a href="#trigger_list" title="trigger_list :: Returns sql to list triggers"><span class="description">Returns sql to list triggers</span><pre>trigger_list()</pre></a></li>
@@ -94,20 +89,6 @@
 </table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
-<a name="avg" id="avg"></a><div class="element clickable method public avg" data-toggle="collapse" data-target=".avg .collapse">
-<h2>Get the 'average' keyword</h2>
-<pre>avg() : string</pre>
-<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_SQL::avg()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="column_list" id="column_list"></a><div class="element clickable method public column_list" data-toggle="collapse" data-target=".column_list .collapse">
 <h2>Return sql to list columns of the specified table</h2>
 <pre>column_list(string $table) : string</pre>
@@ -133,20 +114,6 @@
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
-<a name="distinct" id="distinct"></a><div class="element clickable method public distinct" data-toggle="collapse" data-target=".distinct .collapse">
-<h2>Get the 'distinct' keyword</h2>
-<pre>distinct() : string</pre>
-<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_SQL::distinct()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="function_list" id="function_list"></a><div class="element clickable method public function_list" data-toggle="collapse" data-target=".function_list .collapse">
 <h2>Return sql to list functions</h2>
 <pre>function_list() : FALSE</pre>
@@ -180,34 +147,6 @@
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
-<a name="max" id="max"></a><div class="element clickable method public max" data-toggle="collapse" data-target=".max .collapse">
-<h2>Get the max keyword sql</h2>
-<pre>max() : string</pre>
-<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_SQL::max()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
-<a name="min" id="min"></a><div class="element clickable method public min" data-toggle="collapse" data-target=".min .collapse">
-<h2>Get the min keyword sql</h2>
-<pre>min() : string</pre>
-<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_SQL::min()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="procedure_list" id="procedure_list"></a><div class="element clickable method public procedure_list" data-toggle="collapse" data-target=".procedure_list .collapse">
 <h2>Return sql to list stored procedures</h2>
 <pre>procedure_list() : string</pre>
@@ -238,20 +177,6 @@
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
-<a name="sum" id="sum"></a><div class="element clickable method public sum" data-toggle="collapse" data-target=".sum .collapse">
-<h2>Get the 'sum' keyword</h2>
-<pre>sum() : string</pre>
-<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_SQL::sum()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="system_table_list" id="system_table_list"></a><div class="element clickable method public system_table_list" data-toggle="collapse" data-target=".system_table_list .collapse">
 <h2>Returns sql to list system tables</h2>
 <pre>system_table_list() : string</pre>
@@ -309,7 +234,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/PgSQL_Util.html b/docs/classes/PgSQL_Util.html
index 0e82f2a..1fa2289 100644
--- a/docs/classes/PgSQL_Util.html
+++ b/docs/classes/PgSQL_Util.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -209,7 +209,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Query_Builder.html b/docs/classes/Query_Builder.html
index 8d0503a..05996f6 100644
--- a/docs/classes/Query_Builder.html
+++ b/docs/classes/Query_Builder.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -112,10 +112,10 @@ Note: this function works with key / value, or a
 passed array with key / value pairs</span><pre>where()</pre></a></li>
 <li class="method public "><a href="#where_in" title="where_in :: Where clause with 'IN' statement"><span class="description">Where clause with 'IN' statement</span><pre>where_in()</pre></a></li>
 <li class="method public "><a href="#where_not_in" title="where_not_in :: WHERE NOT IN (FOO) clause"><span class="description">WHERE NOT IN (FOO) clause</span><pre>where_not_in()</pre></a></li>
-<li class="nav-header protected">» Protected</li>
-<li class="method protected "><a href="#_get_compile" title="_get_compile :: Helper function for returning sql strings"><span class="description">Helper function for returning sql strings</span><pre>_get_compile()</pre></a></li>
 <li class="nav-header private">» Private</li>
 <li class="method private "><a href="#_compile" title="_compile :: String together the sql statements for sending to the db"><span class="description">String together the sql statements for sending to the db</span><pre>_compile()</pre></a></li>
+<li class="method private "><a href="#_connect" title="_connect :: Create the dsn for connection to the database"><span class="description">Create the dsn for connection to the database</span><pre>_connect()</pre></a></li>
+<li class="method private "><a href="#_get_compile" title="_get_compile :: Helper function for returning sql strings"><span class="description">Helper function for returning sql strings</span><pre>_get_compile()</pre></a></li>
 <li class="method private "><a href="#_having" title="_having :: Simplify building having clauses"><span class="description">Simplify building having clauses</span><pre>_having()</pre></a></li>
 <li class="method private "><a href="#_like" title="_like :: Simplify 'like' methods"><span class="description">Simplify 'like' methods</span><pre>_like()</pre></a></li>
 <li class="method private "><a href="#_run" title="_run :: Executes the compiled query"><span class="description">Executes the compiled query</span><pre>_run()</pre></a></li>
@@ -264,7 +264,7 @@ in place of the get() method</h2>
 </div>
 <a name="from" id="from"></a><div class="element clickable method public from" data-toggle="collapse" data-target=".from .collapse">
 <h2>Specify the database table to select from</h2>
-<pre>from(string $dbname) : <a href="../classes/Query_Builder.html">\Query_Builder</a></pre>
+<pre>from(string $tblname) : <a href="../classes/Query_Builder.html">\Query_Builder</a></pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -274,7 +274,7 @@ in place of the get() method</h2>
 </tr></table>
 <h3>Parameters</h3>
 <div class="subelement argument">
-<h4>$dbname</h4>
+<h4>$tblname</h4>
 <code>string</code>
 </div>
 <h3>Returns</h3>
@@ -1026,7 +1026,45 @@ passed array with key / value pairs</h2>
 <div class="subelement response"><code><a href="../classes/Query_Builder.html">\Query_Builder</a></code></div>
 </div></div>
 </div>
-<a name="_get_compile" id="_get_compile"></a><div class="element clickable method protected _get_compile" data-toggle="collapse" data-target="._get_compile .collapse">
+<a name="_compile" id="_compile"></a><div class="element clickable method private _compile" data-toggle="collapse" data-target="._compile .collapse">
+<h2>String together the sql statements for sending to the db</h2>
+<pre>_compile(string $type, string $table) : \$string</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$type</h4>
+<code>string</code>
+</div>
+<div class="subelement argument">
+<h4>$table</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>\$string</code></div>
+</div></div>
+</div>
+<a name="_connect" id="_connect"></a><div class="element clickable method private _connect" data-toggle="collapse" data-target="._connect .collapse">
+<h2>Create the dsn for connection to the database</h2>
+<pre>_connect(string $dbtype, object $params) : string</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$dbtype</h4>
+<code>string</code>
+</div>
+<div class="subelement argument">
+<h4>$params</h4>
+<code>object</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
+<a name="_get_compile" id="_get_compile"></a><div class="element clickable method private _get_compile" data-toggle="collapse" data-target="._get_compile .collapse">
 <h2>Helper function for returning sql strings</h2>
 <pre>_get_compile(string $type, string $table, $reset) </pre>
 <div class="labels"></div>
@@ -1050,25 +1088,6 @@ passed array with key / value pairs</h2>
 <code></code><p>bool</p></div>
 </div></div>
 </div>
-<a name="_compile" id="_compile"></a><div class="element clickable method private _compile" data-toggle="collapse" data-target="._compile .collapse">
-<h2>String together the sql statements for sending to the db</h2>
-<pre>_compile(string $type, string $table) : \$string</pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<h3>Parameters</h3>
-<div class="subelement argument">
-<h4>$type</h4>
-<code>string</code>
-</div>
-<div class="subelement argument">
-<h4>$table</h4>
-<code>string</code>
-</div>
-<h3>Returns</h3>
-<div class="subelement response"><code>\$string</code></div>
-</div></div>
-</div>
 <a name="_having" id="_having"></a><div class="element clickable method private _having" data-toggle="collapse" data-target="._having .collapse">
 <h2>Simplify building having clauses</h2>
 <pre>_having(mixed $key, mixed $val, string $conj) : <a href="../classes/Query_Builder.html">\Query_Builder</a></pre>
@@ -1365,7 +1384,7 @@ passed array with key / value pairs</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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Query_Parser.html b/docs/classes/Query_Parser.html
index 2b7f557..41df16e 100644
--- a/docs/classes/Query_Parser.html
+++ b/docs/classes/Query_Parser.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -145,7 +145,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/SQLite.html b/docs/classes/SQLite.html
index 387b2fa..da8cd32 100644
--- a/docs/classes/SQLite.html
+++ b/docs/classes/SQLite.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -110,6 +110,7 @@ method if the database does not support 'TRUNCATE';</span><pre>empty_table()</pr
 <li class="method public inherited"><a href="#quote" title="quote :: "><span class="description">quote()
         </span><pre>quote()</pre></a></li>
 <li class="method public inherited"><a href="#quote_ident" title="quote_ident :: Surrounds the string with the databases identifier escape characters"><span class="description">Surrounds the string with the databases identifier escape characters</span><pre>quote_ident()</pre></a></li>
+<li class="method public inherited"><a href="#quote_table" title="quote_table :: Quote database table name, and set prefix"><span class="description">Quote database table name, and set prefix</span><pre>quote_table()</pre></a></li>
 <li class="method public inherited"><a href="#rollBack" title="rollBack :: "><span class="description">rollBack()
         </span><pre>rollBack()</pre></a></li>
 <li class="method public inherited"><a href="#setAttribute" title="setAttribute :: "><span class="description">setAttribute()
@@ -118,14 +119,16 @@ method if the database does not support 'TRUNCATE';</span><pre>empty_table()</pr
 <li class="method public "><a href="#truncate" title="truncate :: Empty a table"><span class="description">Empty a table</span><pre>truncate()</pre></a></li>
 <li class="method public "><a href="#unload_database" title="unload_database :: Unload a database from the current connection"><span class="description">Unload a database from the current connection</span><pre>unload_database()</pre></a></li>
 <li class="nav-header protected">» Protected</li>
+<li class="method protected inherited"><a href="#_prefix" title="_prefix :: Sets the table prefix on the passed string"><span class="description">Sets the table prefix on the passed string</span><pre>_prefix()</pre></a></li>
 <li class="method protected inherited"><a href="#_quote" title="_quote :: Helper method for quote_ident"><span class="description">Helper method for quote_ident</span><pre>_quote()</pre></a></li>
 <li class="nav-header">
 <i class="icon-custom icon-property"></i> Properties</li>
-<li class="property public inherited"><a href="#%24last_query" title="$last_query :: Last query executed"><span class="description">Last query executed</span><pre>$last_query</pre></a></li>
-<li class="property public inherited"><a href="#%24sql" title="$sql :: Reference to sql sub class"><span class="description">Reference to sql sub class</span><pre>$sql</pre></a></li>
-<li class="property public inherited"><a href="#%24util" title="$util :: Reference to util sub class"><span class="description">Reference to util sub class</span><pre>$util</pre></a></li>
+<li class="property public inherited"><a href="#%24last_query" title="$last_query :: "><span class="description">$last_query</span><pre>$last_query</pre></a></li>
+<li class="property public inherited"><a href="#%24sql" title="$sql :: "><span class="description">$sql</span><pre>$sql</pre></a></li>
+<li class="property public inherited"><a href="#%24table_prefix" title="$table_prefix :: "><span class="description">$table_prefix</span><pre>$table_prefix</pre></a></li>
+<li class="property public inherited"><a href="#%24util" title="$util :: "><span class="description">$util</span><pre>$util</pre></a></li>
 <li class="nav-header protected">» Protected</li>
-<li class="property protected inherited"><a href="#%24escape_char" title="$escape_char :: Character to escape identifiers"><span class="description">Character to escape identifiers</span><pre>$escape_char</pre></a></li>
+<li class="property protected inherited"><a href="#%24escape_char" title="$escape_char :: "><span class="description">$escape_char</span><pre>$escape_char</pre></a></li>
 <li class="property protected "><a href="#%24statement" title="$statement :: Reference to the last executed sql query"><span class="description">Reference to the last executed sql query</span><pre>$statement</pre></a></li>
 </ul>
 </div>
@@ -782,6 +785,25 @@ method if the database does not support 'TRUNCATE';</h2>
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
+<a name="quote_table" id="quote_table"></a><div class="element clickable method public quote_table" data-toggle="collapse" data-target=".quote_table .collapse">
+<h2>Quote database table name, and set prefix</h2>
+<pre>quote_table(mixed $table) : string</pre>
+<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::quote_table()</td>
+</tr></table>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$table</h4>
+<code>mixed</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a name="rollBack" id="rollBack"></a><div class="element clickable method public rollBack" data-toggle="collapse" data-target=".rollBack .collapse">
 <h2>rollBack()
         </h2>
@@ -859,6 +881,25 @@ method if the database does not support 'TRUNCATE';</h2>
 </div>
 </div></div>
 </div>
+<a name="_prefix" id="_prefix"></a><div class="element clickable method protected _prefix" data-toggle="collapse" data-target="._prefix .collapse">
+<h2>Sets the table prefix on the passed string</h2>
+<pre>_prefix(string $str) : string</pre>
+<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::_prefix()</td>
+</tr></table>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$str</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a name="_quote" id="_quote"></a><div class="element clickable method protected _quote" data-toggle="collapse" data-target="._quote .collapse">
 <h2>Helper method for quote_ident</h2>
 <pre>_quote(mixed $str) : mixed</pre>
@@ -881,8 +922,8 @@ method if the database does not support 'TRUNCATE';</h2>
 <h3>
 <i class="icon-custom icon-property"></i> Properties</h3>
 <a name="%24last_query" id="$last_query"> </a><div class="element clickable property public $last_query" data-toggle="collapse" data-target=".$last_query .collapse">
-<h2>Last query executed</h2>
-<pre>$last_query : string</pre>
+<h2>$last_query</h2>
+<pre>$last_query </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -893,8 +934,8 @@ method if the database does not support 'TRUNCATE';</h2>
 </div></div>
 </div>
 <a name="%24sql" id="$sql"> </a><div class="element clickable property public $sql" data-toggle="collapse" data-target=".$sql .collapse">
-<h2>Reference to sql sub class</h2>
-<pre>$sql : Object</pre>
+<h2>$sql</h2>
+<pre>$sql </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -904,9 +945,21 @@ method if the database does not support 'TRUNCATE';</h2>
 </tr></table>
 </div></div>
 </div>
+<a name="%24table_prefix" id="$table_prefix"> </a><div class="element clickable property public $table_prefix" data-toggle="collapse" data-target=".$table_prefix .collapse">
+<h2>$table_prefix</h2>
+<pre>$table_prefix </pre>
+<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::$$table_prefix</td>
+</tr></table>
+</div></div>
+</div>
 <a name="%24util" id="$util"> </a><div class="element clickable property public $util" data-toggle="collapse" data-target=".$util .collapse">
-<h2>Reference to util sub class</h2>
-<pre>$util : Object</pre>
+<h2>$util</h2>
+<pre>$util </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -917,8 +970,8 @@ method if the database does not support 'TRUNCATE';</h2>
 </div></div>
 </div>
 <a name="%24escape_char" id="$escape_char"> </a><div class="element clickable property protected $escape_char" data-toggle="collapse" data-target=".$escape_char .collapse">
-<h2>Character to escape identifiers</h2>
-<pre>$escape_char : string</pre>
+<h2>$escape_char</h2>
+<pre>$escape_char </pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -941,7 +994,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/SQLite_SQL.html b/docs/classes/SQLite_SQL.html
index 5090a22..054b29c 100644
--- a/docs/classes/SQLite_SQL.html
+++ b/docs/classes/SQLite_SQL.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -58,18 +58,13 @@
 <ul class="side-nav nav nav-list">
 <li class="nav-header">
 <i class="icon-custom icon-method"></i> Methods</li>
-<li class="method public inherited"><a href="#avg" title="avg :: Get the 'average' keyword"><span class="description">Get the 'average' keyword</span><pre>avg()</pre></a></li>
 <li class="method public "><a href="#column_list" title="column_list :: SQL to show infromation about columns in a table"><span class="description">SQL to show infromation about columns in a table</span><pre>column_list()</pre></a></li>
 <li class="method public "><a href="#db_list" title="db_list :: Returns sql to list other databases"><span class="description">Returns sql to list other databases</span><pre>db_list()</pre></a></li>
-<li class="method public inherited"><a href="#distinct" title="distinct :: Get the 'distinct' keyword"><span class="description">Get the 'distinct' keyword</span><pre>distinct()</pre></a></li>
 <li class="method public "><a href="#function_list" title="function_list :: Return sql to list functions"><span class="description">Return sql to list functions</span><pre>function_list()</pre></a></li>
 <li class="method public "><a href="#limit" title="limit :: Limit clause"><span class="description">Limit clause</span><pre>limit()</pre></a></li>
-<li class="method public inherited"><a href="#max" title="max :: Get the max keyword sql"><span class="description">Get the max keyword sql</span><pre>max()</pre></a></li>
-<li class="method public inherited"><a href="#min" title="min :: Get the min keyword sql"><span class="description">Get the min keyword sql</span><pre>min()</pre></a></li>
 <li class="method public "><a href="#procedure_list" title="procedure_list :: Return sql to list stored procedures"><span class="description">Return sql to list stored procedures</span><pre>procedure_list()</pre></a></li>
 <li class="method public "><a href="#random" title="random :: Random ordering keyword"><span class="description">Random ordering keyword</span><pre>random()</pre></a></li>
 <li class="method public "><a href="#sequence_list" title="sequence_list :: Return sql to list sequences"><span class="description">Return sql to list sequences</span><pre>sequence_list()</pre></a></li>
-<li class="method public inherited"><a href="#sum" title="sum :: Get the 'sum' keyword"><span class="description">Get the 'sum' keyword</span><pre>sum()</pre></a></li>
 <li class="method public "><a href="#system_table_list" title="system_table_list :: Overridden in SQLite class"><span class="description">Overridden in SQLite class</span><pre>system_table_list()</pre></a></li>
 <li class="method public "><a href="#table_list" title="table_list :: Returns sql to list tables"><span class="description">Returns sql to list tables</span><pre>table_list()</pre></a></li>
 <li class="method public "><a href="#trigger_list" title="trigger_list :: Returns sql to list triggers"><span class="description">Returns sql to list triggers</span><pre>trigger_list()</pre></a></li>
@@ -94,20 +89,6 @@
 </table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
-<a name="avg" id="avg"></a><div class="element clickable method public avg" data-toggle="collapse" data-target=".avg .collapse">
-<h2>Get the 'average' keyword</h2>
-<pre>avg() : string</pre>
-<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_SQL::avg()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="column_list" id="column_list"></a><div class="element clickable method public column_list" data-toggle="collapse" data-target=".column_list .collapse">
 <h2>SQL to show infromation about columns in a table</h2>
 <pre>column_list(string $table) : string</pre>
@@ -133,20 +114,6 @@
 <div class="subelement response"><code>FALSE</code></div>
 </div></div>
 </div>
-<a name="distinct" id="distinct"></a><div class="element clickable method public distinct" data-toggle="collapse" data-target=".distinct .collapse">
-<h2>Get the 'distinct' keyword</h2>
-<pre>distinct() : string</pre>
-<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_SQL::distinct()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="function_list" id="function_list"></a><div class="element clickable method public function_list" data-toggle="collapse" data-target=".function_list .collapse">
 <h2>Return sql to list functions</h2>
 <pre>function_list() : FALSE</pre>
@@ -180,34 +147,6 @@
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
-<a name="max" id="max"></a><div class="element clickable method public max" data-toggle="collapse" data-target=".max .collapse">
-<h2>Get the max keyword sql</h2>
-<pre>max() : string</pre>
-<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_SQL::max()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
-<a name="min" id="min"></a><div class="element clickable method public min" data-toggle="collapse" data-target=".min .collapse">
-<h2>Get the min keyword sql</h2>
-<pre>min() : string</pre>
-<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_SQL::min()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="procedure_list" id="procedure_list"></a><div class="element clickable method public procedure_list" data-toggle="collapse" data-target=".procedure_list .collapse">
 <h2>Return sql to list stored procedures</h2>
 <pre>procedure_list() : FALSE</pre>
@@ -238,20 +177,6 @@
 <div class="subelement response"><code>FALSE</code></div>
 </div></div>
 </div>
-<a name="sum" id="sum"></a><div class="element clickable method public sum" data-toggle="collapse" data-target=".sum .collapse">
-<h2>Get the 'sum' keyword</h2>
-<pre>sum() : string</pre>
-<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_SQL::sum()</td>
-</tr></table>
-<h3>Returns</h3>
-<div class="subelement response"><code>string</code></div>
-</div></div>
-</div>
 <a name="system_table_list" id="system_table_list"></a><div class="element clickable method public system_table_list" data-toggle="collapse" data-target=".system_table_list .collapse">
 <h2>Overridden in SQLite class</h2>
 <pre>system_table_list() : string</pre>
@@ -309,7 +234,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/SQLite_Util.html b/docs/classes/SQLite_Util.html
index 1112635..a9045b6 100644
--- a/docs/classes/SQLite_Util.html
+++ b/docs/classes/SQLite_Util.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -209,7 +209,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/deprecated.html b/docs/deprecated.html
index f1bd31f..89fcde6 100644
--- a/docs/deprecated.html
+++ b/docs/deprecated.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/errors.html b/docs/errors.html
index ddeab6d..92bad1b 100644
--- a/docs/errors.html
+++ b/docs/errors.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -57,6 +57,7 @@
 <button class="btn critical">Critical</button><button class="btn error">Error</button><button class="btn notice">Notice</button>
 </div></li>
 <li class="nav-header">Navigation</li>
+<li><a href="#classes/db_pdo.php"><i class="icon-file"></i>classes/db_pdo.php</a></li>
 <li><a href="#classes/query_builder.php"><i class="icon-file"></i>classes/query_builder.php</a></li>
 </ul></div>
 <div class="span8">
@@ -68,7 +69,50 @@
 </ul>
 <div class="package-contents"></div>
 <div class="package-contents"></div>
-<div class="package-contents"></div>
+<div class="package-contents">
+<a name="classes/db_pdo.php" id="classes/db_pdo.php"></a><h3>
+<i class="icon-file"></i>classes/db_pdo.php<small style="float: right;padding-right: 10px;">6</small>
+</h3>
+<div><table class="table markers table-bordered">
+<thead><tr>
+<th>Type</th>
+<th>Line</th>
+<th>Description</th>
+</tr></thead>
+<tbody>
+<tr class="error">
+<td>error</td>
+<td>27</td>
+<td>No DocBlock was found for property $statement</td>
+</tr>
+<tr class="error">
+<td>error</td>
+<td>30</td>
+<td>No DocBlock was found for property $escape_char</td>
+</tr>
+<tr class="error">
+<td>error</td>
+<td>33</td>
+<td>No DocBlock was found for property $sql</td>
+</tr>
+<tr class="error">
+<td>error</td>
+<td>36</td>
+<td>No DocBlock was found for property $util</td>
+</tr>
+<tr class="error">
+<td>error</td>
+<td>39</td>
+<td>No DocBlock was found for property $last_query</td>
+</tr>
+<tr class="error">
+<td>error</td>
+<td>42</td>
+<td>No DocBlock was found for property $table_prefix</td>
+</tr>
+</tbody>
+</table></div>
+</div>
 <div class="package-contents">
 <a name="classes/query_builder.php" id="classes/query_builder.php"></a><h3>
 <i class="icon-file"></i>classes/query_builder.php<small style="float: right;padding-right: 10px;">18</small>
@@ -82,92 +126,92 @@
 <tbody>
 <tr class="error">
 <td>error</td>
-<td>50</td>
+<td>30</td>
 <td>No DocBlock was found for property $select_string</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>53</td>
+<td>33</td>
 <td>No DocBlock was found for property $from_string</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>56</td>
+<td>36</td>
 <td>No DocBlock was found for property $set_string</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>59</td>
+<td>39</td>
 <td>No DocBlock was found for property $order_string</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>62</td>
+<td>42</td>
 <td>No DocBlock was found for property $group_string</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>69</td>
+<td>49</td>
 <td>No DocBlock was found for property $set_array_keys</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>72</td>
+<td>52</td>
 <td>No DocBlock was found for property $order_array</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>75</td>
+<td>55</td>
 <td>No DocBlock was found for property $group_array</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>82</td>
+<td>62</td>
 <td>No DocBlock was found for property $values</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>85</td>
+<td>65</td>
 <td>No DocBlock was found for property $where_values</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>88</td>
+<td>68</td>
 <td>No DocBlock was found for property $limit</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>91</td>
+<td>71</td>
 <td>No DocBlock was found for property $offset</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>94</td>
+<td>74</td>
 <td>No DocBlock was found for property $sql</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>97</td>
+<td>77</td>
 <td>No DocBlock was found for property $table_prefix</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>108</td>
+<td>88</td>
 <td>No DocBlock was found for property $query_map</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>111</td>
+<td>91</td>
 <td>No DocBlock was found for property $having_map</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>114</td>
+<td>94</td>
 <td>No DocBlock was found for property $conn_name</td>
 </tr>
 <tr class="error">
 <td>error</td>
-<td>117</td>
+<td>97</td>
 <td>No DocBlock was found for property $queries</td>
 </tr>
 </tbody>
@@ -191,12 +235,13 @@
 <div class="package-contents"></div>
 <div class="package-contents"></div>
 <div class="package-contents"></div>
+<div class="package-contents"></div>
 </div>
 </div>
 <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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/graph_class.html b/docs/graph_class.html
index 5263b4e..53419ea 100644
--- a/docs/graph_class.html
+++ b/docs/graph_class.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -65,7 +65,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/markers.html b/docs/markers.html
index eceec51..ca4395c 100644
--- a/docs/markers.html
+++ b/docs/markers.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -146,7 +146,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html
index bc4b6cb..8fabb5e 100644
--- a/docs/namespaces/default.html
+++ b/docs/namespaces/default.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -318,7 +318,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/.html b/docs/packages/.html
index 3c5a87a..4a9eecb 100644
--- a/docs/packages/.html
+++ b/docs/packages/.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/Default.html b/docs/packages/Default.html
index c87b833..a56b5ce 100644
--- a/docs/packages/Default.html
+++ b/docs/packages/Default.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -95,7 +95,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/Query.Drivers.html b/docs/packages/Query.Drivers.html
index bf8eedb..84cc3ae 100644
--- a/docs/packages/Query.Drivers.html
+++ b/docs/packages/Query.Drivers.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -212,7 +212,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/Query.Query.html b/docs/packages/Query.Query.html
index 614da7a..c57274a 100644
--- a/docs/packages/Query.Query.html
+++ b/docs/packages/Query.Query.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -66,11 +66,11 @@
 <li><a href="#Query_Parser" title="Utility Class to parse sql clauses for properly escaping identifiers">Query_Parser</a></li>
 <li><a href="#DB_SQL" title="Abstract parent for database manipulation subclasses">DB_SQL</a></li>
 <li><a href="#DB_PDO" title="Base Database class">DB_PDO</a></li>
-<li><a href="#BadDBDriverException" title="Generic exception for bad drivers">BadDBDriverException</a></li>
-<li><a href="#BadConnectionException" title="Generic exception for bad connection strings">BadConnectionException</a></li>
 <li><a href="#Query_Builder" title="Convienience class for creating sql queries - also the class that
 instantiates the specific db driver">Query_Builder</a></li>
 <li><a href="#DB_Util" title="Abstract class defining database / table creation methods">DB_Util</a></li>
+<li><a href="#BadDBDriverException" title="Generic exception for bad drivers">BadDBDriverException</a></li>
+<li><a href="#BadConnectionException" title="Generic exception for bad connection strings">BadConnectionException</a></li>
 </ul>
 </div>
 <div class="span8 package-contents">
@@ -140,7 +140,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/Query.html b/docs/packages/Query.html
index 8a10816..74be23e 100644
--- a/docs/packages/Query.html
+++ b/docs/packages/Query.html
@@ -32,7 +32,7 @@
 <a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
                                     Reports <b class="caret"></b></a><ul class="dropdown-menu">
 <li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">18</span></a></li>
+                <span class="label label-info">24</span></a></li>
 <li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
                 <ul><li>todo 
                 <span class="label label-info">4</span>
@@ -339,7 +339,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-10-30T16:14:25Z.<br></footer></div>
+            generated on 2012-11-07T08:57:16-05:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/structure.xml b/docs/structure.xml
index 29ee1b1..177b227 100644
--- a/docs/structure.xml
+++ b/docs/structure.xml
@@ -98,7 +98,7 @@
       </method>
     </class>
   </file>
-  <file path="classes/db_sql.php" hash="14cb2bdd5a651d09acb10a4f583d4927" package="Query">
+  <file path="classes/db_sql.php" hash="e4c5a5a67443d4800e90044ad0b54876" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -118,221 +118,166 @@
         <tag line="16" name="package" description="Query"/>
         <tag line="16" name="subpackage" description="Query"/>
       </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="33" package="">
-        <name>max</name>
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="33" package="">
+        <name>limit</name>
         <type>function</type>
-        <docblock line="28">
-          <description><![CDATA[Get the max keyword sql]]></description>
+        <docblock line="24">
+          <description><![CDATA[Get database specific sql for limit clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="28" name="return" description="" type="string">
+          <tag line="24" name="abstract" description=""/>
+          <tag line="24" name="param" description="" type="string" variable="$sql">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="24" name="param" description="" type="int" variable="$limit">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="24" name="param" description="" type="int" variable="$offset">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="24" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="33">
+          <name>$sql</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="33">
+          <name>$limit</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="33">
+          <name>$offset</name>
+          <default><![CDATA[FALSE]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="41" package="">
+        <name>random</name>
+        <type>function</type>
+        <docblock line="35">
+          <description><![CDATA[Get the sql for random ordering]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="35" name="abstract" description=""/>
+          <tag line="35" 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="45" package="">
-        <name>min</name>
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="48" package="">
+        <name>db_list</name>
         <type>function</type>
-        <docblock line="40">
-          <description><![CDATA[Get the min keyword sql]]></description>
+        <docblock line="43">
+          <description><![CDATA[Returns sql to list other databases]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="40" name="return" description="" type="string">
+          <tag line="43" 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="57" package="">
-        <name>distinct</name>
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="55" package="">
+        <name>table_list</name>
         <type>function</type>
-        <docblock line="52">
-          <description><![CDATA[Get the 'distinct' keyword]]></description>
+        <docblock line="50">
+          <description><![CDATA[Returns sql to list tables]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="52" name="return" description="" type="string">
+          <tag line="50" 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="69" package="">
-        <name>avg</name>
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="62" package="">
+        <name>system_table_list</name>
+        <type>function</type>
+        <docblock line="57">
+          <description><![CDATA[Returns sql to list system tables]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="57" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="69" package="">
+        <name>view_list</name>
         <type>function</type>
         <docblock line="64">
-          <description><![CDATA[Get the 'average' keyword]]></description>
+          <description><![CDATA[Returns sql to list views]]></description>
           <long-description><![CDATA[]]></long-description>
           <tag line="64" 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="81" package="">
-        <name>sum</name>
-        <type>function</type>
-        <docblock line="76">
-          <description><![CDATA[Get the 'sum' keyword]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="76" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="99" package="">
-        <name>limit</name>
-        <type>function</type>
-        <docblock line="90">
-          <description><![CDATA[Get database specific sql for limit clause]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="90" name="abstract" description=""/>
-          <tag line="90" name="param" description="" type="string" variable="$sql">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="90" name="param" description="" type="int" variable="$limit">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="90" name="param" description="" type="int" variable="$offset">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="90" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="99">
-          <name>$sql</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="99">
-          <name>$limit</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="99">
-          <name>$offset</name>
-          <default><![CDATA[FALSE]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="107" package="">
-        <name>random</name>
-        <type>function</type>
-        <docblock line="101">
-          <description><![CDATA[Get the sql for random ordering]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="101" name="abstract" description=""/>
-          <tag line="101" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="114" package="">
-        <name>db_list</name>
-        <type>function</type>
-        <docblock line="109">
-          <description><![CDATA[Returns sql to list other databases]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="109" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="121" package="">
-        <name>table_list</name>
-        <type>function</type>
-        <docblock line="116">
-          <description><![CDATA[Returns sql to list tables]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="116" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="128" package="">
-        <name>system_table_list</name>
-        <type>function</type>
-        <docblock line="123">
-          <description><![CDATA[Returns sql to list system tables]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="123" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="135" package="">
-        <name>view_list</name>
-        <type>function</type>
-        <docblock line="130">
-          <description><![CDATA[Returns sql to list views]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="130" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="142" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="76" package="">
         <name>trigger_list</name>
         <type>function</type>
-        <docblock line="137">
+        <docblock line="71">
           <description><![CDATA[Returns sql to list triggers]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="137" name="return" description="" type="string">
+          <tag line="71" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="149" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="83" package="">
         <name>function_list</name>
         <type>function</type>
-        <docblock line="144">
+        <docblock line="78">
           <description><![CDATA[Return sql to list functions]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="144" name="return" description="" type="FALSE">
+          <tag line="78" name="return" description="" type="FALSE">
             <type by_reference="false">FALSE</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="156" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="90" package="">
         <name>procedure_list</name>
         <type>function</type>
-        <docblock line="151">
+        <docblock line="85">
           <description><![CDATA[Return sql to list stored procedures]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="151" name="return" description="" type="string">
+          <tag line="85" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="163" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="97" package="">
         <name>sequence_list</name>
         <type>function</type>
-        <docblock line="158">
+        <docblock line="92">
           <description><![CDATA[Return sql to list sequences]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="158" name="return" description="" type="string">
+          <tag line="92" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="170" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="104" package="">
         <name>type_list</name>
         <type>function</type>
-        <docblock line="165">
+        <docblock line="99">
           <description><![CDATA[Return sql to list database field types]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="165" name="return" description="" type="mixed">
+          <tag line="99" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="179" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="113" package="">
         <name>column_list</name>
         <type>function</type>
-        <docblock line="172">
+        <docblock line="106">
           <description><![CDATA[Get information about the columns in the
 specified table]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="172" name="param" description="string" type="" variable="$table"/>
-          <tag line="172" name="return" description="" type="string">
+          <tag line="106" name="param" description="string" type="" variable="$table"/>
+          <tag line="106" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="179">
+        <argument line="113">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
@@ -340,492 +285,7 @@ specified table]]></description>
       </method>
     </class>
   </file>
-  <file path="classes/db_pdo.php" hash="57df6f87b8d9718d9fc17cfaf6bcb5d2" package="Query">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="package" description="Query"/>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="true" namespace="default" line="24" package="Query\Query">
-      <name>DB_PDO</name>
-      <full_name>\DB_PDO</full_name>
-      <extends>\PDO</extends>
-      <docblock line="16">
-        <description><![CDATA[Base Database class]]></description>
-        <long-description><![CDATA[<p>Extends PDO to simplify cross-database issues</p>]]></long-description>
-        <tag line="16" name="package" description="Query"/>
-        <tag line="16" name="subpackage" description="Query"/>
-      </docblock>
-      <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 executed query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="26" name="var" description="" type="mixed">
-            <type by_reference="false">mixed</type>
-          </tag>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="38" package="Default">
-        <name>$escape_char</name>
-        <default><![CDATA['"']]></default>
-        <docblock line="33">
-          <description><![CDATA[Character to escape identifiers]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="33" name="var" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="public" line="45" package="Default">
-        <name>$sql</name>
-        <default><![CDATA[]]></default>
-        <docblock line="40">
-          <description><![CDATA[Reference to sql sub class]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="40" name="var" description="" type="Object">
-            <type by_reference="false">Object</type>
-          </tag>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="public" line="52" package="Default">
-        <name>$util</name>
-        <default><![CDATA[]]></default>
-        <docblock line="47">
-          <description><![CDATA[Reference to util sub class]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="47" name="var" description="" type="Object">
-            <type by_reference="false">Object</type>
-          </tag>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="public" line="59" package="Default">
-        <name>$last_query</name>
-        <default><![CDATA[]]></default>
-        <docblock line="54">
-          <description><![CDATA[Last query executed]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="54" name="var" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="69" package="">
-        <name>__construct</name>
-        <type>function</type>
-        <docblock line="61">
-          <description><![CDATA[PDO constructor wrapper]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="61" name="param" description="" type="string" variable="$dsn">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="61" name="param" description="" type="string" variable="$username">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="61" name="param" description="" type="string" variable="$password">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="61" name="param" description="" type="array" variable="$driver_options">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-        <argument line="69">
-          <name>$dsn</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="69">
-          <name>$username</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-        <argument line="69">
-          <name>$password</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-        <argument line="69">
-          <name>$driver_options</name>
-          <default><![CDATA[array()]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="95" package="">
-        <name>prepare_query</name>
-        <type>function</type>
-        <docblock line="88">
-          <description><![CDATA[Simplifies prepared statements for database queries]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="88" name="param" description="" type="string" variable="$sql">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="88" name="param" description="" type="array" variable="$data">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="88" name="return" description="PDOStatement / FALSE" type="mixed">
-            <type by_reference="false">mixed</type>
-          </tag>
-        </docblock>
-        <argument line="95">
-          <name>$sql</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="95">
-          <name>$data</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="146" package="">
-        <name>prepare_execute</name>
-        <type>function</type>
-        <docblock line="139">
-          <description><![CDATA[Create and execute a prepared statement with the provided parameters]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="139" name="param" description="" type="string" variable="$sql">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="139" name="param" description="" type="array" variable="$params">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="139" name="return" description="" type="\PDOStatement">
-            <type by_reference="false">\PDOStatement</type>
-          </tag>
-        </docblock>
-        <argument line="146">
-          <name>$sql</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="146">
-          <name>$params</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="162" package="">
-        <name>get_query_data</name>
-        <type>function</type>
-        <docblock line="156">
-          <description><![CDATA[Retreives the data from a select query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="156" name="param" description="" type="\PDOStatement" variable="$statement">
-            <type by_reference="false">\PDOStatement</type>
-          </tag>
-          <tag line="156" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-        <argument line="162">
-          <name>$statement</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="181" package="">
-        <name>affected_rows</name>
-        <type>function</type>
-        <docblock line="175">
-          <description><![CDATA[Returns number of rows affected by an INSERT, UPDATE, DELETE type query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="175" name="param" description="" type="\PDOStatement" variable="$statement">
-            <type by_reference="false">\PDOStatement</type>
-          </tag>
-          <tag line="175" name="return" description="" type="int">
-            <type by_reference="false">int</type>
-          </tag>
-        </docblock>
-        <argument line="181">
-          <name>$statement</name>
-          <default><![CDATA['']]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="199" package="">
-        <name>get_last_error</name>
-        <type>function</type>
-        <docblock line="194">
-          <description><![CDATA[Return the last error for the current database connection]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="194" 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="214" package="">
-        <name>quote_ident</name>
-        <type>function</type>
-        <docblock line="208">
-          <description><![CDATA[Surrounds the string with the databases identifier escape characters]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="208" name="param" description="" type="mixed" variable="$ident">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="208" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="214">
-          <name>$ident</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="protected" namespace="default" line="246" package="">
-        <name>_quote</name>
-        <type>function</type>
-        <docblock line="240">
-          <description><![CDATA[Helper method for quote_ident]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="240" name="param" description="" type="mixed" variable="$str">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="240" name="return" description="" type="mixed">
-            <type by_reference="false">mixed</type>
-          </tag>
-        </docblock>
-        <argument line="246">
-          <name>$str</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="272" package="">
-        <name>empty_table</name>
-        <type>function</type>
-        <docblock line="265">
-          <description><![CDATA[Deletes all the rows from a table. Does the same as the truncate
-method if the database does not support 'TRUNCATE';]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="265" name="param" description="" type="string" variable="$table">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="265" name="return" description="" type="mixed">
-            <type by_reference="false">mixed</type>
-          </tag>
-        </docblock>
-        <argument line="272">
-          <name>$table</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="286" package="">
-        <name>get_schemas</name>
-        <type>function</type>
-        <docblock line="281">
-          <description><![CDATA[Return schemas for databases that list them]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="281" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="298" package="">
-        <name>get_tables</name>
-        <type>function</type>
-        <docblock line="293">
-          <description><![CDATA[Return list of tables for the current database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="293" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="310" package="">
-        <name>get_dbs</name>
-        <type>function</type>
-        <docblock line="305">
-          <description><![CDATA[Return list of dbs for the current connection, if possible]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="305" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="322" package="">
-        <name>get_views</name>
-        <type>function</type>
-        <docblock line="317">
-          <description><![CDATA[Return list of views for the current database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="317" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="334" package="">
-        <name>get_sequences</name>
-        <type>function</type>
-        <docblock line="329">
-          <description><![CDATA[Return list of sequences for the current database, if they exist]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="329" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="346" package="">
-        <name>get_functions</name>
-        <type>function</type>
-        <docblock line="341">
-          <description><![CDATA[Return list of function for the current database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="341" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="358" package="">
-        <name>get_procedures</name>
-        <type>function</type>
-        <docblock line="353">
-          <description><![CDATA[Return list of stored procedures for the current database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="353" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="370" package="">
-        <name>get_triggers</name>
-        <type>function</type>
-        <docblock line="365">
-          <description><![CDATA[Return list of triggers for the current database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="365" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="383" package="">
-        <name>get_system_tables</name>
-        <type>function</type>
-        <docblock line="377">
-          <description><![CDATA[Retreives an array of non-user-created tables for
-the connection/database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="377" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="396" package="">
-        <name>get_columns</name>
-        <type>function</type>
-        <docblock line="390">
-          <description><![CDATA[Retrieve column information for the current database table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="390" name="param" description="" type="string" variable="$table">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="390" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-        <argument line="396">
-          <name>$table</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="408" package="">
-        <name>get_types</name>
-        <type>function</type>
-        <docblock line="403">
-          <description><![CDATA[Retrieve list of data types for the database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="403" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="422" package="">
-        <name>driver_query</name>
-        <type>function</type>
-        <docblock line="415">
-          <description><![CDATA[Method to simplify retreiving db results for meta-data queries]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="415" name="param" description="" type="string" variable="$sql">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="415" name="param" description="" type="bool" variable="$filtered_index">
-            <type by_reference="false">bool</type>
-          </tag>
-          <tag line="415" name="return" description="" type="mixed">
-            <type by_reference="false">mixed</type>
-          </tag>
-        </docblock>
-        <argument line="422">
-          <name>$sql</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="422">
-          <name>$filtered_index</name>
-          <default><![CDATA[TRUE]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="452" package="">
-        <name>num_rows</name>
-        <type>function</type>
-        <docblock line="446">
-          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="446" name="see" description="\http://us3.php.net/manual/en/pdostatement.rowcount.php#87110" refers="\http://us3.php.net/manual/en/pdostatement.rowcount.php#87110"/>
-          <tag line="446" 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="477" package="">
-        <name>truncate</name>
-        <type>function</type>
-        <docblock line="470">
-          <description><![CDATA[Empty the passed table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="470" name="param" description="" type="string" variable="$table">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="470" name="return" description="" type="void">
-            <type by_reference="false">void</type>
-          </tag>
-        </docblock>
-        <argument line="477">
-          <name>$table</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="485" package="">
-        <name>switch_db</name>
-        <type>function</type>
-        <docblock line="479">
-          <description><![CDATA[Connect to a different database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="479" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="479" name="return" description="" type="void">
-            <type by_reference="false">void</type>
-          </tag>
-        </docblock>
-        <argument line="485">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-    </class>
-  </file>
-  <file path="classes/query_builder.php" hash="49ec7fb7f06f781ac0d38298649dfc45" package="Query">
+  <file path="classes/db_pdo.php" hash="0475acd2bc103089375c5e5dc6aa4762" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -836,197 +296,729 @@ the connection/database]]></description>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
     <parse_markers>
-      <error line="50" code="50018">No DocBlock was found for property $select_string</error>
-      <error line="53" code="50018">No DocBlock was found for property $from_string</error>
-      <error line="56" code="50018">No DocBlock was found for property $set_string</error>
-      <error line="59" code="50018">No DocBlock was found for property $order_string</error>
-      <error line="62" code="50018">No DocBlock was found for property $group_string</error>
-      <error line="69" code="50018">No DocBlock was found for property $set_array_keys</error>
-      <error line="72" code="50018">No DocBlock was found for property $order_array</error>
-      <error line="75" code="50018">No DocBlock was found for property $group_array</error>
-      <error line="82" code="50018">No DocBlock was found for property $values</error>
-      <error line="85" code="50018">No DocBlock was found for property $where_values</error>
-      <error line="88" code="50018">No DocBlock was found for property $limit</error>
-      <error line="91" code="50018">No DocBlock was found for property $offset</error>
-      <error line="94" code="50018">No DocBlock was found for property $sql</error>
-      <error line="97" code="50018">No DocBlock was found for property $table_prefix</error>
-      <error line="108" code="50018">No DocBlock was found for property $query_map</error>
-      <error line="111" code="50018">No DocBlock was found for property $having_map</error>
-      <error line="114" code="50018">No DocBlock was found for property $conn_name</error>
-      <error line="117" code="50018">No DocBlock was found for property $queries</error>
+      <error line="27" code="50018">No DocBlock was found for property $statement</error>
+      <error line="30" code="50018">No DocBlock was found for property $escape_char</error>
+      <error line="33" code="50018">No DocBlock was found for property $sql</error>
+      <error line="36" code="50018">No DocBlock was found for property $util</error>
+      <error line="39" code="50018">No DocBlock was found for property $last_query</error>
+      <error line="42" code="50018">No DocBlock was found for property $table_prefix</error>
     </parse_markers>
-    <class final="false" abstract="false" namespace="default" line="22" package="Query\Query">
-      <name>BadDBDriverException</name>
-      <full_name>\BadDBDriverException</full_name>
-      <extends>\InvalidArgumentException</extends>
+    <class final="false" abstract="true" namespace="default" line="24" package="Query\Query">
+      <name>DB_PDO</name>
+      <full_name>\DB_PDO</full_name>
+      <extends>\PDO</extends>
       <docblock line="16">
-        <description><![CDATA[Generic exception for bad drivers]]></description>
-        <long-description><![CDATA[]]></long-description>
+        <description><![CDATA[Base Database class]]></description>
+        <long-description><![CDATA[<p>Extends PDO to simplify cross-database issues</p>]]></long-description>
         <tag line="16" name="package" description="Query"/>
         <tag line="16" name="subpackage" description="Query"/>
       </docblock>
-    </class>
-    <class final="false" abstract="false" namespace="default" line="32" package="Query\Query">
-      <name>BadConnectionException</name>
-      <full_name>\BadConnectionException</full_name>
-      <extends>\UnexpectedValueException</extends>
-      <docblock line="26">
-        <description><![CDATA[Generic exception for bad connection strings]]></description>
-        <long-description><![CDATA[]]></long-description>
-        <tag line="26" name="package" description="Query"/>
-        <tag line="26" name="subpackage" description="Query"/>
-      </docblock>
-    </class>
-    <class final="false" abstract="false" namespace="default" line="43" package="Query\Query">
-      <name>Query_Builder</name>
-      <full_name>\Query_Builder</full_name>
-      <extends/>
-      <docblock line="36">
-        <description><![CDATA[Convienience class for creating sql queries - also the class that
-instantiates the specific db driver]]></description>
-        <long-description><![CDATA[]]></long-description>
-        <tag line="36" name="package" description="Query"/>
-        <tag line="36" name="subpackage" description="Query"/>
-      </docblock>
-      <property final="false" static="false" visibility="private" line="50" package="Default">
-        <name>$select_string</name>
+      <property final="false" static="false" visibility="protected" line="27" package="Default">
+        <name>$statement</name>
         <default><![CDATA[]]></default>
       </property>
-      <property final="false" static="false" visibility="private" line="53" package="Default">
-        <name>$from_string</name>
-        <default><![CDATA[]]></default>
+      <property final="false" static="false" visibility="protected" line="30" package="Default">
+        <name>$escape_char</name>
+        <default><![CDATA['"']]></default>
       </property>
-      <property final="false" static="false" visibility="private" line="56" package="Default">
-        <name>$set_string</name>
-        <default><![CDATA[]]></default>
-      </property>
-      <property final="false" static="false" visibility="private" line="59" package="Default">
-        <name>$order_string</name>
-        <default><![CDATA[]]></default>
-      </property>
-      <property final="false" static="false" visibility="private" line="62" package="Default">
-        <name>$group_string</name>
-        <default><![CDATA[]]></default>
-      </property>
-      <property final="false" static="false" visibility="private" line="69" package="Default">
-        <name>$set_array_keys</name>
-        <default><![CDATA[]]></default>
-      </property>
-      <property final="false" static="false" visibility="private" line="72" package="Default">
-        <name>$order_array</name>
-        <default><![CDATA[]]></default>
-      </property>
-      <property final="false" static="false" visibility="private" line="75" package="Default">
-        <name>$group_array</name>
-        <default><![CDATA[]]></default>
-      </property>
-      <property final="false" static="false" visibility="private" line="82" package="Default">
-        <name>$values</name>
-        <default><![CDATA[array()]]></default>
-      </property>
-      <property final="false" static="false" visibility="private" line="85" package="Default">
-        <name>$where_values</name>
-        <default><![CDATA[array()]]></default>
-      </property>
-      <property final="false" static="false" visibility="private" line="88" package="Default">
-        <name>$limit</name>
-        <default><![CDATA[]]></default>
-      </property>
-      <property final="false" static="false" visibility="private" line="91" package="Default">
-        <name>$offset</name>
-        <default><![CDATA[]]></default>
-      </property>
-      <property final="false" static="false" visibility="public" line="94" package="Default">
+      <property final="false" static="false" visibility="public" line="33" package="Default">
         <name>$sql</name>
         <default><![CDATA[]]></default>
       </property>
-      <property final="false" static="false" visibility="public" line="97" package="Default">
+      <property final="false" static="false" visibility="public" line="36" package="Default">
+        <name>$util</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="public" line="39" package="Default">
+        <name>$last_query</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="public" line="42" package="Default">
         <name>$table_prefix</name>
         <default><![CDATA['']]></default>
       </property>
-      <property final="false" static="false" visibility="private" line="108" package="Default">
-        <name>$query_map</name>
-        <default><![CDATA[]]></default>
-      </property>
-      <property final="false" static="false" visibility="private" line="111" package="Default">
-        <name>$having_map</name>
-        <default><![CDATA[]]></default>
-      </property>
-      <property final="false" static="false" visibility="public" line="114" package="Default">
-        <name>$conn_name</name>
-        <default><![CDATA[""]]></default>
-      </property>
-      <property final="false" static="false" visibility="public" line="117" package="Default">
-        <name>$queries</name>
-        <default><![CDATA[]]></default>
-      </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="128" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="52" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="123">
-          <description><![CDATA[Constructor]]></description>
+        <docblock line="44">
+          <description><![CDATA[PDO constructor wrapper]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="123" name="param" description="- the connection parametere" type="object" variable="$params">
-            <type by_reference="false">object</type>
+          <tag line="44" name="param" description="" type="string" variable="$dsn">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="44" name="param" description="" type="string" variable="$username">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="44" name="param" description="" type="string" variable="$password">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="44" name="param" description="" type="array" variable="$driver_options">
+            <type by_reference="false">array</type>
           </tag>
         </docblock>
-        <argument line="128">
+        <argument line="52">
+          <name>$dsn</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="52">
+          <name>$username</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+        <argument line="52">
+          <name>$password</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+        <argument line="52">
+          <name>$driver_options</name>
+          <default><![CDATA[array()]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="78" package="">
+        <name>prepare_query</name>
+        <type>function</type>
+        <docblock line="71">
+          <description><![CDATA[Simplifies prepared statements for database queries]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="71" name="param" description="" type="string" variable="$sql">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="71" name="param" description="" type="array" variable="$data">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="71" name="return" description="PDOStatement / FALSE" type="mixed">
+            <type by_reference="false">mixed</type>
+          </tag>
+        </docblock>
+        <argument line="78">
+          <name>$sql</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="78">
+          <name>$data</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="129" package="">
+        <name>prepare_execute</name>
+        <type>function</type>
+        <docblock line="122">
+          <description><![CDATA[Create and execute a prepared statement with the provided parameters]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="122" name="param" description="" type="string" variable="$sql">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="122" name="param" description="" type="array" variable="$params">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="122" name="return" description="" type="\PDOStatement">
+            <type by_reference="false">\PDOStatement</type>
+          </tag>
+        </docblock>
+        <argument line="129">
+          <name>$sql</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="129">
           <name>$params</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="236" package="">
-        <name>select</name>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="145" package="">
+        <name>get_query_data</name>
         <type>function</type>
-        <docblock line="230">
-          <description><![CDATA[Specifies rows to select in a query]]></description>
+        <docblock line="139">
+          <description><![CDATA[Retreives the data from a select query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="230" name="param" description="" type="string" variable="$fields">
+          <tag line="139" name="param" description="" type="\PDOStatement" variable="$statement">
+            <type by_reference="false">\PDOStatement</type>
+          </tag>
+          <tag line="139" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+        <argument line="145">
+          <name>$statement</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="164" package="">
+        <name>affected_rows</name>
+        <type>function</type>
+        <docblock line="158">
+          <description><![CDATA[Returns number of rows affected by an INSERT, UPDATE, DELETE type query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="158" name="param" description="" type="\PDOStatement" variable="$statement">
+            <type by_reference="false">\PDOStatement</type>
+          </tag>
+          <tag line="158" name="return" description="" type="int">
+            <type by_reference="false">int</type>
+          </tag>
+        </docblock>
+        <argument line="164">
+          <name>$statement</name>
+          <default><![CDATA['']]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="182" package="">
+        <name>get_last_error</name>
+        <type>function</type>
+        <docblock line="177">
+          <description><![CDATA[Return the last error for the current database connection]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="177" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="230" name="return" description="" type="\$this">
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="197" package="">
+        <name>quote_table</name>
+        <type>function</type>
+        <docblock line="191">
+          <description><![CDATA[Quote database table name, and set prefix]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="191" name="param" description="" type="mixed" variable="$table">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="191" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="197">
+          <name>$table</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="protected" namespace="default" line="240" package="">
+        <name>_prefix</name>
+        <type>function</type>
+        <docblock line="234">
+          <description><![CDATA[Sets the table prefix on the passed string]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="234" name="param" description="" type="string" variable="$str">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="234" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="240">
+          <name>$str</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="259" package="">
+        <name>quote_ident</name>
+        <type>function</type>
+        <docblock line="253">
+          <description><![CDATA[Surrounds the string with the databases identifier escape characters]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="253" name="param" description="" type="mixed" variable="$ident">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="253" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="259">
+          <name>$ident</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="protected" namespace="default" line="291" package="">
+        <name>_quote</name>
+        <type>function</type>
+        <docblock line="285">
+          <description><![CDATA[Helper method for quote_ident]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="285" name="param" description="" type="mixed" variable="$str">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="285" name="return" description="" type="mixed">
+            <type by_reference="false">mixed</type>
+          </tag>
+        </docblock>
+        <argument line="291">
+          <name>$str</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="317" package="">
+        <name>empty_table</name>
+        <type>function</type>
+        <docblock line="310">
+          <description><![CDATA[Deletes all the rows from a table. Does the same as the truncate
+method if the database does not support 'TRUNCATE';]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="310" name="param" description="" type="string" variable="$table">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="310" name="return" description="" type="mixed">
+            <type by_reference="false">mixed</type>
+          </tag>
+        </docblock>
+        <argument line="317">
+          <name>$table</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="331" package="">
+        <name>get_schemas</name>
+        <type>function</type>
+        <docblock line="326">
+          <description><![CDATA[Return schemas for databases that list them]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="326" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="343" package="">
+        <name>get_tables</name>
+        <type>function</type>
+        <docblock line="338">
+          <description><![CDATA[Return list of tables for the current database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="338" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="355" package="">
+        <name>get_dbs</name>
+        <type>function</type>
+        <docblock line="350">
+          <description><![CDATA[Return list of dbs for the current connection, if possible]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="350" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="367" package="">
+        <name>get_views</name>
+        <type>function</type>
+        <docblock line="362">
+          <description><![CDATA[Return list of views for the current database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="362" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="379" package="">
+        <name>get_sequences</name>
+        <type>function</type>
+        <docblock line="374">
+          <description><![CDATA[Return list of sequences for the current database, if they exist]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="374" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="391" package="">
+        <name>get_functions</name>
+        <type>function</type>
+        <docblock line="386">
+          <description><![CDATA[Return list of function for the current database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="386" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="403" package="">
+        <name>get_procedures</name>
+        <type>function</type>
+        <docblock line="398">
+          <description><![CDATA[Return list of stored procedures for the current database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="398" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="415" package="">
+        <name>get_triggers</name>
+        <type>function</type>
+        <docblock line="410">
+          <description><![CDATA[Return list of triggers for the current database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="410" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="428" package="">
+        <name>get_system_tables</name>
+        <type>function</type>
+        <docblock line="422">
+          <description><![CDATA[Retreives an array of non-user-created tables for
+the connection/database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="422" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="441" package="">
+        <name>get_columns</name>
+        <type>function</type>
+        <docblock line="435">
+          <description><![CDATA[Retrieve column information for the current database table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="435" name="param" description="" type="string" variable="$table">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="435" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+        <argument line="441">
+          <name>$table</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="453" package="">
+        <name>get_types</name>
+        <type>function</type>
+        <docblock line="448">
+          <description><![CDATA[Retrieve list of data types for the database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="448" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="467" package="">
+        <name>driver_query</name>
+        <type>function</type>
+        <docblock line="460">
+          <description><![CDATA[Method to simplify retreiving db results for meta-data queries]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="460" name="param" description="" type="string" variable="$sql">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="460" name="param" description="" type="bool" variable="$filtered_index">
+            <type by_reference="false">bool</type>
+          </tag>
+          <tag line="460" name="return" description="" type="mixed">
+            <type by_reference="false">mixed</type>
+          </tag>
+        </docblock>
+        <argument line="467">
+          <name>$sql</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="467">
+          <name>$filtered_index</name>
+          <default><![CDATA[TRUE]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="497" package="">
+        <name>num_rows</name>
+        <type>function</type>
+        <docblock line="491">
+          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="491" name="see" description="\http://us3.php.net/manual/en/pdostatement.rowcount.php#87110" refers="\http://us3.php.net/manual/en/pdostatement.rowcount.php#87110"/>
+          <tag line="491" 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="521" package="">
+        <name>truncate</name>
+        <type>function</type>
+        <docblock line="515">
+          <description><![CDATA[Empty the passed table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="515" name="param" description="" type="string" variable="$table">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="515" name="return" description="" type="void">
+            <type by_reference="false">void</type>
+          </tag>
+        </docblock>
+        <argument line="521">
+          <name>$table</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="529" package="">
+        <name>switch_db</name>
+        <type>function</type>
+        <docblock line="523">
+          <description><![CDATA[Connect to a different database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="523" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="523" name="return" description="" type="void">
+            <type by_reference="false">void</type>
+          </tag>
+        </docblock>
+        <argument line="529">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+    </class>
+  </file>
+  <file path="classes/query_builder.php" hash="c1adb03815b1c8206f2a8fe1bffd1e10" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <parse_markers>
+      <error line="30" code="50018">No DocBlock was found for property $select_string</error>
+      <error line="33" code="50018">No DocBlock was found for property $from_string</error>
+      <error line="36" code="50018">No DocBlock was found for property $set_string</error>
+      <error line="39" code="50018">No DocBlock was found for property $order_string</error>
+      <error line="42" code="50018">No DocBlock was found for property $group_string</error>
+      <error line="49" code="50018">No DocBlock was found for property $set_array_keys</error>
+      <error line="52" code="50018">No DocBlock was found for property $order_array</error>
+      <error line="55" code="50018">No DocBlock was found for property $group_array</error>
+      <error line="62" code="50018">No DocBlock was found for property $values</error>
+      <error line="65" code="50018">No DocBlock was found for property $where_values</error>
+      <error line="68" code="50018">No DocBlock was found for property $limit</error>
+      <error line="71" code="50018">No DocBlock was found for property $offset</error>
+      <error line="74" code="50018">No DocBlock was found for property $sql</error>
+      <error line="77" code="50018">No DocBlock was found for property $table_prefix</error>
+      <error line="88" code="50018">No DocBlock was found for property $query_map</error>
+      <error line="91" code="50018">No DocBlock was found for property $having_map</error>
+      <error line="94" code="50018">No DocBlock was found for property $conn_name</error>
+      <error line="97" code="50018">No DocBlock was found for property $queries</error>
+    </parse_markers>
+    <class final="false" abstract="false" namespace="default" line="23" package="Query\Query">
+      <name>Query_Builder</name>
+      <full_name>\Query_Builder</full_name>
+      <extends/>
+      <docblock line="16">
+        <description><![CDATA[Convienience class for creating sql queries - also the class that
+instantiates the specific db driver]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Query"/>
+      </docblock>
+      <property final="false" static="false" visibility="private" line="30" package="Default">
+        <name>$select_string</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="private" line="33" package="Default">
+        <name>$from_string</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="private" line="36" package="Default">
+        <name>$set_string</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="private" line="39" package="Default">
+        <name>$order_string</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="private" line="42" package="Default">
+        <name>$group_string</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="private" line="49" package="Default">
+        <name>$set_array_keys</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="private" line="52" package="Default">
+        <name>$order_array</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="private" line="55" package="Default">
+        <name>$group_array</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="private" line="62" package="Default">
+        <name>$values</name>
+        <default><![CDATA[array()]]></default>
+      </property>
+      <property final="false" static="false" visibility="private" line="65" package="Default">
+        <name>$where_values</name>
+        <default><![CDATA[array()]]></default>
+      </property>
+      <property final="false" static="false" visibility="private" line="68" package="Default">
+        <name>$limit</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="private" line="71" package="Default">
+        <name>$offset</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="public" line="74" package="Default">
+        <name>$sql</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="public" line="77" package="Default">
+        <name>$table_prefix</name>
+        <default><![CDATA['']]></default>
+      </property>
+      <property final="false" static="false" visibility="private" line="88" package="Default">
+        <name>$query_map</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="private" line="91" package="Default">
+        <name>$having_map</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <property final="false" static="false" visibility="public" line="94" package="Default">
+        <name>$conn_name</name>
+        <default><![CDATA[""]]></default>
+      </property>
+      <property final="false" static="false" visibility="public" line="97" package="Default">
+        <name>$queries</name>
+        <default><![CDATA[]]></default>
+      </property>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="108" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="103">
+          <description><![CDATA[Constructor]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="103" name="param" description="- the connection parametere" type="object" variable="$params">
+            <type by_reference="false">object</type>
+          </tag>
+        </docblock>
+        <argument line="108">
+          <name>$params</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="161" package="">
+        <name>_connect</name>
+        <type>function</type>
+        <docblock line="154">
+          <description><![CDATA[Create the dsn for connection to the database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="154" name="param" description="" type="string" variable="$dbtype">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="154" name="param" description="" type="object" variable="$params">
+            <type by_reference="false">object</type>
+          </tag>
+          <tag line="154" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="161">
+          <name>$dbtype</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="161">
+          <name>$params</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="220" package="">
+        <name>select</name>
+        <type>function</type>
+        <docblock line="214">
+          <description><![CDATA[Specifies rows to select in a query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="214" name="param" description="" type="string" variable="$fields">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="214" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="236">
+        <argument line="220">
           <name>$fields</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="282" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="266" package="">
         <name>_select</name>
         <type>function</type>
-        <docblock line="275">
+        <docblock line="259">
           <description><![CDATA[Method to simplify select_ methods]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="275" name="param" description="" type="string" variable="$field">
+          <tag line="259" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="275" name="param" description="" type="string" variable="$as">
+          <tag line="259" name="param" description="" type="string" variable="$as">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="275" name="return" description="" type="string">
+          <tag line="259" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="282">
+        <argument line="266">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="282">
+        <argument line="266">
+          <name>$as</name>
+          <default><![CDATA[FALSE]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="287" package="">
+        <name>select_max</name>
+        <type>function</type>
+        <docblock line="280">
+          <description><![CDATA[Selects the maximum value of a field from a query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="280" name="param" description="" type="string" variable="$field">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="280" name="param" description="" type="string" variable="$as">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="280" name="return" description="" type="\$this">
+            <type by_reference="false">\$this</type>
+          </tag>
+        </docblock>
+        <argument line="287">
+          <name>$field</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="287">
           <name>$as</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
       <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="303" package="">
-        <name>select_max</name>
+        <name>select_min</name>
         <type>function</type>
         <docblock line="296">
-          <description><![CDATA[Selects the maximum value of a field from a query]]></description>
+          <description><![CDATA[Selects the minimum value of a field from a query]]></description>
           <long-description><![CDATA[]]></long-description>
           <tag line="296" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
@@ -1050,10 +1042,10 @@ instantiates the specific db driver]]></description>
         </argument>
       </method>
       <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="319" package="">
-        <name>select_min</name>
+        <name>select_avg</name>
         <type>function</type>
         <docblock line="312">
-          <description><![CDATA[Selects the minimum value of a field from a query]]></description>
+          <description><![CDATA[Selects the average value of a field from a query]]></description>
           <long-description><![CDATA[]]></long-description>
           <tag line="312" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
@@ -1077,10 +1069,10 @@ instantiates the specific db driver]]></description>
         </argument>
       </method>
       <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="335" package="">
-        <name>select_avg</name>
+        <name>select_sum</name>
         <type>function</type>
         <docblock line="328">
-          <description><![CDATA[Selects the average value of a field from a query]]></description>
+          <description><![CDATA[Selects the sum of a field from a query]]></description>
           <long-description><![CDATA[]]></long-description>
           <tag line="328" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
@@ -1103,120 +1095,128 @@ instantiates the specific db driver]]></description>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="351" package="">
-        <name>select_sum</name>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="349" package="">
+        <name>distinct</name>
         <type>function</type>
         <docblock line="344">
-          <description><![CDATA[Selects the sum of a field from a query]]></description>
+          <description><![CDATA[Adds the 'distinct' keyword to a query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="344" name="param" description="" type="string" variable="$field">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="344" name="param" description="" type="string" variable="$as">
-            <type by_reference="false">string</type>
-          </tag>
           <tag line="344" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="351">
-          <name>$field</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="351">
-          <name>$as</name>
-          <default><![CDATA[FALSE]]></default>
-          <type/>
-        </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="365" package="">
-        <name>distinct</name>
-        <type>function</type>
-        <docblock line="360">
-          <description><![CDATA[Adds the 'distinct' keyword to a query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="360" name="return" description="" type="\$this">
-            <type by_reference="false">\$this</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="380" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="364" package="">
         <name>from</name>
         <type>function</type>
-        <docblock line="374">
+        <docblock line="358">
           <description><![CDATA[Specify the database table to select from]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="374" name="param" description="" type="string" variable="$dbname">
+          <tag line="358" name="param" description="" type="string" variable="$tblname">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="374" name="return" description="" type="\$this">
+          <tag line="358" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="380">
-          <name>$dbname</name>
+        <argument line="364">
+          <name>$tblname</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="409" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="394" package="">
         <name>_like</name>
         <type>function</type>
-        <docblock line="399">
+        <docblock line="384">
           <description><![CDATA[Simplify 'like' methods]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="399" name="param" description="" type="string" variable="$field">
+          <tag line="384" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="399" name="param" description="" type="mixed" variable="$val">
+          <tag line="384" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="399" name="param" description="" type="string" variable="$pos">
+          <tag line="384" name="param" description="" type="string" variable="$pos">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="399" name="param" description="" type="string" variable="$like">
+          <tag line="384" name="param" description="" type="string" variable="$like">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="399" name="param" description="" type="string" variable="$conj">
+          <tag line="384" name="param" description="" type="string" variable="$conj">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="399" name="return" description="" type="\$this">
+          <tag line="384" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="409">
+        <argument line="394">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="409">
+        <argument line="394">
           <name>$val</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="409">
+        <argument line="394">
           <name>$pos</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="409">
+        <argument line="394">
           <name>$like</name>
           <default><![CDATA['LIKE']]></default>
           <type/>
         </argument>
-        <argument line="409">
+        <argument line="394">
           <name>$conj</name>
           <default><![CDATA['AND']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="451" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="436" package="">
         <name>like</name>
         <type>function</type>
-        <docblock line="443">
+        <docblock line="428">
           <description><![CDATA[Creates a Like clause in the sql statement]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="428" name="param" description="" type="string" variable="$field">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="428" name="param" description="" type="mixed" variable="$val">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="428" name="param" description="" type="string" variable="$pos">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="428" name="return" description="" type="\$this">
+            <type by_reference="false">\$this</type>
+          </tag>
+        </docblock>
+        <argument line="436">
+          <name>$field</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="436">
+          <name>$val</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="436">
+          <name>$pos</name>
+          <default><![CDATA['both']]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="451" package="">
+        <name>or_like</name>
+        <type>function</type>
+        <docblock line="443">
+          <description><![CDATA[Generates an OR Like clause]]></description>
+          <long-description><![CDATA[]]></long-description>
           <tag line="443" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
@@ -1247,10 +1247,10 @@ instantiates the specific db driver]]></description>
         </argument>
       </method>
       <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="466" package="">
-        <name>or_like</name>
+        <name>not_like</name>
         <type>function</type>
         <docblock line="458">
-          <description><![CDATA[Generates an OR Like clause]]></description>
+          <description><![CDATA[Generates a NOT LIKE clause]]></description>
           <long-description><![CDATA[]]></long-description>
           <tag line="458" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
@@ -1282,10 +1282,10 @@ instantiates the specific db driver]]></description>
         </argument>
       </method>
       <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="481" package="">
-        <name>not_like</name>
+        <name>or_not_like</name>
         <type>function</type>
         <docblock line="473">
-          <description><![CDATA[Generates a NOT LIKE clause]]></description>
+          <description><![CDATA[Generates a OR NOT LIKE clause]]></description>
           <long-description><![CDATA[]]></long-description>
           <tag line="473" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
@@ -1316,1007 +1316,972 @@ instantiates the specific db driver]]></description>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="496" package="">
-        <name>or_not_like</name>
-        <type>function</type>
-        <docblock line="488">
-          <description><![CDATA[Generates a OR NOT LIKE clause]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="488" name="param" description="" type="string" variable="$field">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="488" name="param" description="" type="mixed" variable="$val">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="488" name="param" description="" type="string" variable="$pos">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="488" name="return" description="" type="\$this">
-            <type by_reference="false">\$this</type>
-          </tag>
-        </docblock>
-        <argument line="496">
-          <name>$field</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="496">
-          <name>$val</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="496">
-          <name>$pos</name>
-          <default><![CDATA['both']]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="513" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="498" package="">
         <name>_having</name>
         <type>function</type>
-        <docblock line="505">
+        <docblock line="490">
           <description><![CDATA[Simplify building having clauses]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="505" name="param" description="" type="mixed" variable="$key">
+          <tag line="490" name="param" description="" type="mixed" variable="$key">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="505" name="param" description="" type="mixed" variable="$val">
+          <tag line="490" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="505" name="param" description="" type="string" variable="$conj">
+          <tag line="490" name="param" description="" type="string" variable="$conj">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="505" name="return" description="" type="\$this">
+          <tag line="490" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="513">
+        <argument line="498">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="513">
+        <argument line="498">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
-        <argument line="513">
+        <argument line="498">
           <name>$conj</name>
           <default><![CDATA['AND']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="548" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="533" package="">
         <name>having</name>
         <type>function</type>
-        <docblock line="541">
+        <docblock line="526">
           <description><![CDATA[Generates a 'Having' clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="541" name="param" description="" type="mixed" variable="$key">
+          <tag line="526" name="param" description="" type="mixed" variable="$key">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="541" name="param" description="" type="mixed" variable="$val">
+          <tag line="526" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="541" name="return" description="" type="\$this">
+          <tag line="526" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="548">
+        <argument line="533">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="548">
+        <argument line="533">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="562" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="547" package="">
         <name>or_having</name>
         <type>function</type>
-        <docblock line="555">
+        <docblock line="540">
           <description><![CDATA[Generates a 'Having' clause prefixed with 'OR']]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="555" name="param" description="" type="mixed" variable="$key">
+          <tag line="540" name="param" description="" type="mixed" variable="$key">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="555" name="param" description="" type="mixed" variable="$val">
+          <tag line="540" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="555" name="return" description="" type="\$this">
+          <tag line="540" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="562">
+        <argument line="547">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="562">
+        <argument line="547">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="578" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="563" package="">
         <name>_where</name>
         <type>function</type>
-        <docblock line="571">
+        <docblock line="556">
           <description><![CDATA[Do all the repeditive stuff for where/having type methods]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="571" name="param" description="" type="mixed" variable="$key">
+          <tag line="556" name="param" description="" type="mixed" variable="$key">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="571" name="param" description="" type="mixed" variable="$val">
+          <tag line="556" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="571" name="return" description="" type="array">
+          <tag line="556" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
-        <argument line="578">
+        <argument line="563">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="578">
+        <argument line="563">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="611" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="596" package="">
         <name>_where_string</name>
         <type>function</type>
-        <docblock line="603">
+        <docblock line="588">
           <description><![CDATA[Simplify generating where string]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="603" name="param" description="" type="mixed" variable="$key">
+          <tag line="588" name="param" description="" type="mixed" variable="$key">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="603" name="param" description="" type="mixed" variable="$val">
+          <tag line="588" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="603" name="param" description="" type="string" variable="$conj">
+          <tag line="588" name="param" description="" type="string" variable="$conj">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="603" name="return" description="" type="\$this">
+          <tag line="588" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="611">
+        <argument line="596">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="611">
+        <argument line="596">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
-        <argument line="611">
+        <argument line="596">
           <name>$conj</name>
           <default><![CDATA['AND']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="649" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="634" package="">
         <name>_where_in</name>
         <type>function</type>
-        <docblock line="640">
+        <docblock line="625">
           <description><![CDATA[Simplify where_in methods]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="640" name="param" description="" type="mixed" variable="$key">
+          <tag line="625" name="param" description="" type="mixed" variable="$key">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="640" name="param" description="" type="mixed" variable="$val">
+          <tag line="625" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="640" name="param" description="string" type="" variable="$in"/>
-          <tag line="640" name="param" description="string" type="" variable="$conj"/>
-          <tag line="640" name="return" description="" type="\$this">
+          <tag line="625" name="param" description="string" type="" variable="$in"/>
+          <tag line="625" name="param" description="string" type="" variable="$conj"/>
+          <tag line="625" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="649">
+        <argument line="634">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="649">
+        <argument line="634">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
-        <argument line="649">
+        <argument line="634">
           <name>$in</name>
           <default><![CDATA['IN']]></default>
           <type/>
         </argument>
-        <argument line="649">
+        <argument line="634">
           <name>$conj</name>
           <default><![CDATA['AND']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="681" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="666" package="">
         <name>where</name>
         <type>function</type>
-        <docblock line="672">
+        <docblock line="657">
           <description><![CDATA[Specify condition(s) in the where clause of a query
 Note: this function works with key / value, or a
 passed array with key / value pairs]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="672" name="param" description="" type="mixed" variable="$key">
+          <tag line="657" name="param" description="" type="mixed" variable="$key">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="672" name="param" description="" type="mixed" variable="$val">
+          <tag line="657" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="672" name="return" description="" type="\$this">
+          <tag line="657" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="681">
+        <argument line="666">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="681">
+        <argument line="666">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="695" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="680" package="">
         <name>or_where</name>
         <type>function</type>
-        <docblock line="688">
+        <docblock line="673">
           <description><![CDATA[Where clause prefixed with "OR"]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="688" name="param" description="" type="string" variable="$key">
+          <tag line="673" name="param" description="" type="string" variable="$key">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="688" name="param" description="" type="mixed" variable="$val">
+          <tag line="673" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="688" name="return" description="" type="\$this">
+          <tag line="673" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="695">
+        <argument line="680">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="695">
+        <argument line="680">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="709" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="694" package="">
         <name>where_in</name>
         <type>function</type>
-        <docblock line="702">
+        <docblock line="687">
           <description><![CDATA[Where clause with 'IN' statement]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="702" name="param" description="" type="mixed" variable="$field">
+          <tag line="687" name="param" description="" type="mixed" variable="$field">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="702" name="param" description="" type="mixed" variable="$val">
+          <tag line="687" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="702" name="return" description="" type="\$this">
+          <tag line="687" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="709">
+        <argument line="694">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="709">
+        <argument line="694">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="723" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="708" package="">
         <name>or_where_in</name>
         <type>function</type>
-        <docblock line="716">
+        <docblock line="701">
           <description><![CDATA[Where in statement prefixed with "or"]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="716" name="param" description="" type="string" variable="$field">
+          <tag line="701" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="716" name="param" description="" type="mixed" variable="$val">
+          <tag line="701" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="716" name="return" description="" type="\$this">
+          <tag line="701" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="723">
+        <argument line="708">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="723">
+        <argument line="708">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="737" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="722" package="">
         <name>where_not_in</name>
         <type>function</type>
-        <docblock line="730">
+        <docblock line="715">
           <description><![CDATA[WHERE NOT IN (FOO) clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="730" name="param" description="" type="string" variable="$field">
+          <tag line="715" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="730" name="param" description="" type="mixed" variable="$val">
+          <tag line="715" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="730" name="return" description="" type="\$this">
+          <tag line="715" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="737">
+        <argument line="722">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="737">
+        <argument line="722">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="751" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="736" package="">
         <name>or_where_not_in</name>
         <type>function</type>
-        <docblock line="744">
+        <docblock line="729">
           <description><![CDATA[OR WHERE NOT IN (FOO) clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="744" name="param" description="" type="string" variable="$field">
+          <tag line="729" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="744" name="param" description="" type="mixed" variable="$val">
+          <tag line="729" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="744" name="return" description="" type="\$this">
+          <tag line="729" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="751">
+        <argument line="736">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="751">
+        <argument line="736">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="767" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="752" package="">
         <name>set</name>
         <type>function</type>
-        <docblock line="760">
+        <docblock line="745">
           <description><![CDATA[Sets values for inserts / updates / deletes]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="760" name="param" description="" type="mixed" variable="$key">
+          <tag line="745" name="param" description="" type="mixed" variable="$key">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="760" name="param" description="" type="mixed" variable="$val">
+          <tag line="745" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="760" name="return" description="" type="\$this">
+          <tag line="745" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="767">
+        <argument line="752">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="767">
+        <argument line="752">
           <name>$val</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="806" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="791" package="">
         <name>join</name>
         <type>function</type>
-        <docblock line="798">
+        <docblock line="783">
           <description><![CDATA[Creates a join phrase in a compiled query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="798" name="param" description="" type="string" variable="$table">
+          <tag line="783" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="798" name="param" description="" type="string" variable="$condition">
+          <tag line="783" name="param" description="" type="string" variable="$condition">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="798" name="param" description="" type="string" variable="$type">
+          <tag line="783" name="param" description="" type="string" variable="$type">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="798" name="return" description="" type="\$this">
+          <tag line="783" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="806">
+        <argument line="791">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="806">
+        <argument line="791">
           <name>$condition</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="806">
+        <argument line="791">
           <name>$type</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="846" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="833" package="">
         <name>group_by</name>
         <type>function</type>
-        <docblock line="840">
+        <docblock line="827">
           <description><![CDATA[Group the results by the selected field(s)]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="840" name="param" description="" type="mixed" variable="$field">
+          <tag line="827" name="param" description="" type="mixed" variable="$field">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="840" name="return" description="" type="\$this">
+          <tag line="827" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="846">
+        <argument line="833">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="871" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="858" package="">
         <name>order_by</name>
         <type>function</type>
-        <docblock line="864">
+        <docblock line="851">
           <description><![CDATA[Order the results by the selected field(s)]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="864" name="param" description="" type="string" variable="$field">
+          <tag line="851" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="864" name="param" description="" type="string" variable="$type">
+          <tag line="851" name="param" description="" type="string" variable="$type">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="864" name="return" description="" type="\$this">
+          <tag line="851" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="871">
+        <argument line="858">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="871">
+        <argument line="858">
           <name>$type</name>
           <default><![CDATA[""]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="908" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="895" package="">
         <name>limit</name>
         <type>function</type>
-        <docblock line="901">
+        <docblock line="888">
           <description><![CDATA[Set a limit on the current sql statement]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="901" name="param" description="" type="int" variable="$limit">
+          <tag line="888" name="param" description="" type="int" variable="$limit">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="901" name="param" description="" type="int" variable="$offset">
+          <tag line="888" name="param" description="" type="int" variable="$offset">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="901" name="return" description="" type="string">
+          <tag line="888" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="908">
+        <argument line="895">
           <name>$limit</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="908">
+        <argument line="895">
           <name>$offset</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="925" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="912" package="">
         <name>group_start</name>
         <type>function</type>
-        <docblock line="920">
+        <docblock line="907">
           <description><![CDATA[Adds a paren to the current query for query grouping]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="920" name="return" description="" type="\$this">
+          <tag line="907" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="944" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="931" package="">
         <name>or_group_start</name>
         <type>function</type>
-        <docblock line="938">
+        <docblock line="925">
           <description><![CDATA[Adds a paren to the current query for query grouping,
 prefixed with 'OR']]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="938" name="return" description="" type="\$this">
+          <tag line="925" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="963" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="950" package="">
         <name>or_not_group_start</name>
         <type>function</type>
-        <docblock line="957">
+        <docblock line="944">
           <description><![CDATA[Adds a paren to the current query for query grouping,
 prefixed with 'OR NOT']]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="957" name="return" description="" type="\$this">
+          <tag line="944" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="981" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="968" package="">
         <name>group_end</name>
         <type>function</type>
-        <docblock line="976">
+        <docblock line="963">
           <description><![CDATA[Ends a query group]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="976" name="return" description="" type="\$this">
+          <tag line="963" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1005" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="992" package="">
         <name>get</name>
         <type>function</type>
-        <docblock line="996">
+        <docblock line="983">
           <description><![CDATA[Select and retrieve all records from the current table, and/or
 execute current compiled query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="996" name="param" description="" type="" variable="$table"/>
-          <tag line="996" name="param" description="" type="int" variable="$limit">
+          <tag line="983" name="param" description="" type="" variable="$table"/>
+          <tag line="983" name="param" description="" type="int" variable="$limit">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="996" name="param" description="" type="int" variable="$offset">
+          <tag line="983" name="param" description="" type="int" variable="$offset">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="996" name="return" description="" type="object">
+          <tag line="983" name="return" description="" type="object">
             <type by_reference="false">object</type>
           </tag>
         </docblock>
-        <argument line="1005">
+        <argument line="992">
           <name>$table</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
-        <argument line="1005">
+        <argument line="992">
           <name>$limit</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
-        <argument line="1005">
+        <argument line="992">
           <name>$offset</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1041" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1028" package="">
         <name>get_where</name>
         <type>function</type>
-        <docblock line="1032">
+        <docblock line="1019">
           <description><![CDATA[Convience method for get() with a where clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1032" name="param" description="" type="string" variable="$table">
+          <tag line="1019" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1032" name="param" description="" type="array" variable="$where">
+          <tag line="1019" name="param" description="" type="array" variable="$where">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="1032" name="param" description="" type="int" variable="$limit">
+          <tag line="1019" name="param" description="" type="int" variable="$limit">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="1032" name="param" description="" type="int" variable="$offset">
+          <tag line="1019" name="param" description="" type="int" variable="$offset">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="1032" name="return" description="" type="object">
+          <tag line="1019" name="return" description="" type="object">
             <type by_reference="false">object</type>
           </tag>
         </docblock>
-        <argument line="1041">
+        <argument line="1028">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1041">
+        <argument line="1028">
           <name>$where</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
-        <argument line="1041">
+        <argument line="1028">
           <name>$limit</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
-        <argument line="1041">
+        <argument line="1028">
           <name>$offset</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1058" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1045" package="">
         <name>count_all</name>
         <type>function</type>
-        <docblock line="1052">
+        <docblock line="1039">
           <description><![CDATA[Retreive the number of rows in the selected table]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1052" name="param" description="" type="string" variable="$table">
+          <tag line="1039" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1052" name="return" description="" type="int">
+          <tag line="1039" name="return" description="" type="int">
             <type by_reference="false">int</type>
           </tag>
         </docblock>
-        <argument line="1058">
+        <argument line="1045">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1074" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1061" package="">
         <name>count_all_results</name>
         <type>function</type>
-        <docblock line="1067">
+        <docblock line="1054">
           <description><![CDATA[Retrieve the number of results for the generated query - used
 in place of the get() method]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1067" name="param" description="" type="string" variable="$table">
+          <tag line="1054" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1067" name="return" description="" type="int">
+          <tag line="1054" name="return" description="" type="int">
             <type by_reference="false">int</type>
           </tag>
         </docblock>
-        <argument line="1074">
+        <argument line="1061">
           <name>$table</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1107" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1094" package="">
         <name>insert</name>
         <type>function</type>
-        <docblock line="1100">
+        <docblock line="1087">
           <description><![CDATA[Creates an insert clause, and executes it]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1100" name="param" description="" type="string" variable="$table">
+          <tag line="1087" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1100" name="param" description="" type="mixed" variable="$data">
+          <tag line="1087" name="param" description="" type="mixed" variable="$data">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="1100" name="return" description="" type="mixed">
+          <tag line="1087" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="1107">
+        <argument line="1094">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1107">
+        <argument line="1094">
           <name>$data</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1127" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1114" package="">
         <name>update</name>
         <type>function</type>
-        <docblock line="1120">
+        <docblock line="1107">
           <description><![CDATA[Creates an update clause, and executes it]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1120" name="param" description="" type="string" variable="$table">
+          <tag line="1107" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1120" name="param" description="" type="mixed" variable="$data">
+          <tag line="1107" name="param" description="" type="mixed" variable="$data">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="1120" name="return" description="" type="mixed">
+          <tag line="1107" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="1127">
+        <argument line="1114">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1127">
+        <argument line="1114">
           <name>$data</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1147" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1134" package="">
         <name>delete</name>
         <type>function</type>
-        <docblock line="1140">
+        <docblock line="1127">
           <description><![CDATA[Deletes data from a table]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1140" name="param" description="" type="string" variable="$table">
+          <tag line="1127" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1140" name="param" description="" type="mixed" variable="$where">
+          <tag line="1127" name="param" description="" type="mixed" variable="$where">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="1140" name="return" description="" type="mixed">
+          <tag line="1127" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="1147">
+        <argument line="1134">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1147">
+        <argument line="1134">
           <name>$where</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1169" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1156" package="">
         <name>get_compiled_select</name>
         <type>function</type>
-        <docblock line="1162">
+        <docblock line="1149">
           <description><![CDATA[Returns the generated 'select' sql query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1162" name="param" description="" type="string" variable="$table">
+          <tag line="1149" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1162" name="param" description="" type="bool" variable="$reset">
+          <tag line="1149" name="param" description="" type="bool" variable="$reset">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="1162" name="return" description="" type="string">
+          <tag line="1149" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="1169">
+        <argument line="1156">
           <name>$table</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
-        <argument line="1169">
+        <argument line="1156">
           <name>$reset</name>
           <default><![CDATA[TRUE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1189" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1176" package="">
         <name>get_compiled_insert</name>
         <type>function</type>
-        <docblock line="1182">
+        <docblock line="1169">
           <description><![CDATA[Returns the generated 'insert' sql query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1182" name="param" description="" type="string" variable="$table">
+          <tag line="1169" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1182" name="param" description="" type="bool" variable="$reset">
+          <tag line="1169" name="param" description="" type="bool" variable="$reset">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="1182" name="return" description="" type="string">
+          <tag line="1169" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="1189">
+        <argument line="1176">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1189">
+        <argument line="1176">
           <name>$reset</name>
           <default><![CDATA[TRUE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1203" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1190" package="">
         <name>get_compiled_update</name>
         <type>function</type>
-        <docblock line="1196">
+        <docblock line="1183">
           <description><![CDATA[Returns the generated 'insert' sql query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1196" name="param" description="" type="string" variable="$table">
+          <tag line="1183" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1196" name="param" description="" type="bool" variable="$reset">
+          <tag line="1183" name="param" description="" type="bool" variable="$reset">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="1196" name="return" description="" type="string">
+          <tag line="1183" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="1203">
+        <argument line="1190">
           <name>$table</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
-        <argument line="1203">
+        <argument line="1190">
           <name>$reset</name>
           <default><![CDATA[TRUE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1217" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1204" package="">
         <name>get_compiled_delete</name>
         <type>function</type>
-        <docblock line="1210">
+        <docblock line="1197">
           <description><![CDATA[Returns the generated 'insert' sql query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1210" name="param" description="" type="string" variable="$table">
+          <tag line="1197" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1210" name="param" description="" type="bool" variable="$reset">
+          <tag line="1197" name="param" description="" type="bool" variable="$reset">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="1210" name="return" description="" type="string">
+          <tag line="1197" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="1217">
+        <argument line="1204">
           <name>$table</name>
           <default><![CDATA[""]]></default>
           <type/>
         </argument>
-        <argument line="1217">
+        <argument line="1204">
           <name>$reset</name>
           <default><![CDATA[TRUE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="protected" namespace="default" line="1232" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="1219" package="">
         <name>_get_compile</name>
         <type>function</type>
-        <docblock line="1224">
+        <docblock line="1211">
           <description><![CDATA[Helper function for returning sql strings]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1224" name="param" description="" type="string" variable="$type">
+          <tag line="1211" name="param" description="" type="string" variable="$type">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1224" name="param" description="" type="string" variable="$table">
+          <tag line="1211" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1224" name="param" description="bool" type="" variable="$reset"/>
-          <tag line="1224" name="resturn" description="string"/>
+          <tag line="1211" name="param" description="bool" type="" variable="$reset"/>
+          <tag line="1211" name="resturn" description="string"/>
         </docblock>
-        <argument line="1232">
+        <argument line="1219">
           <name>$type</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1232">
+        <argument line="1219">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1232">
+        <argument line="1219">
           <name>$reset</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1254" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1241" package="">
         <name>reset_query</name>
         <type>function</type>
-        <docblock line="1249">
+        <docblock line="1236">
           <description><![CDATA[Clear out the class variables, so the next query can be run]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1249" name="return" description="" type="void">
+          <tag line="1236" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="1294" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="1275" package="">
         <name>_run</name>
         <type>function</type>
-        <docblock line="1286">
+        <docblock line="1267">
           <description><![CDATA[Executes the compiled query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1286" name="param" description="" type="string" variable="$type">
+          <tag line="1267" name="param" description="" type="string" variable="$type">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1286" name="param" description="" type="string" variable="$table">
+          <tag line="1267" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1286" name="param" description="" type="bool" variable="$simple">
+          <tag line="1267" name="param" description="" type="bool" variable="$simple">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="1286" name="return" description="" type="mixed">
+          <tag line="1267" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="1294">
+        <argument line="1275">
           <name>$type</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1294">
+        <argument line="1275">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1294">
+        <argument line="1275">
           <name>$simple</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1317" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1298" package="">
         <name>__call</name>
         <type>function</type>
-        <docblock line="1310">
+        <docblock line="1291">
           <description><![CDATA[Calls a function further down the inheritence chain]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1310" name="param" description="" type="string" variable="$name">
+          <tag line="1291" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1310" name="param" description="" type="array" variable="$params">
+          <tag line="1291" name="param" description="" type="array" variable="$params">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="1310" name="return" description="" type="mixed">
+          <tag line="1291" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="1317">
+        <argument line="1298">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1317">
+        <argument line="1298">
           <name>$params</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="1336" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="1317" package="">
         <name>_compile</name>
         <type>function</type>
-        <docblock line="1329">
+        <docblock line="1310">
           <description><![CDATA[String together the sql statements for sending to the db]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1329" name="param" description="" type="string" variable="$type">
+          <tag line="1310" name="param" description="" type="string" variable="$type">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1329" name="param" description="" type="string" variable="$table">
+          <tag line="1310" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1329" name="return" description="" type="\$string">
+          <tag line="1310" name="return" description="" type="\$string">
             <type by_reference="false">\$string</type>
           </tag>
         </docblock>
-        <argument line="1336">
+        <argument line="1317">
           <name>$type</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
-        <argument line="1336">
+        <argument line="1317">
           <name>$table</name>
           <default><![CDATA['']]></default>
           <type/>
@@ -2324,7 +2289,7 @@ in place of the get() method]]></description>
       </method>
     </class>
   </file>
-  <file path="classes/db_util.php" hash="1a56d6f40af0e6860d9ae0dbcde8451c" package="Query">
+  <file path="classes/db_util.php" hash="2e0d737350bdf56372da258771ce78c6" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -2482,7 +2447,7 @@ in place of the get() method]]></description>
       </method>
     </class>
   </file>
-  <file path="autoload.php" hash="c4cd60266ba5b60ac36f1a757c65c0e2" package="Query">
+  <file path="autoload.php" hash="7101f1c5425880be2dc57a0b5a9f7b50" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -2492,6 +2457,9 @@ in place of the get() method]]></description>
       <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
+    <include line="31" type="Require" package="Default">
+      <name>common.php</name>
+    </include>
     <constant namespace="default" line="23" package="Default">
       <name>QBASE_PATH</name>
       <value><![CDATA[dirname(__FILE__).'/']]></value>
@@ -2508,86 +2476,119 @@ in place of the get() method]]></description>
         <long-description><![CDATA[]]></long-description>
       </docblock>
     </constant>
-    <function namespace="default" line="39" package="Query">
-      <name>do_include</name>
-      <type>function</type>
-      <docblock line="32">
-        <description><![CDATA[Bulk directory loading workaround for use
-with array_map and glob]]></description>
-        <long-description><![CDATA[]]></long-description>
-        <tag line="32" name="param" description="" type="string" variable="$path">
-          <type by_reference="false">string</type>
-        </tag>
-        <tag line="32" name="return" description="" type="void">
-          <type by_reference="false">void</type>
-        </tag>
-      </docblock>
-      <argument line="39">
-        <name>$path</name>
-        <default><![CDATA[]]></default>
-        <type/>
-      </argument>
-    </function>
-    <function namespace="default" line="53" package="Query">
-      <name>mb_trim</name>
-      <type>function</type>
-      <docblock line="47">
-        <description><![CDATA[Multibyte-safe trim function]]></description>
-        <long-description><![CDATA[]]></long-description>
-        <tag line="47" name="param" description="string" type="" variable="$string"/>
-        <tag line="47" name="return" description="" type="string">
-          <type by_reference="false">string</type>
-        </tag>
-      </docblock>
-      <argument line="53">
-        <name>$string</name>
-        <default><![CDATA[]]></default>
-        <type/>
-      </argument>
-    </function>
-    <function namespace="default" line="64" package="Query">
+    <function namespace="default" line="38" package="Query">
       <name>query_autoload</name>
       <type>function</type>
-      <docblock line="59">
+      <docblock line="33">
         <description><![CDATA[Load a Query class]]></description>
         <long-description><![CDATA[]]></long-description>
-        <tag line="59" name="param" description="" type="string" variable="$class">
+        <tag line="33" name="param" description="" type="string" variable="$class">
           <type by_reference="false">string</type>
         </tag>
       </docblock>
-      <argument line="64">
+      <argument line="38">
         <name>$class</name>
         <default><![CDATA[]]></default>
         <type/>
       </argument>
     </function>
-    <function namespace="default" line="104" package="Query">
+  </file>
+  <file path="common.php" hash="bf5e244ba5b5066f5ffe94f3d2b422c4" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <function namespace="default" line="49" package="Query">
+      <name>do_include</name>
+      <type>function</type>
+      <docblock line="42">
+        <description><![CDATA[Bulk directory loading workaround for use
+with array_map and glob]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="42" name="param" description="" type="string" variable="$path">
+          <type by_reference="false">string</type>
+        </tag>
+        <tag line="42" name="return" description="" type="void">
+          <type by_reference="false">void</type>
+        </tag>
+      </docblock>
+      <argument line="49">
+        <name>$path</name>
+        <default><![CDATA[]]></default>
+        <type/>
+      </argument>
+    </function>
+    <function namespace="default" line="65" package="Query">
+      <name>mb_trim</name>
+      <type>function</type>
+      <docblock line="59">
+        <description><![CDATA[Multibyte-safe trim function]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="59" name="param" description="string" type="" variable="$string"/>
+        <tag line="59" name="return" description="" type="string">
+          <type by_reference="false">string</type>
+        </tag>
+      </docblock>
+      <argument line="65">
+        <name>$string</name>
+        <default><![CDATA[]]></default>
+        <type/>
+      </argument>
+    </function>
+    <function namespace="default" line="80" package="Query">
       <name>db_filter</name>
       <type>function</type>
-      <docblock line="97">
+      <docblock line="73">
         <description><![CDATA[Filter out db rows into one array]]></description>
         <long-description><![CDATA[]]></long-description>
-        <tag line="97" name="param" description="" type="array" variable="$array">
+        <tag line="73" name="param" description="" type="array" variable="$array">
           <type by_reference="false">array</type>
         </tag>
-        <tag line="97" name="param" description="" type="mixed" variable="$index">
+        <tag line="73" name="param" description="" type="mixed" variable="$index">
           <type by_reference="false">mixed</type>
         </tag>
-        <tag line="97" name="return" description="" type="array">
+        <tag line="73" name="return" description="" type="array">
           <type by_reference="false">array</type>
         </tag>
       </docblock>
-      <argument line="104">
+      <argument line="80">
         <name>$array</name>
         <default><![CDATA[]]></default>
         <type/>
       </argument>
-      <argument line="104">
+      <argument line="80">
         <name>$index</name>
         <default><![CDATA[]]></default>
         <type/>
       </argument>
     </function>
+    <class final="false" abstract="false" namespace="default" line="26" package="Query\Query">
+      <name>BadDBDriverException</name>
+      <full_name>\BadDBDriverException</full_name>
+      <extends>\InvalidArgumentException</extends>
+      <docblock line="20">
+        <description><![CDATA[Generic exception for bad drivers]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="20" name="package" description="Query"/>
+        <tag line="20" name="subpackage" description="Query"/>
+      </docblock>
+    </class>
+    <class final="false" abstract="false" namespace="default" line="36" package="Query\Query">
+      <name>BadConnectionException</name>
+      <full_name>\BadConnectionException</full_name>
+      <extends>\UnexpectedValueException</extends>
+      <docblock line="30">
+        <description><![CDATA[Generic exception for bad connection strings]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="30" name="package" description="Query"/>
+        <tag line="30" name="subpackage" description="Query"/>
+      </docblock>
+    </class>
   </file>
   <file path="drivers/pgsql/pgsql_sql.php" hash="637ace0f653c651090b0521b38687a51" package="Default">
     <docblock line="2">
@@ -4912,7 +4913,7 @@ the query]]></description>
       </method>
     </class>
   </file>
-  <file path="drivers/firebird/firebird_driver.php" hash="4f7e9df014cc1df6b92f09f815b9837d" package="Query">
+  <file path="drivers/firebird/firebird_driver.php" hash="5adb519aac0499aa17f1427ce1be16ca" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>