Changeset 1647

Timestamp:

02/26/10 17:29:09 (5 months ago)

Author:

klemens

Message:

Fixed ullQuery + Test

Location:

trunk

Files:

• plugins/ullCorePlugin/lib/generator/ullQuery.class.php (modified) (11 diffs)
• test/unit/ullCorePlugin/ullQueryTest.php (modified) (15 diffs)

trunk/plugins/ullCorePlugin/lib/generator/ullQuery.class.php

@@ -5 +5 @@
  * It allows giving related columns in the ull-relation syntax relative to a given base model.
  * 
- * Example for ullVentoryItem: 'UllUser->username' selects the username of an item's owner
+ * Example for the base class ullVentoryItem: 'UllUser->username' selects the username of an item's owner
  * 
  * It automatically adds the necessary "from" clauses (=joins) and it administrates
@@ -37 +37 @@
     $this->q = new ullDoctrineQuery();
     
-    $from = $this->baseModel . ' x';
-    $from .= ($indexBy) ? (' INDEXBY ' . $indexBy) : '';
-    $this->q->from($from);
-    
+    $doctrineFromString = $this->baseModel . ' x';
+    $doctrineFromString .= ($indexBy) ? (' INDEXBY ' . $indexBy) : '';
+    $this->q->from($doctrineFromString);
+    
+    // add discriminator column for base model
     $inheritanceKeyFields = $this->getInheritanceKeyField($this->baseModel);
     if ($inheritanceKeyFields != null)
@@ -46 +47 @@
       $this->addSelect($inheritanceKeyFields);
     }
-  }
-  
-  /**
-   * Inspect the inheritance map of a model and
-   * retrieve keyFields, if any.
-   * @param unknown_type $modelName
-   * @return array keyFields, if there are none, null
-   */
-  private function getInheritanceKeyField($modelName)
-  {
-    $inheritanceMap = Doctrine::getTable($modelName)->getOption('inheritanceMap');
-    $inheritanceFieldKeys = array_keys($inheritanceMap);
-    if (count($inheritanceFieldKeys) > 0)
-    {
-      return $inheritanceFieldKeys;
-    }
-    else
-    {
-      return null;
-    } 
-  }
+    
+    // add indexby column
+    if ($indexBy)
+    {
+      $this->addSelect($indexBy);
+    }
+  }
+  
   
   /******************************************
@@ -72 +60 @@
    ******************************************/
   
-  
   /**
    * Add SELECT columns
@@ -130 +117 @@
   {
     $this->handleWhere($where, $params, true);
-    
-    return $this;
-  }
-  
-  /**
-   * Internal function which handles adding where clauses to
-   * the query; supports AND and OR.
-   * 
-   * @param $where the where term to add
-   * @param $params
-   * @param $coordinatorIsOr true if OR, false if AND
-   * @return self
-   */
-  protected function handleWhere($where, $params = array(), $coordinatorIsOr)
-  {
-    preg_match('/^([a-z>_-])+/i', $where, $matches);
-    $search = $matches[0];
-    $replace = $this->relationStringToDoctrineQueryColumn($search);
-
-    $where = str_replace($search, $replace, $where);
-    
-    if ($coordinatorIsOr)
-    {
-      $this->q->orWhere($where, $params);
-    }
-    else
-    {
-      $this->q->addWhere($where, $params);
-    }
-    
-    $this->addRelationsToQuery();
     
     return $this;
@@ -287 +243 @@
   }  
   
