From ddb45098c0c0df5b89f5dada80f81ea0e12035f3 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Wed, 7 Feb 2007 15:13:43 +0000
Subject: [PATCH] little fix

---
 lib/Doctrine/Query.php          | 19 +++++++++++++++----
 tests/Query/OrderbyTestCase.php |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php
index 64152e126..a9098d5e8 100644
--- a/lib/Doctrine/Query.php
+++ b/lib/Doctrine/Query.php
@@ -215,10 +215,18 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
         if(method_exists($this->conn->expression, $name)) {
 
             $argStr = substr($func, ($pos + 1), -1);
+            $args   = explode(',', $argStr);
 
-            $args    = explode(',', $argStr);
+            $func   = call_user_func_array(array($this->conn->expression, $name), $args);
 
-            $e2    = explode(' ', $args[0]);
+            if(substr($func, 0, 1) !== '(') {
+                $pos  = strpos($func, '(');
+                $name = substr($func, 0, $pos);
+            } else {
+                $name = $func;
+            }
+
+            $e2     = explode(' ', $args[0]);
 
             $distinct = '';
             if(count($e2) > 1) {
@@ -299,8 +307,11 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
 
             $sqlAlias = $tableAlias . '__' . count($this->aggregateMap);
 
-            $this->parts['select'][] = $name . '(' . $distinct . implode(', ', $arglist) . ') AS ' . $sqlAlias;
-
+            if(substr($name, 0, 1) !== '(') {
+                $this->parts['select'][] = $name . '(' . $distinct . implode(', ', $arglist) . ') AS ' . $sqlAlias;
+            } else {
+                $this->parts['select'][] = $name . ' AS ' . $sqlAlias;
+            }
             $this->aggregateMap[$alias] = $sqlAlias;
             $this->neededTables[] = $tableAlias;
         }
diff --git a/tests/Query/OrderbyTestCase.php b/tests/Query/OrderbyTestCase.php
index ba37c543c..468b96913 100644
--- a/tests/Query/OrderbyTestCase.php
+++ b/tests/Query/OrderbyTestCase.php
@@ -51,6 +51,6 @@ class Doctrine_Query_Orderby_TestCase extends Doctrine_UnitTestCase
           ->from('User u')
           ->orderby('rand DESC');
 
-        $this->assertEqual($q->getQuery(), 'SELECT e.id AS e__id, e.name AS e__name, RANDOM() AS e__0 FROM entity e WHERE (e.type = 0) ORDER BY e__0 DESC');
+        $this->assertEqual($q->getQuery(), 'SELECT e.id AS e__id, e.name AS e__name, ((RANDOM() + 2147483648) / 4294967296) AS e__0 FROM entity e WHERE (e.type = 0) ORDER BY e__0 DESC');
     }
 }