Changeset 1015

Timestamp:

07/11/08 23:53:07 (2 months ago)

Author:

bastnic

Message:

fixed #579 : add clause GROUP BY in jDao*, p=Thomas

Files:

• trunk/lib/jelix/CREDITS (modified) (1 diff)
• trunk/lib/jelix/dao/jDaoConditions.class.php (modified) (3 diffs)
• trunk/lib/jelix/dao/jDaoFactoryBase.class.php (modified) (3 diffs)

trunk/lib/jelix/CREDITS

@@ -166 +166 @@
- - fixed bugs in jDao (#576, #643)
- - jDaoFactoryBase::countBy : allowing to do count on distinct fields (#580)
+ - JDaoConditions::addItemGroup : add clause group by (#579)
-
-Christian Tritten

trunk/lib/jelix/dao/jDaoConditions.class.php

@@ -6 +6 @@
-* @contributor Laurent Jouanneau
-* @copyright  2001-2005 CopixTeam, 2005-2006 Laurent Jouanneau
+* @copyright  2008 Thomas
-* This classes was get originally from the Copix project (CopixDAOSearchConditions, Copix 2.3dev20050901, http://www.copix.org)
-* Some lines of code are copyrighted 2001-2005 CopixTeam (LGPL licence).
@@ -65 +66 @@
-
-    /**
+    * the groups we wants the list to be
+    */
+    public $group = array ();
+    
+    /**
-    * the condition we actually are browsing
-    */
@@ -86 +92 @@
-    }
-
+    /**
+     * 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

trunk/lib/jelix/dao/jDaoFactoryBase.class.php

@@ -9 +9 @@
- * @copyright   2007 Loic Mathaud
- * @copyright   2007 Julien Issler
+ * @copyright   2008 Thomas
- * @link        http://www.jelix.org
- * @licence     http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
@@ -243 +244 @@
-            $query .= $this->_createConditionsClause($searchcond);
-        }
+        $query.= $this->_createGroupClause($searchcond);
-        $query.= $this->_createOrderClause($searchcond);
-
@@ -349 +351 @@
-    }
-
+    /**
+     * @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)