+  /**
+   * SQL limit funtion
+   * 
+   * @param int $limit
+   * @return self
+   */
+  public function limit($limit)
+  {
+    $this->q->limit($limit);
+    
+    return $this;
+  }
+  
   
   /**
@@ -319 +288 @@
     return $this->q->count($params);
   }    
-  
-  //TODO: add a indexBy($column) method.
-  //@see  http://www.doctrine-project.org/documentation/manual/1_2/pl/dql-doctrine-query-language:indexby-keyword
-  //It should work this way: 
-  //  In ullQuery we have no addFrom, since this is handled automatically
-  //  $q->indexBy('slug')
-  //  
-      
   
   
@@ -391 +352 @@
    * Also registeres the necessary relations
    * 
-   * Example for TestTable: 'UllUser->username'
+   * Example for base model TestTable: 'UllUser->username'
    * Returns 'x.ulluser.username' and adds the relation to UllUser
    * 
@@ -482 +443 @@
   
   /**
-   * Add the internally collected relations to the query
-   * 
-   * @param string $alias
-   * @param array $relations
+   * Adds the internally collected relations to the query
+   * 
+   * @param string $alias     Doctrine base alias
+   * @param array $relations  Tree of relations relative to the base model 
+   * Example:
+   * 
+   * array(2) {
+   *  ["UllLocation"]=>
+   *  array(1) {
+   *    ["Translation"]=>
+   *    array(0) {
+   *    }
+   *  }
+   * ["UllJobTitle"]=>
+   *  array(0) {
+   *  }
+   *}
+   * @param $baseModel        Class name of the base model
+   * 
    * @return none
    */
