Doctrine

Timestamp:

03/08/08 03:26:14 (16 months ago)

Author:

jwage

Message:

A few cosmetic fixes. Fixed test cases.

Location:

branches/0.10

Files:

• lib/Doctrine/Query.php (modified) (2 diffs)
• lib/Doctrine/Table.php (modified) (1 diff)
• tests/DoctrineTest/GroupTest.php (modified) (1 diff)
• tests/Query/AggregateValueTestCase.php (modified) (3 diffs)
• tests/run.php (modified) (1 diff)

branches/0.10/lib/Doctrine/Query.php

@@ -397 +397 @@
             return $this->getSqlAggregateAlias($dqlAlias);
         } else {
-             throw new Doctrine_Query_Exception('Unknown aggregate alias: ' . $dqlAlias);
+            throw new Doctrine_Query_Exception('Unknown aggregate alias: ' . $dqlAlias);
         }
     }
@@ -1435 +1435 @@
     public function load($path, $loadFields = true)
     {
-        if (isset($this->_queryComponents[$path])) {
-           return $this->_queryComponents[$path];
-        }
+        if (isset($this->_queryComponents[$path])) {
+            return $this->_queryComponents[$path];
+        }
+
         $e = $this->_tokenizer->quoteExplode($path, ' INDEXBY ');
 

branches/0.10/lib/Doctrine/Table.php

@@ -246 +246 @@
      */
     public function initDefinition()
-    {        
+    {
         $name = $this->_options['name'];
         if ( ! class_exists($name) || empty($name)) {

branches/0.10/tests/DoctrineTest/GroupTest.php

@@ -50 +50 @@
             } catch(Exception $e) {
                 $this->_failed += 1;
-                $this->_messages[] = 'Unexpected exception thrown with message [' . $e->getMessage() . '] in ' . $e->getFile() . ' on line ' . $e->getLine();
+                $this->_messages[] = 'Unexpected exception thrown in [' . get_class($testCase) . '] with message [' . $e->getMessage() . '] in ' . $e->getFile() . ' on line ' . $e->getLine() . "\n\nTrace\n-------------\n\n" . $e->getTraceAsString();;
+                
             }
             $this->_passed += $testCase->getPassCount();

branches/0.10/tests/Query/AggregateValueTestCase.php

@@ -146 +146 @@
         $q = new Doctrine_Query();
 
-        $q->select('MAX(u.name)')->from('User u')->leftJoin('u.Phonenumber p')->groupby('u.id');
-
-        $this->assertEqual($q->getQuery(), 'SELECT MAX(e.name) AS e__0 FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0) GROUP BY e.id');
+        $q->select('MAX(u.name), u.*, p.*')->from('User u')->leftJoin('u.Phonenumber p')->groupby('u.id');
+
+        $this->assertEqual($q->getQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id, MAX(e.name) AS e__0 FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0) GROUP BY e.id');
         $users = $q->execute();
 
@@ -181 +181 @@
     {
         $q = new Doctrine_Query();
-        $func = $q->from('QueryTest_Item i')->parseFunctionExpression('SUM(i.price)');
-    
-        $this->assertEqual($func, 'SUM(i.price)');
+        $q->select('SUM(i.price)')->from('QueryTest_Item i');
+
+        $this->assertEqual($q->getSql(), 'SELECT SUM(q.price) AS q__0 FROM query_test__item q');
     }
     public function testAggregateFunctionParser2()
     {
         $q = new Doctrine_Query();
-        $func = $q->from('QueryTest_Item i')->parseFunctionExpression('SUM(i.price * i.quantity)');
-
-        $this->assertEqual($func, 'SUM(i.price * i.quantity)');
+        $q->select('SUM(i.price * i.quantity)')->from('QueryTest_Item i');
+
+        $this->assertEqual($q->getSql(), 'SELECT SUM(q.price * q.quantity) AS q__0 FROM query_test__item q');
     }
     public function testAggregateFunctionParser3()
     {
         $q = new Doctrine_Query();
-        $func = $q->from('QueryTest_Item i')->parseFunctionExpression('MOD(i.price, i.quantity)');
-
-        $this->assertEqual($func, 'MOD(i.price, i.quantity)');
+        $q->select('MOD(i.price, i.quantity)')->from('QueryTest_Item i');
+
+        $this->assertEqual($q->getSql(), 'SELECT MOD(q.price, q.quantity) AS q__0 FROM query_test__item q');
     }
     public function testAggregateFunctionParser4()
     {
         $q = new Doctrine_Query();
-        $func = $q->from('QueryTest_Item i')->parseFunctionExpression('CONCAT(i.price, i.quantity)');
-
-        $this->assertEqual($func, 'CONCAT(i.price, i.quantity)');
+        $q->select('CONCAT(i.price, i.quantity)')->from('QueryTest_Item i');
+
+        $this->assertEqual($q->getSql(), 'SELECT CONCAT(q.price, q.quantity) AS q__0 FROM query_test__item q');
     }
     public function testAggregateFunctionParsingSupportsMultipleComponentReferences()
@@ -211 +211 @@
         $q->select('SUM(i.price * i.quantity)')
           ->from('QueryTest_Item i');
-          
+
         $this->assertEqual($q->getQuery(), "SELECT SUM(q.price * q.quantity) AS q__0 FROM query_test__item q");
     }
-
-
 }

branches/0.10/tests/run.php

@@ -186 +186 @@
 // Query tests
 $query_tests = new GroupTest('Query tests','query_test');
+$query_tests->addTestCase(new Doctrine_Query_TestCase());
 $query_tests->addTestCase(new Doctrine_Query_Condition_TestCase());
 $query_tests->addTestCase(new Doctrine_Query_MultiJoin_TestCase());