Fixed bug with handling functions in select

classes/db_pdo.php

@@ -279,8 +279,23 @@ abstract class DB_PDO extends PDO {
 		$hiers = explode('.', $ident);
 		$hiers = array_map('mb_trim', $hiers);
 
-		// Return the re-compiled string
+		// Re-compile the string
-		return implode('.', array_map(array($this, '_quote'), $hiers));
+		$raw = implode('.', array_map(array($this, '_quote'), $hiers));
+
+		// Fix functions
+		$funcs = array();
+		preg_match_all("#{$this->escape_char}([a-zA-Z0-9_]+(\((.*?)\))){$this->escape_char}#iu", $raw, $funcs, PREG_SET_ORDER);
+		foreach($funcs as $f)
+		{
+			// Unquote the function
+			$raw = str_replace($f[0], $f[1], $raw);
+
+			// Quote the inside identifiers
+			$raw = str_replace($f[3], $this->quote_ident($f[3]), $raw);
+		}
+
+		return $raw;
+
 	}
 
 	// --------------------------------------------------------------------------

docs/classes/BadConnectionException.html

@@ -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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/BadDBDriverException.html

@@ -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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/DB_PDO.html

@@ -743,7 +743,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/DB_Util.html

@@ -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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Firebird.html

@@ -925,7 +925,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Firebird_Result.html

@@ -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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Firebird_SQL.html

@@ -234,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Firebird_Util.html

@@ -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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/MySQL.html

@@ -963,7 +963,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/MySQL_SQL.html

@@ -239,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/MySQL_Util.html

@@ -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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/ODBC.html

@@ -963,7 +963,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/ODBC_SQL.html

@@ -234,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/ODBC_Util.html

@@ -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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/PgSQL.html

@@ -965,7 +965,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/PgSQL_SQL.html

@@ -234,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/PgSQL_Util.html

@@ -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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Query_Builder.html

@@ -1361,7 +1361,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Query_Parser.html

@@ -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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/SQLite.html

@@ -980,7 +980,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/SQLite_SQL.html

@@ -234,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/SQLite_Util.html

@@ -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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/iDB_SQL.html

@@ -244,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/iQuery_Builder.html

@@ -964,7 +964,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/deprecated.html

@@ -68,7 +68,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/errors.html

@@ -237,7 +237,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/graph_class.html

@@ -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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/markers.html

@@ -110,7 +110,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/namespaces/default.html

@@ -340,7 +340,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/.html

@@ -68,7 +68,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/Default.html

@@ -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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/Query.Drivers.html

@@ -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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/Query.Query.html

@@ -150,7 +150,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/Query.html

@@ -362,7 +362,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 2013-02-07T16:20:40-05:00.<br></footer></div>
+            generated on 2013-04-25T08:15:20-04:00.<br></footer></div>
 </div>
 </body>
 </html>

tests/core/db_qb_test.php

@@ -36,6 +36,22 @@ abstract class QBTest extends UnitTestCase {
 		$this->assertReference($this->db, $db);
 	}
 
+	// --------------------------------------------------------------------------
+
+	public function TestFunctionGet()
+	{
+		if (empty($this->db))  return;
+
+		$query = $this->db->select('id, COUNT(id) as count')
+			->from('test')
+			->group_by('id')
+			->get();
+
+		$this->assertIsA($query, 'PDOStatement');
+	}
+
+	// --------------------------------------------------------------------------
+
 	public function TestGet()
 	{
 		if (empty($this->db))  return;