-  public function addRelationsToQuery($alias = 'x', $relations = array(), $fromModel = null)
-  {
-    if (!count($relations))
+  public function addRelationsToQuery($alias = 'x', $relations = null, $baseModel = null)
+  {
+    if ($relations === null)
     {
       $relations = $this->relations;
     }
     
-    if (!$fromModel)
-    {
-      $fromModel = $this->getBaseModel();
-    }    
-    
+    if (!is_array($relations))
+    {
+      throw new InvalidArgumentException('parameter "relations" must be an array');
+    }
+    
+    if (!$baseModel)
+    {
+      $baseModel = $this->getBaseModel();
+    }
+
     foreach ($relations as $relation => $subRelations)
     {
       $newAlias = $alias . '_' . $this->relationStringToAlias($relation, false);
       
-      $from = $alias . '.' . $relation . ' ' . $newAlias;
+      $doctrineFromString = $alias . '.' . $relation . ' ' . $newAlias;
       
       $fromParts = $this->q->getDqlPart('from');
       
-      $doctrineRelation = Doctrine::getTable($fromModel)->getRelation($relation);
-      
-      if (!in_array($from, $fromParts))
+      $doctrineRelation = Doctrine::getTable($baseModel)->getRelation($relation);
+      
+      if (!in_array($doctrineFromString, $fromParts))
       { 
-        $this->q->addFrom($from);
-        
+        $this->q->addFrom($doctrineFromString);
+        
+        // add discriminator column
         $inheritanceKeyFields = $this->getInheritanceKeyField($doctrineRelation->getClass());
         
@@ -524 +506 @@
         }
         
+        // Hardcoded workaround for UllUser because we can't detect the discriminator column for the parent entity
         if ($doctrineRelation->getClass() == 'UllEntity')
         {
@@ -530 +513 @@
       }
       
-      // This is necessary for Doctrine joins:
-      $selectId = $alias . '.' . $doctrineRelation->getLocalColumnName();
-      $selectParts = $this->q->getDqlPart('select');
-      if (!in_array($selectId, $selectParts))
-      {
-        $this->q->addSelect($selectId);
-      }
-    
+      // Select the local identifiers. This is necessary for Doctrine joins:
+      $identifiers = Doctrine::getTable($baseModel)->getIdentifier();
+
+      if (!is_array($identifiers))
+      {
+        $identifiers = array($identifiers);
+      }
+      
+      foreach ($identifiers as $identifier)
+      {
+        $selectId = $alias . '.' .  $identifier;
+        
+        $selectParts = $this->q->getDqlPart('select');
+        if (!in_array($selectId, $selectParts))
+        {
+          $this->q->addSelect($selectId);
+        }
+      }
+    
+      // Call the method recursivly for subrelations
       if (count($subRelations))
       {
-        $doctrineRelation = Doctrine::getTable($fromModel)->getRelation($relation);
-        
         $this->addRelationsToQuery($newAlias, $subRelations, $doctrineRelation->getClass());
       }
     }
   }
+  
+  
+  /**
+   * Inspect the inheritance map of a model and
+   * retrieve keyFields, if any.
+   * 
+   * @param unknown_type $modelName
+   * @return array keyFields, if there are none, null
+   */
+  protected function getInheritanceKeyField($modelName)
+  {
+    $inheritanceMap = Doctrine::getTable($modelName)->getOption('inheritanceMap');
+    $inheritanceFieldKeys = array_keys($inheritanceMap);
+    if (count($inheritanceFieldKeys) > 0)
+    {
+      return $inheritanceFieldKeys;
+    }
+    else
+    {
+      return null;
+    } 
+  }  
+  
+  
+  /**
+   * Internal function which handles adding where clauses to
+   * the query; supports AND and OR.
+   * 
+   * @param $where the where term to add
+   * @param $params
+   * @param $coordinatorIsOr true if OR, false if AND
+   * @return self
+   */
+  protected function handleWhere($where, $params = array(), $coordinatorIsOr)
+  {
+    preg_match('/^([a-z>_-])+/i', $where, $matches);
+    $search = $matches[0];
+    $replace = $this->relationStringToDoctrineQueryColumn($search);
+
+    $where = str_replace($search, $replace, $where);
+    
+    if ($coordinatorIsOr)
+    {
+      $this->q->orWhere($where, $params);
+    }
+    else
+    {
+      $this->q->addWhere($where, $params);
+    }
+    
+    $this->addRelationsToQuery();
+    
+    return $this;
+  }  
   
   

trunk/test/unit/ullCorePlugin/ullQueryTest.php

@@ -9 +9 @@
 sfLoader::loadHelpers('I18N');
 
-$t = new myTestCase(21, new lime_output_color, $configuration);
+$t = new myTestCase(24, new lime_output_color, $configuration);
 $path = sfConfig::get('sf_root_dir') . '/plugins/ullCorePlugin/data/fixtures/';
 $t->setFixturesPath($path);
@@ -16 +16 @@
 $t->begin('__construct()');
   $q = new ullQuery('TestTable');
+
+  
+$t->begin('__construct() with INDEXBY | Also tests limit()');
+  $q = new ullQuery('UllUserStatus', 'slug');
+  $q->addSelect('is_absent');
+  $q->limit(1);
+  $t->is(
+    $q->getSqlQuery(),
+    "SELECT u.id AS u__id, u.slug AS u__slug, u.is_absent AS u__is_absent FROM ull_user_status u LIMIT 1",
+    'Created the correct SQL query'
+  );
+  $t->is(
+    $q->execute(array(), DOCTRINE::HYDRATE_ARRAY), 
+    array('active' => array('id' => 1, 'slug' => 'active', 'is_absent' => false)), 
+    'Returns an indexed by array'
+  );
   
   
@@ -29 +45 @@
 $t->diag('relationStringToAlias()');
   $t->is(
-    $q->relationStringToAlias('UllUser->UllLocation->Translation'),
-    'x_ulluser_ulllocation_translation',
+    $q->relationStringToAlias('UllUser->UllUserStatus->Translation'),
+    'x_ulluser_ulluserstatus_translation',
     'Returns the correct string'
   );
   $t->is(
-    $q->relationStringToAlias('UllUser->UllLocation', false),
-    'ulluser_ulllocation',
+    $q->relationStringToAlias('UllUser->UllUserStatus', false),
+    'ulluser_ulluserstatus',
     'Returns the correct string with option prependBaseAlias = false'
   );    
@@ -47 +63 @@
 $t->diag('nestPlainArray()');
   $t->is(
-    $q->nestPlainArray(array('UllUser', 'UllLocation', 'Translation')),
-    array('UllUser' => array('UllLocation' => array('Translation' => array()))),
+    $q->nestPlainArray(array('UllUser', 'UllUserStatus', 'Translation')),
+    array('UllUser' => array('UllUserStatus' => array('Translation' => array()))),
     'Creates the correct nested array'
   );
@@ -54 +70 @@
   
 $t->diag('addRelations / getRelations()');
-  $q->addRelations(array('UllUser', 'UllLocation', 'Translation'));
+  $q->addRelations(array('UllUser', 'UllUserStatus', 'Translation'));
   $t->is(
     $q->getRelations(),
-    array('UllUser' => array('UllLocation' => array('Translation' => array()))),
+    array('UllUser' => array('UllUserStatus' => array('Translation' => array()))),
     'Returns the correct relations'
   );
@@ -68 +84 @@
       'UllUser' => 
         array(
-          'UllLocation' => 
+          'UllUserStatus' => 
             array(
               'Translation' => array()
@@ -87 +103 @@
       0 => 'TestTable x',
       1 => 'x.UllUser x_ulluser',
-      2 => 'x_ulluser.UllLocation x_ulluser_ulllocation',
-      3 => 'x_ulluser_ulllocation.Translation x_ulluser_ulllocation_translation',
+      2 => 'x_ulluser.UllUserStatus x_ulluser_ulluserstatus',
+      3 => 'x_ulluser_ulluserstatus.Translation x_ulluser_ulluserstatus_translation',
       4 => 'x_ulluser.UllJobTitle x_ulluser_ulljobtitle',
       5 => 'x.Creator x_creator',
@@ -107 +123 @@
   $t->is(
     $q->getSqlQuery(),
-    "SELECT t.id AS t__id, t.my_email AS t__my_email, t2.id AS t2__id, t2.lang AS t2__lang, t2.my_string AS t2__my_string, u.id AS u__id, u.username AS u__username, u2.id AS u2__id, u3.id AS u3__id, u3.lang AS u3__lang, u3.name AS u3__name, u4.id AS u4__id, u4.username AS u4__username, CONCAT('Write an email to ', t.my_email) AS t__0 FROM test_table t LEFT JOIN test_table_translation t2 ON t.id = t2.id LEFT JOIN ull_entity u ON t.ull_user_id = u.id AND u.type = 'user' LEFT JOIN ull_employment_type u2 ON u.ull_employment_type_id = u2.id LEFT JOIN ull_employment_type_translation u3 ON u2.id = u3.id LEFT JOIN ull_entity u4 ON t.creator_user_id = u4.id AND u4.type = 'user' WHERE (t2.lang = ? AND u3.lang = ?)",
+    "SELECT t.id AS t__id, t.my_email AS t__my_email, t2.id AS t2__id, t2.lang AS t2__lang, t2.my_string AS t2__my_string, u.id AS u__id, u.username AS u__username, u.type AS u__type, u2.id AS u2__id, u3.id AS u3__id, u3.lang AS u3__lang, u3.name AS u3__name, u4.id AS u4__id, u4.username AS u4__username, u4.type AS u4__type, CONCAT('Write an email to ', t.my_email) AS t__0 FROM test_table t LEFT JOIN test_table_translation t2 ON t.id = t2.id LEFT JOIN ull_entity u ON t.ull_user_id = u.id AND u.type = 'user' LEFT JOIN ull_employment_type u2 ON u.ull_employment_type_id = u2.id LEFT JOIN ull_employment_type_translation u3 ON u2.id = u3.id LEFT JOIN ull_entity u4 ON t.creator_user_id = u4.id AND u4.type = 'user' WHERE (t2.lang = ? AND u3.lang = ?)",
     'Returns the correct query'
   );
@@ -116 +132 @@
   $t->is(
     $q->getSqlQuery(),
-    "SELECT t.id AS t__id, t.my_email AS t__my_email, t2.id AS t2__id, t2.lang AS t2__lang, t2.my_string AS t2__my_string, u.id AS u__id, u.username AS u__username, u2.id AS u2__id, u3.id AS u3__id, u3.lang AS u3__lang, u3.name AS u3__name, u4.id AS u4__id, u4.username AS u4__username, CONCAT('Write an email to ', t.my_email) AS t__0 FROM test_table t LEFT JOIN test_table_translation t2 ON t.id = t2.id LEFT JOIN ull_entity u ON t.ull_user_id = u.id AND u.type = 'user' LEFT JOIN ull_employment_type u2 ON u.ull_employment_type_id = u2.id LEFT JOIN ull_employment_type_translation u3 ON u2.id = u3.id LEFT JOIN ull_entity u4 ON t.creator_user_id = u4.id AND u4.type = 'user' LEFT JOIN ull_location u5 ON u.ull_location_id = u5.id WHERE (t2.lang = ? AND u3.lang = ? AND t2.lang = ? AND u3.lang = ?) ORDER BY t2.my_string asc, u3.name desc, u5.name asc",
-    'Returns the correct query'
-  );
+    "SELECT t.id AS t__id, t.my_email AS t__my_email, t2.id AS t2__id, t2.lang AS t2__lang, t2.my_string AS t2__my_string, u.id AS u__id, u.username AS u__username, u.type AS u__type, u2.id AS u2__id, u3.id AS u3__id, u3.lang AS u3__lang, u3.name AS u3__name, u4.id AS u4__id, u4.username AS u4__username, u4.type AS u4__type, CONCAT('Write an email to ', t.my_email) AS t__0 FROM test_table t LEFT JOIN test_table_translation t2 ON t.id = t2.id LEFT JOIN ull_entity u ON t.ull_user_id = u.id AND u.type = 'user' LEFT JOIN ull_employment_type u2 ON u.ull_employment_type_id = u2.id LEFT JOIN ull_employment_type_translation u3 ON u2.id = u3.id LEFT JOIN ull_entity u4 ON t.creator_user_id = u4.id AND u4.type = 'user' LEFT JOIN ull_location u5 ON u.ull_location_id = u5.id WHERE (t2.lang = ? AND u3.lang = ? AND t2.lang = ? AND u3.lang = ?) ORDER BY t2.my_string asc, u3.name desc, u5.name asc",
+    'Returns the correct query'
+  );
+
   
 $t->diag('addOrderByPrefix()');
@@ -124 +141 @@
   $t->is(
     $q->getSqlQuery(),
-    "SELECT t.id AS t__id, t.my_email AS t__my_email, t2.id AS t2__id, t2.lang AS t2__lang, t2.my_string AS t2__my_string, u.id AS u__id, u.username AS u__username, u2.id AS u2__id, u3.id AS u3__id, u3.lang AS u3__lang, u3.name AS u3__name, u4.id AS u4__id, u4.username AS u4__username, CONCAT('Write an email to ', t.my_email) AS t__0 FROM test_table t LEFT JOIN test_table_translation t2 ON t.id = t2.id LEFT JOIN ull_entity u ON t.ull_user_id = u.id AND u.type = 'user' LEFT JOIN ull_employment_type u2 ON u.ull_employment_type_id = u2.id LEFT JOIN ull_employment_type_translation u3 ON u2.id = u3.id LEFT JOIN ull_entity u4 ON t.creator_user_id = u4.id AND u4.type = 'user' LEFT JOIN ull_location u5 ON u.ull_location_id = u5.id WHERE (t2.lang = ? AND u3.lang = ? AND t2.lang = ? AND u3.lang = ?) ORDER BY t.my_email asc, u5.short_name asc, t2.my_string asc, u3.name desc, u5.name asc",
-    'Returns the correct query'
-  );
+    "SELECT t.id AS t__id, t.my_email AS t__my_email, t2.id AS t2__id, t2.lang AS t2__lang, t2.my_string AS t2__my_string, u.id AS u__id, u.username AS u__username, u.type AS u__type, u2.id AS u2__id, u3.id AS u3__id, u3.lang AS u3__lang, u3.name AS u3__name, u4.id AS u4__id, u4.username AS u4__username, u4.type AS u4__type, CONCAT('Write an email to ', t.my_email) AS t__0 FROM test_table t LEFT JOIN test_table_translation t2 ON t.id = t2.id LEFT JOIN ull_entity u ON t.ull_user_id = u.id AND u.type = 'user' LEFT JOIN ull_employment_type u2 ON u.ull_employment_type_id = u2.id LEFT JOIN ull_employment_type_translation u3 ON u2.id = u3.id LEFT JOIN ull_entity u4 ON t.creator_user_id = u4.id AND u4.type = 'user' LEFT JOIN ull_location u5 ON u.ull_location_id = u5.id WHERE (t2.lang = ? AND u3.lang = ? AND t2.lang = ? AND u3.lang = ?) ORDER BY t.my_email asc, u5.short_name asc, t2.my_string asc, u3.name desc, u5.name asc",
+    'Returns the correct query'
+  );
+
   
 $t->diag('addWhere()');
@@ -133 +151 @@
   $t->is(
     $q->getSqlQuery(),
-    "SELECT t.id AS t__id, t.my_email AS t__my_email, t2.id AS t2__id, t2.lang AS t2__lang, t2.my_string AS t2__my_string, u.id AS u__id, u.username AS u__username, u2.id AS u2__id, u3.id AS u3__id, u3.lang AS u3__lang, u3.name AS u3__name, u4.id AS u4__id, u4.username AS u4__username, CONCAT('Write an email to ', t.my_email) AS t__0 FROM test_table t LEFT JOIN test_table_translation t2 ON t.id = t2.id LEFT JOIN ull_entity u ON t.ull_user_id = u.id AND u.type = 'user' LEFT JOIN ull_employment_type u2 ON u.ull_employment_type_id = u2.id LEFT JOIN ull_employment_type_translation u3 ON u2.id = u3.id LEFT JOIN ull_entity u4 ON t.creator_user_id = u4.id AND u4.type = 'user' LEFT JOIN ull_location u5 ON u.ull_location_id = u5.id WHERE (t2.lang = ? AND u3.lang = ? AND t2.lang = ? AND u3.lang = ? AND t.my_email = ? AND u3.lang = ? AND u3.name = ?) ORDER BY t.my_email asc, u5.short_name asc, t2.my_string asc, u3.name desc, u5.name asc",
+    "SELECT t.id AS t__id, t.my_email AS t__my_email, t2.id AS t2__id, t2.lang AS t2__lang, t2.my_string AS t2__my_string, u.id AS u__id, u.username AS u__username, u.type AS u__type, u2.id AS u2__id, u3.id AS u3__id, u3.lang AS u3__lang, u3.name AS u3__name, u4.id AS u4__id, u4.username AS u4__username, u4.type AS u4__type, CONCAT('Write an email to ', t.my_email) AS t__0 FROM test_table t LEFT JOIN test_table_translation t2 ON t.id = t2.id LEFT JOIN ull_entity u ON t.ull_user_id = u.id AND u.type = 'user' LEFT JOIN ull_employment_type u2 ON u.ull_employment_type_id = u2.id LEFT JOIN ull_employment_type_translation u3 ON u2.id = u3.id LEFT JOIN ull_entity u4 ON t.creator_user_id = u4.id AND u4.type = 'user' LEFT JOIN ull_location u5 ON u.ull_location_id = u5.id WHERE (t2.lang = ? AND u3.lang = ? AND t2.lang = ? AND u3.lang = ? AND t.my_email = ? AND u3.lang = ? AND u3.name = ?) ORDER BY t.my_email asc, u5.short_name asc, t2.my_string asc, u3.name desc, u5.name asc",
     'Returns the correct query'
   );
@@ -142 +160 @@
   $t->is(
     $q->getSqlQuery(),
-    "SELECT t.id AS t__id, t.my_email AS t__my_email, t2.id AS t2__id, t2.lang AS t2__lang, t2.my_string AS t2__my_string, u.id AS u__id, u.username AS u__username, u2.id AS u2__id, u3.id AS u3__id, u3.lang AS u3__lang, u3.name AS u3__name, u4.id AS u4__id, u4.username AS u4__username, CONCAT('Write an email to ', t.my_email) AS t__0 FROM test_table t LEFT JOIN test_table_translation t2 ON t.id = t2.id LEFT JOIN ull_entity u ON t.ull_user_id = u.id AND u.type = 'user' LEFT JOIN ull_employment_type u2 ON u.ull_employment_type_id = u2.id LEFT JOIN ull_employment_type_translation u3 ON u2.id = u3.id LEFT JOIN ull_entity u4 ON t.creator_user_id = u4.id AND u4.type = 'user' LEFT JOIN ull_location u5 ON u.ull_location_id = u5.id WHERE (t2.lang = ? AND u3.lang = ? AND t2.lang = ? AND u3.lang = ? AND t.my_email = ? AND u3.lang = ? AND u3.name = ? OR t.my_email = ? AND u3.lang = ? OR u3.name = ?) ORDER BY t.my_email asc, u5.short_name asc, t2.my_string asc, u3.name desc, u5.name asc",
-    'Returns the correct query'
-  );
+    "SELECT t.id AS t__id, t.my_email AS t__my_email, t2.id AS t2__id, t2.lang AS t2__lang, t2.my_string AS t2__my_string, u.id AS u__id, u.username AS u__username, u.type AS u__type, u2.id AS u2__id, u3.id AS u3__id, u3.lang AS u3__lang, u3.name AS u3__name, u4.id AS u4__id, u4.username AS u4__username, u4.type AS u4__type, CONCAT('Write an email to ', t.my_email) AS t__0 FROM test_table t LEFT JOIN test_table_translation t2 ON t.id = t2.id LEFT JOIN ull_entity u ON t.ull_user_id = u.id AND u.type = 'user' LEFT JOIN ull_employment_type u2 ON u.ull_employment_type_id = u2.id LEFT JOIN ull_employment_type_translation u3 ON u2.id = u3.id LEFT JOIN ull_entity u4 ON t.creator_user_id = u4.id AND u4.type = 'user' LEFT JOIN ull_location u5 ON u.ull_location_id = u5.id WHERE (t2.lang = ? AND u3.lang = ? AND t2.lang = ? AND u3.lang = ? AND t.my_email = ? AND u3.lang = ? AND u3.name = ? OR t.my_email = ? AND u3.lang = ? OR u3.name = ?) ORDER BY t.my_email asc, u5.short_name asc, t2.my_string asc, u3.name desc, u5.name asc",
+    'Returns the correct query'
+  );
+
 
   $t->isa_ok($q->execute(), 'Doctrine_Collection', 'Successfully executes the query');
