Ticket #579: 579-jDaoConditions-group.diff

lib/jelix/dao/jDaoConditions.class.php

@@ -64 +64 @@
-    public $order = array ();
-
-    /**
+    * the groups we wants the list to be
+    */
+    public $group = array ();
+    
+    /**
-    * the condition we actually are browsing
-    */
-    private $_currentCondition;
@@ -86 +91 @@
-    }
-
-    /**
+     * add a group clause
+     *
+     * @param string $field_id  the property name used to group results
+     */
+    function addItemGroup($field_id) {
+        $this->group[] = $field_id;
+    }
+    
+    /**
-    * says if there are no conditions nor order
-    * @return boolean  false if there isn't condition
-    */

lib/jelix/dao/jDaoFactoryBase.class.php

@@ -242 +242 @@
-            $query .= ($this->_whereClause !='' ? ' AND ' : ' WHERE ');
-            $query .= $this->_createConditionsClause($searchcond);
-        }
+        $query.= $this->_createGroupClause($searchcond);
-        $query.= $this->_createOrderClause($searchcond);
-
-        if($limitCount != 0){
@@ -342 +343 @@
-    }
-
-    /**
+     * @internal
+     */
+    final protected function _createGroupClause($daocond) {
+        $group = array ();
+        $props = $this->getProperties();
+        foreach ($daocond->group as $name) {
+            if (isset($props[$name])) {
+                $group[] = $name;
+            }
+        }
+        
+        if (count ($group)) {
+            return ' GROUP BY '.implode(', ', $group);
+        }
+        return '';
+    }
+    
+    /**
-     * @internal it don't support isExpr property of a condition because of security issue (SQL injection)
-     * because the value could be provided by a form, it is escaped in any case
-     */