Test and doc updates

autoload.php

@@ -31,7 +31,7 @@ define('QDRIVER_PATH', QBASE_PATH.'drivers/');
 require(QBASE_PATH.'common.php');
 
 /**
- * Load a Query class
+ * Load query classes
  *
  * @param string $class
  */

classes/db_util.php

@@ -43,6 +43,7 @@ abstract class DB_Util {
 	 *
 	 * @param string $method
 	 * @param array $args
+	 * @return mixed
 	 */
 	public function __call($method, $args)
 	{
@@ -50,8 +51,6 @@ abstract class DB_Util {
 		{
 			return call_user_func_array(array($this->conn, $method), $args);
 		}
-		
-		return NULL;
 	}
 	
 	// --------------------------------------------------------------------------

common.php

@@ -59,7 +59,7 @@ if ( ! function_exists('mb_trim'))
 	/**
 	 * Multibyte-safe trim function
 	 *
-	 * @param string
+	 * @param string $string
 	 * @return string
 	 */
 	function mb_trim($string)
@@ -96,25 +96,32 @@ function db_filter($array, $index)
  *
  * @param mixed $params
  * @return Query_Builder
+ * @throws InvalidArgumentException
+ * @throws BadDBDriverException
+ * @throws BadConnectionException
  */
-function Query($params = '')
+function &Query($params = '')
 {
 	static $connections;
 	
-	// If there's existing connection(s) just return it
+	// If you are getting a previously created connection
-	if ( ! empty($connections))
+	if (is_scalar($params))
 	{
 		// If the paramater is a string, use it as an array index
 		if (is_scalar($params) && isset($connections[$params]))
 		{
 			return $connections[$params];
 		}
-		elseif (empty($params) && isset($connections[0])) // Otherwise, return the last one
+		elseif (empty($params) && ! empty($connections)) // Otherwise, return the last one
 		{
 			return end($connections);
 		}
+		
+		throw new InvalidArgumentException("The specified connection does not exist");
 	}
 
+	// --------------------------------------------------------------------------
+	// Parse argument array / object
 	// --------------------------------------------------------------------------
 
 	// Convert array to object
@@ -143,6 +150,8 @@ function Query($params = '')
 		throw new BadDBDriverException('Database driver does not exist, or is not supported');
 	}
 
+	// --------------------------------------------------------------------------
+	// Attempt to connect
 	// --------------------------------------------------------------------------
 
 	// Create the dsn for the database to connect to
@@ -184,6 +193,8 @@ function Query($params = '')
 		throw new BadConnectionException('Connection failed, invalid arguments', 2);
 	}
 
+	// --------------------------------------------------------------------------
+	// Save connection
 	// --------------------------------------------------------------------------
 
 	// Set the table prefix, if it exists

docs/classes/BadConnectionException.html

@@ -85,7 +85,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:46-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/BadDBDriverException.html

@@ -85,7 +85,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:46-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/DB_PDO.html

@@ -525,7 +525,7 @@ the connection/database</h2>
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/DB_Util.html

@@ -100,7 +100,7 @@
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a id="method___call"></a><div class="element clickable method public method___call" data-toggle="collapse" data-target=".method___call .collapse">
 <h2>Enable calling driver methods</h2>
-<pre>__call(string $method, array $args) </pre>
+<pre>__call(string $method, array $args) : mixed</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="detail-description">
 <div class="long_description"></div>
@@ -113,6 +113,8 @@
 <h4>$args</h4>
 <code>array</code>
 </div>
+<h3>Returns</h3>
+<div class="subelement response"><code>mixed</code></div>
 </div></div>
 </div>
 <a id="method___construct"></a><div class="element clickable method public method___construct" data-toggle="collapse" data-target=".method___construct .collapse">
@@ -222,7 +224,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Firebird.html

@@ -348,7 +348,7 @@ the last query executed</h2>
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Firebird_Result.html

@@ -238,7 +238,7 @@ the query</h2>
 </div>
 <a id="method_fetch"></a><div class="element clickable method public method_fetch" data-toggle="collapse" data-target=".method_fetch .collapse">
 <h2>Emulate PDO fetch public function</h2>
-<pre>fetch(int $fetch_style, mixed $statement, mixed $offset) : mixed</pre>
+<pre>fetch(int $fetch_style, $cursor_orientation, $cursor_offset) : mixed</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="detail-description">
 <div class="long_description"></div>
@@ -247,14 +247,8 @@ the query</h2>
 <h4>$fetch_style</h4>
 <code>int</code>
 </div>
-<div class="subelement argument">
+<div class="subelement argument"><h4>$cursor_orientation</h4></div>
-<h4>$statement</h4>
+<div class="subelement argument"><h4>$cursor_offset</h4></div>
-<code>mixed</code>
-</div>
-<div class="subelement argument">
-<h4>$offset</h4>
-<code>mixed</code>
-</div>
 <h3>Returns</h3>
 <div class="subelement response"><code>mixed</code></div>
 </div></div>
@@ -360,7 +354,7 @@ the query</h2>
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Firebird_SQL.html

@@ -57,6 +57,7 @@
                     <ul>
 <li class="method public "><a href="#method_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="#method_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="#method_explain" title="explain() :: Get the query plan for the sql query"><span class="description">Get the query plan for the sql query</span><pre>explain()</pre></a></li>
 <li class="method public "><a href="#method_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="#method_limit" title="limit() :: Limit clause"><span class="description">Limit clause</span><pre>limit()</pre></a></li>
 <li class="method public "><a href="#method_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>
@@ -120,6 +121,21 @@
 <div class="subelement response"><code>NULL</code></div>
 </div></div>
 </div>
+<a id="method_explain"></a><div class="element clickable method public method_explain" data-toggle="collapse" data-target=".method_explain .collapse">
+<h2>Get the query plan for the sql query</h2>
+<pre>explain(string $sql) : string</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="detail-description">
+<div class="long_description"></div>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$sql</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a id="method_function_list"></a><div class="element clickable method public method_function_list" data-toggle="collapse" data-target=".method_function_list .collapse">
 <h2>Return sql to list functions</h2>
 <pre>function_list() : string</pre>
@@ -241,7 +257,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Firebird_Util.html

@@ -177,7 +177,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/MySQL.html

@@ -148,7 +148,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:46-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/MySQL_SQL.html

@@ -57,6 +57,7 @@
                     <ul>
 <li class="method public "><a href="#method_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="#method_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="#method_explain" title="explain() :: Get the query plan for the sql query"><span class="description">Get the query plan for the sql query</span><pre>explain()</pre></a></li>
 <li class="method public "><a href="#method_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="#method_limit" title="limit() :: Limit clause"><span class="description">Limit clause</span><pre>limit()</pre></a></li>
 <li class="method public "><a href="#method_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>
@@ -120,6 +121,21 @@
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
+<a id="method_explain"></a><div class="element clickable method public method_explain" data-toggle="collapse" data-target=".method_explain .collapse">
+<h2>Get the query plan for the sql query</h2>
+<pre>explain(string $sql) : string</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="detail-description">
+<div class="long_description"></div>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$sql</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a id="method_function_list"></a><div class="element clickable method public method_function_list" data-toggle="collapse" data-target=".method_function_list .collapse">
 <h2>Return sql to list functions</h2>
 <pre>function_list() : string</pre>
@@ -246,7 +262,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/MySQL_Util.html

@@ -173,7 +173,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/ODBC.html

@@ -168,7 +168,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/ODBC_SQL.html

@@ -57,6 +57,7 @@
                     <ul>
 <li class="method public "><a href="#method_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="#method_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="#method_explain" title="explain() :: Get the query plan for the sql query"><span class="description">Get the query plan for the sql query</span><pre>explain()</pre></a></li>
 <li class="method public "><a href="#method_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="#method_limit" title="limit() :: Limit clause"><span class="description">Limit clause</span><pre>limit()</pre></a></li>
 <li class="method public "><a href="#method_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>
@@ -120,6 +121,21 @@
 <div class="subelement response"><code>NULL</code></div>
 </div></div>
 </div>
+<a id="method_explain"></a><div class="element clickable method public method_explain" data-toggle="collapse" data-target=".method_explain .collapse">
+<h2>Get the query plan for the sql query</h2>
+<pre>explain(string $sql) : string</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="detail-description">
+<div class="long_description"></div>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$sql</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a id="method_function_list"></a><div class="element clickable method public method_function_list" data-toggle="collapse" data-target=".method_function_list .collapse">
 <h2>Return sql to list functions</h2>
 <pre>function_list() : NULL</pre>
@@ -241,7 +257,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/ODBC_Util.html

@@ -168,7 +168,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/PgSQL.html

@@ -142,7 +142,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/PgSQL_SQL.html

@@ -57,6 +57,7 @@
                     <ul>
 <li class="method public "><a href="#method_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="#method_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="#method_explain" title="explain() :: Get the query plan for the sql query"><span class="description">Get the query plan for the sql query</span><pre>explain()</pre></a></li>
 <li class="method public "><a href="#method_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="#method_limit" title="limit() :: Limit clause"><span class="description">Limit clause</span><pre>limit()</pre></a></li>
 <li class="method public "><a href="#method_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>
@@ -120,6 +121,21 @@
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
+<a id="method_explain"></a><div class="element clickable method public method_explain" data-toggle="collapse" data-target=".method_explain .collapse">
+<h2>Get the query plan for the sql query</h2>
+<pre>explain(string $sql) : string</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="detail-description">
+<div class="long_description"></div>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$sql</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a id="method_function_list"></a><div class="element clickable method public method_function_list" data-toggle="collapse" data-target=".method_function_list .collapse">
 <h2>Return sql to list functions</h2>
 <pre>function_list() : NULL</pre>
@@ -241,7 +257,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/PgSQL_Util.html

@@ -173,7 +173,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Query_Builder.html

@@ -64,6 +64,7 @@ in place of the get() method"><span class="description">Retrieve the number of r
 in place of the get() method</span><pre>count_all_results()</pre></a></li>
 <li class="method public "><a href="#method_delete" title="delete() :: Deletes data from a table"><span class="description">Deletes data from a table</span><pre>delete()</pre></a></li>
 <li class="method public "><a href="#method_distinct" title="distinct() :: Adds the 'distinct' keyword to a query"><span class="description">Adds the 'distinct' keyword to a query</span><pre>distinct()</pre></a></li>
+<li class="method public "><a href="#method_explain" title="explain() :: Tell the database to give you the query plan instead of result set"><span class="description">Tell the database to give you the query plan instead of result set</span><pre>explain()</pre></a></li>
 <li class="method public "><a href="#method_from" title="from() :: Specify the database table to select from"><span class="description">Specify the database table to select from</span><pre>from()</pre></a></li>
 <li class="method public "><a href="#method_get" title="get() :: Select and retrieve all records from the current table, and/or
 execute current compiled query"><span class="description">Select and retrieve all records from the current table, and/or
@@ -136,6 +137,7 @@ passed array with key / value pairs</span><pre>where()</pre></a></li>
 </li>
 <li class="nav-header protected">» Protected
                     <ul>
+<li class="property protected "><a href="#property_explain" title="$explain() :: "><span class="description"></span><pre>$explain</pre></a></li>
 <li class="property protected "><a href="#property_from_string" title="$from_string() :: "><span class="description"></span><pre>$from_string</pre></a></li>
 <li class="property protected "><a href="#property_group_array" title="$group_array() :: "><span class="description"></span><pre>$group_array</pre></a></li>
 <li class="property protected "><a href="#property_group_string" title="$group_string() :: "><span class="description"></span><pre>$group_string</pre></a></li>
@@ -282,6 +284,20 @@ in place of the get() method</h2>
 <div class="subelement response"><code>\Query_Builder</code></div>
 </div></div>
 </div>
+<a id="method_explain"></a><div class="element clickable method public method_explain" data-toggle="collapse" data-target=".method_explain .collapse">
+<h2>Tell the database to give you the query plan instead of result set</h2>
+<pre>explain() : \Query_Builder</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="detail-description">
+<div class="long_description"></div>
+<table class="table table-bordered"><tr>
+<th>fluent</th>
+<td>This method is part of a fluent interface and will return the same instance</td>
+</tr></table>
+<h3>Returns</h3>
+<div class="subelement response"><code>\Query_Builder</code></div>
+</div></div>
+</div>
 <a id="method_from"></a><div class="element clickable method public method_from" data-toggle="collapse" data-target=".method_from .collapse">
 <h2>Specify the database table to select from</h2>
 <pre>from(string $tblname) : \Query_Builder</pre>
@@ -995,7 +1011,7 @@ prefixed with 'OR NOT'</h2>
 <h2>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</h2>
-<pre>where(mixed $key, mixed $val) : \Query_Builder</pre>
+<pre>where(mixed $key, mixed $val, mixed $escape) : \Query_Builder</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="detail-description">
 <div class="long_description"></div>
@@ -1012,6 +1028,10 @@ passed array with key / value pairs</h2>
 <h4>$val</h4>
 <code>mixed</code>
 </div>
+<div class="subelement argument">
+<h4>$escape</h4>
+<code>mixed</code>
+</div>
 <h3>Returns</h3>
 <div class="subelement response"><code>\Query_Builder</code></div>
 </div></div>
@@ -1319,6 +1339,12 @@ passed array with key / value pairs</h2>
 <div class="labels"></div>
 <div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
 </div>
+<a id="property_explain"> </a><div class="element clickable property protected property_explain" data-toggle="collapse" data-target=".property_explain .collapse">
+<h2>$explain</h2>
+<pre>$explain </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="detail-description"><div class="long_description"></div></div></div>
+</div>
 <a id="property_from_string"> </a><div class="element clickable property protected property_from_string" data-toggle="collapse" data-target=".property_from_string .collapse">
 <h2>$from_string</h2>
 <pre>$from_string </pre>
@@ -1411,7 +1437,7 @@ passed array with key / value pairs</h2>
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Query_Parser.html

@@ -151,7 +151,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:46-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/SQLite.html

@@ -60,9 +60,7 @@
 <li class="method public "><a href="#method_get_system_tables" title="get_system_tables() :: List system tables for the current database"><span class="description">List system tables for the current database</span><pre>get_system_tables()</pre></a></li>
 <li class="method public "><a href="#method_get_tables" title="get_tables() :: List tables for the current database"><span class="description">List tables for the current database</span><pre>get_tables()</pre></a></li>
 <li class="method public "><a href="#method_insert_batch" title="insert_batch() :: Create sql for batch insert"><span class="description">Create sql for batch insert</span><pre>insert_batch()</pre></a></li>
-<li class="method public "><a href="#method_load_database" title="load_database() :: Load a database for the current connection"><span class="description">Load a database for the current connection</span><pre>load_database()</pre></a></li>
 <li class="method public "><a href="#method_truncate" title="truncate() :: Empty a table"><span class="description">Empty a table</span><pre>truncate()</pre></a></li>
-<li class="method public "><a href="#method_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>
 </ul>
 </li>
 <li class="nav-header">
@@ -159,23 +157,6 @@
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
-<a id="method_load_database"></a><div class="element clickable method public method_load_database" data-toggle="collapse" data-target=".method_load_database .collapse">
-<h2>Load a database for the current connection</h2>
-<pre>load_database(string $db, string $name) </pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="detail-description">
-<div class="long_description"></div>
-<h3>Parameters</h3>
-<div class="subelement argument">
-<h4>$db</h4>
-<code>string</code>
-</div>
-<div class="subelement argument">
-<h4>$name</h4>
-<code>string</code>
-</div>
-</div></div>
-</div>
 <a id="method_truncate"></a><div class="element clickable method public method_truncate" data-toggle="collapse" data-target=".method_truncate .collapse">
 <h2>Empty a table</h2>
 <pre>truncate(string $table) </pre>
@@ -189,19 +170,6 @@
 </div>
 </div></div>
 </div>
-<a id="method_unload_database"></a><div class="element clickable method public method_unload_database" data-toggle="collapse" data-target=".method_unload_database .collapse">
-<h2>Unload a database from the current connection</h2>
-<pre>unload_database(string $name) </pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="detail-description">
-<div class="long_description"></div>
-<h3>Parameters</h3>
-<div class="subelement argument">
-<h4>$name</h4>
-<code>string</code>
-</div>
-</div></div>
-</div>
 <h3>
 <i class="icon-custom icon-property"></i> Properties</h3>
 <a id="property_statement"> </a><div class="element clickable property protected property_statement" data-toggle="collapse" data-target=".property_statement .collapse">
@@ -218,7 +186,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/SQLite_SQL.html

@@ -57,6 +57,7 @@
                     <ul>
 <li class="method public "><a href="#method_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="#method_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="#method_explain" title="explain() :: Get the query plan for the sql query"><span class="description">Get the query plan for the sql query</span><pre>explain()</pre></a></li>
 <li class="method public "><a href="#method_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="#method_limit" title="limit() :: Limit clause"><span class="description">Limit clause</span><pre>limit()</pre></a></li>
 <li class="method public "><a href="#method_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>
@@ -120,6 +121,21 @@
 <div class="subelement response"><code>NULL</code></div>
 </div></div>
 </div>
+<a id="method_explain"></a><div class="element clickable method public method_explain" data-toggle="collapse" data-target=".method_explain .collapse">
+<h2>Get the query plan for the sql query</h2>
+<pre>explain(string $sql) : string</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="detail-description">
+<div class="long_description"></div>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$sql</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a id="method_function_list"></a><div class="element clickable method public method_function_list" data-toggle="collapse" data-target=".method_function_list .collapse">
 <h2>Return sql to list functions</h2>
 <pre>function_list() : NULL</pre>
@@ -241,7 +257,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/SQLite_Util.html

@@ -173,7 +173,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/iDB_SQL.html

@@ -59,6 +59,7 @@
 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="#method_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="#method_explain" title="explain() :: Modify the query to get the query plan"><span class="description">Modify the query to get the query plan</span><pre>explain()</pre></a></li>
 <li class="method public "><a href="#method_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="#method_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="#method_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>
@@ -120,6 +121,21 @@ specified table</h2>
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
+<a id="method_explain"></a><div class="element clickable method public method_explain" data-toggle="collapse" data-target=".method_explain .collapse">
+<h2>Modify the query to get the query plan</h2>
+<pre>explain(string $sql) : string</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="detail-description">
+<div class="long_description"></div>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$sql</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>string</code></div>
+</div></div>
+</div>
 <a id="method_function_list"></a><div class="element clickable method public method_function_list" data-toggle="collapse" data-target=".method_function_list .collapse">
 <h2>Return sql to list functions</h2>
 <pre>function_list() : NULL</pre>
@@ -249,7 +265,7 @@ specified table</h2>
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:46-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/iQuery_Builder.html

@@ -61,6 +61,7 @@ in place of the get() method"><span class="description">Retrieve the number of r
 in place of the get() method</span><pre>count_all_results()</pre></a></li>
 <li class="method public "><a href="#method_delete" title="delete() :: Deletes data from a table"><span class="description">Deletes data from a table</span><pre>delete()</pre></a></li>
 <li class="method public "><a href="#method_distinct" title="distinct() :: Adds the 'distinct' keyword to a query"><span class="description">Adds the 'distinct' keyword to a query</span><pre>distinct()</pre></a></li>
+<li class="method public "><a href="#method_explain" title="explain() :: Shows the query plan for the query"><span class="description">Shows the query plan for the query</span><pre>explain()</pre></a></li>
 <li class="method public "><a href="#method_from" title="from() :: Specify the database table to select from"><span class="description">Specify the database table to select from</span><pre>from()</pre></a></li>
 <li class="method public "><a href="#method_get" title="get() :: Select and retrieve all records from the current table, and/or
 execute current compiled query"><span class="description">Select and retrieve all records from the current table, and/or
@@ -100,11 +101,8 @@ prefixed with 'OR NOT'</span><pre>or_not_group_start()</pre></a></li>
 <li class="method public "><a href="#method_select_sum" title="select_sum() :: Selects the sum of a field from a query"><span class="description">Selects the sum of a field from a query</span><pre>select_sum()</pre></a></li>
 <li class="method public "><a href="#method_set" title="set() :: Sets values for inserts / updates / deletes"><span class="description">Sets values for inserts / updates / deletes</span><pre>set()</pre></a></li>
 <li class="method public "><a href="#method_update" title="update() :: Creates an update clause, and executes it"><span class="description">Creates an update clause, and executes it</span><pre>update()</pre></a></li>
-<li class="method public "><a href="#method_where" title="where() :: Specify condition(s) in the where clause of a query
+<li class="method public "><a href="#method_where" title="where() :: "><span class="description">where()
-Note: this function works with key / value, or a
+        </span><pre>where()</pre></a></li>
-passed array with key / value pairs"><span class="description">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</span><pre>where()</pre></a></li>
 <li class="method public "><a href="#method_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="#method_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>
 </ul>
@@ -199,6 +197,20 @@ in place of the get() method</h2>
 <div class="subelement response"><code>\iQuery_Builder</code></div>
 </div></div>
 </div>
+<a id="method_explain"></a><div class="element clickable method public method_explain" data-toggle="collapse" data-target=".method_explain .collapse">
+<h2>Shows the query plan for the query</h2>
+<pre>explain() : \iQuery_Builder</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="detail-description">
+<div class="long_description"></div>
+<table class="table table-bordered"><tr>
+<th>fluent</th>
+<td>This method is part of a fluent interface and will return the same instance</td>
+</tr></table>
+<h3>Returns</h3>
+<div class="subelement response"><code>\iQuery_Builder</code></div>
+</div></div>
+</div>
 <a id="method_from"></a><div class="element clickable method public method_from" data-toggle="collapse" data-target=".method_from .collapse">
 <h2>Specify the database table to select from</h2>
 <pre>from(string $tblname) : \iQuery_Builder</pre>
@@ -890,28 +902,16 @@ prefixed with 'OR NOT'</h2>
 </div></div>
 </div>
 <a id="method_where"></a><div class="element clickable method public method_where" data-toggle="collapse" data-target=".method_where .collapse">
-<h2>Specify condition(s) in the where clause of a query
+<h2>where()
-Note: this function works with key / value, or a
+        </h2>
-passed array with key / value pairs</h2>
+<pre>where($key, $val, $escape) </pre>
-<pre>where(mixed $key, mixed $val) : \iQuery_Builder</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="detail-description">
 <div class="long_description"></div>
-<table class="table table-bordered"><tr>
-<th>fluent</th>
-<td>This method is part of a fluent interface and will return the same instance</td>
-</tr></table>
 <h3>Parameters</h3>
-<div class="subelement argument">
+<div class="subelement argument"><h4>$key</h4></div>
-<h4>$key</h4>
+<div class="subelement argument"><h4>$val</h4></div>
-<code>mixed</code>
+<div class="subelement argument"><h4>$escape</h4></div>
-</div>
-<div class="subelement argument">
-<h4>$val</h4>
-<code>mixed</code>
-</div>
-<h3>Returns</h3>
-<div class="subelement response"><code>\iQuery_Builder</code></div>
 </div></div>
 </div>
 <a id="method_where_in"></a><div class="element clickable method public method_where_in" data-toggle="collapse" data-target=".method_where_in .collapse">
@@ -968,7 +968,7 @@ passed array with key / value pairs</h2>
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/deprecated.html

@@ -66,7 +66,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:46-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/errors.html

@@ -93,7 +93,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:46-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/graph_class.html

@@ -63,7 +63,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:46-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/markers.html

@@ -102,7 +102,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:46-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/namespaces/global.html

@@ -66,7 +66,7 @@
 with array_map and glob"><span class="description">Bulk directory loading workaround for use
 with array_map and glob</span><pre>do_include</pre></a></li>
 <li class="function  "><a href="#function_mb_trim" title="mb_trim() :: Multibyte-safe trim function"><span class="description">Multibyte-safe trim function</span><pre>mb_trim</pre></a></li>
-<li class="function  "><a href="#function_query_autoload" title="query_autoload() :: Load a Query class"><span class="description">Load a Query class</span><pre>query_autoload</pre></a></li>
+<li class="function  "><a href="#function_query_autoload" title="query_autoload() :: Load query classes"><span class="description">Load query classes</span><pre>query_autoload</pre></a></li>
 <li class="nav-header">
 <i class="icon-custom icon-interface"></i> Interfaces</li>
 <li><a href="#iQuery_Builder" title="Interface defining the Query Builder class">iQuery_Builder</a></li>
@@ -109,7 +109,7 @@ instantiates the specific db driver">Query_Builder</a></li>
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/Default.html

@@ -66,7 +66,7 @@
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/Query.Drivers.html

@@ -209,7 +209,7 @@ data-fetching methods</p>
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/Query.Query.html

@@ -147,7 +147,7 @@ instantiates the specific db driver</p>
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/Query.html

@@ -73,7 +73,7 @@
 with array_map and glob"><span class="description">Bulk directory loading workaround for use
 with array_map and glob</span><pre>do_include</pre></a></li>
 <li class="function  "><a href="#function_mb_trim" title="mb_trim() :: Multibyte-safe trim function"><span class="description">Multibyte-safe trim function</span><pre>mb_trim</pre></a></li>
-<li class="function  "><a href="#function_query_autoload" title="query_autoload() :: Load a Query class"><span class="description">Load a Query class</span><pre>query_autoload</pre></a></li>
+<li class="function  "><a href="#function_query_autoload" title="query_autoload() :: Load query classes"><span class="description">Load query classes</span><pre>query_autoload</pre></a></li>
 <li class="nav-header">
 <i class="icon-custom icon-constant"></i> Constants</li>
 <li class="constant  "><a href="#constant_QBASE_PATH" title="QBASE_PATH() :: Reference to root path"><span class="description">Reference to root path</span><pre>QBASE_PATH</pre></a></li>
@@ -98,6 +98,21 @@ with array_map and glob</span><pre>do_include</pre></a></li>
 <h4>$params</h4>
 <code>mixed</code>
 </div>
+<h3>Exceptions</h3>
+<table class="table table-bordered">
+<tr>
+<th><code><a href="InvalidArgumentException.html">\InvalidArgumentException</a></code></th>
+<td></td>
+</tr>
+<tr>
+<th><code><a href="../classes/BadDBDriverException.html">\BadDBDriverException</a></code></th>
+<td></td>
+</tr>
+<tr>
+<th><code><a href="../classes/BadConnectionException.html">\BadConnectionException</a></code></th>
+<td></td>
+</tr>
+</table>
 <h3>Returns</h3>
 <div class="subelement response"><code><a href="../classes/Query_Builder.html">\Query_Builder</a></code></div>
 </div></div>
@@ -137,18 +152,21 @@ with array_map and glob</h2>
 </div>
 <a id="function_mb_trim"></a><div class="element clickable function  function_mb_trim" data-toggle="collapse" data-target=".function_mb_trim .collapse">
 <h2>Multibyte-safe trim function</h2>
-<pre>mb_trim($string) : string</pre>
+<pre>mb_trim(string $string) : string</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="detail-description">
 <div class="long_description"></div>
 <h3>Parameters</h3>
-<div class="subelement argument"><h4>$string</h4></div>
+<div class="subelement argument">
+<h4>$string</h4>
+<code>string</code>
+</div>
 <h3>Returns</h3>
 <div class="subelement response"><code>string</code></div>
 </div></div>
 </div>
 <a id="function_query_autoload"></a><div class="element clickable function  function_query_autoload" data-toggle="collapse" data-target=".function_query_autoload .collapse">
-<h2>Load a Query class</h2>
+<h2>Load query classes</h2>
 <pre>query_autoload(string $class) </pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="detail-description">
@@ -371,7 +389,7 @@ instantiates the specific db driver</p>
             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.1.0
 </a> and<br>
-            generated on 2013-12-09T19:45:45-05:00.<br></footer></div>
+            generated on 2014-02-07T16:51:34-05:00.<br></footer></div>
 </div>
 </body>
 </html>

tests/core/db_test.php

@@ -62,6 +62,8 @@ abstract class DBTest extends UnitTestCase {
 	
 	public function TestBackupData()
 	{
+		if (empty($this->db))  return;
+		
 		$this->assertTrue(is_string($this->db->util->backup_data()));
 	}
 	
@@ -69,6 +71,8 @@ abstract class DBTest extends UnitTestCase {
 	
 	public function TestGetColumns()
 	{
+		if (empty($this->db))  return;
+	
 		$cols = $this->db->get_columns('create_test');
 		$this->assertTrue(is_array($cols));
 	}
@@ -77,6 +81,8 @@ abstract class DBTest extends UnitTestCase {
 	
 	public function TestGetTypes()
 	{
+		if (empty($this->db))  return;
+	
 		$types = $this->db->get_types();
 		$this->assertTrue(is_array($types));
 	}

tests/databases/firebird/firebird-qb.php

@@ -21,12 +21,18 @@ class FirebirdQBTest extends QBTest {
 	public function __construct()
 	{
 		parent::__construct();
+		// echo '<hr /> Firebird Queries <hr />';
+	}
 	
+	// --------------------------------------------------------------------------
+	
+	public function setUp()
+	{
 		$dbpath = QTEST_DIR.QDS.'db_files'.QDS.'FB_TEST_DB.FDB';
 
 		// Test the query builder
 		$params = new Stdclass();
-		$params->name = 'fire';
+		$params->alias = 'fire';
 		$params->type = 'firebird';
 		$params->file = $dbpath;
 		$params->host = 'localhost';
@@ -34,8 +40,40 @@ class FirebirdQBTest extends QBTest {
 		$params->pass = 'masterkey';
 		$params->prefix = 'create_';
 		$this->db = Query($params);
+	}
 	
-		// echo '<hr /> Firebird Queries <hr />';
+	// --------------------------------------------------------------------------
+	
+	public function TestGetNamedConnectionException()
+	{
+		try 
+		{
+			$db = Query('fire');
+		}
+		catch(InvalidArgumentException $e)
+		{
+			$this->assertTrue(TRUE);
+		}
+	}
+	
+	// --------------------------------------------------------------------------
+	
+	public function TestGetNamedConnection()
+	{
+		$dbpath = QTEST_DIR.QDS.'db_files'.QDS.'FB_TEST_DB.FDB';
+
+		// Test the query builder
+		$params = new Stdclass();
+		$params->alias = 'fire';
+		$params->type = 'firebird';
+		$params->file = $dbpath;
+		$params->host = 'localhost';
+		$params->user = 'sysdba';
+		$params->pass = 'masterkey';
+		$params->prefix = 'create_';
+		$f_conn = Query($params);
+	
+		$this->assertReference($f_conn, Query('fire'));
 	}
 	
 	// --------------------------------------------------------------------------

tests/databases/mysql/mysql-qb.php

@@ -27,7 +27,7 @@ class MySQLQBTest extends QBTest {
 			$params->type = "MySQL";
 			$params->prefix = "create_";;
 		}
-		elseif (($var = getenv('CI')))
+		elseif (($var = getenv('CI'))) // Travis CI Connection Info
 		{
 			$params = array(
 				'host' => '127.0.0.1',

tests/databases/pgsql/pgsql-qb.php

@@ -26,7 +26,7 @@ class PgSQLQBTest extends QBTest {
 			$params->type = "pgsql";
 			$params->prefix = 'create_';
 		}
-		elseif (($var = getenv('CI')))
+		elseif (($var = getenv('CI'))) // Travis CI Connection Info
 		{
 			$params = array(
 				'host' => '127.0.0.1',