@@ -155 +174 @@
   $t->is(
     $q->getSqlQuery(),
-    "SELECT t.id AS t__id, u.id AS u__id, u2.id AS u2__id FROM test_table t LEFT JOIN test_table_translation t2 ON t.id = t2.id LEFT JOIN ull_entity u ON t.ull_user_id = u.id AND u.type = 'user' LEFT JOIN ull_employment_type u2 ON u.ull_employment_type_id = u2.id LEFT JOIN ull_employment_type_translation u3 ON u2.id = u3.id WHERE (t2.lang = ? AND u3.lang = ? AND (t.my_email LIKE ? OR t2.my_string LIKE ? OR u.username LIKE ? OR u3.name LIKE ?))",
-    'Returns the correct query'
-  );
+    "SELECT t.id AS t__id, u.id AS u__id, u.type AS u__type, u2.id AS u2__id FROM test_table t LEFT JOIN test_table_translation t2 ON t.id = t2.id LEFT JOIN ull_entity u ON t.ull_user_id = u.id AND u.type = 'user' LEFT JOIN ull_employment_type u2 ON u.ull_employment_type_id = u2.id LEFT JOIN ull_employment_type_translation u3 ON u2.id = u3.id WHERE (t2.lang = ? AND u3.lang = ? AND (t.my_email LIKE ? OR t2.my_string LIKE ? OR u.username LIKE ? OR u3.name LIKE ?))",
+    'Returns the correct query'
+  );
+  
   
   $t->isa_ok($q->execute(), 'Doctrine_Collection', 'Successfully executes the query');
@@ -167 +187 @@
 //var_dump($q->execute()->toArray(false));
 
+$t->diag('count()');
+  $q = new ullQuery('TestTable');
+  $t->is($q->count(), 2, 'Returns the correct number of results');
+
+  
+$t->diag('addGroupBy()');
+  $q = new ullQuery('UllUserStatus');
+  $q->addSelect('COUNT(*)');
+  $q->addGroupBy('is_absent');
+  
+  $t->is(
+    $q->getSqlQuery(),
+    "SELECT COUNT(*) AS u__0 FROM ull_user_status u GROUP BY u.is_absent",
+    'Returns the correct query'
+  );
+  
 
 $t->diag('Doctrine 1.0 bug resolved with UllUser and SELECT on >= 2 relations');  
@@ -179 +215 @@
   $q->execute();
   
-$t->diag('count()');
-  $q = new ullQuery('TestTable');
-  $t->is($q->count(), 2, 'Returns the correct number of results');
+