Improved db_pager::set_sql to use array as well as query string.

[fa-stable.git] / includes / db_pager.inc

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index 8684281dc0406fdfa56e6fcfd08fb86b362b8210..f3f0050db32da69dffc2296200f52a039b428ee6 100644 (file)
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -69,33 +69,47 @@ class db_pager {
        }
        //
        //      Parse base sql select query.
-       //
+       //      or use an associative array.
+       //  Usefull is the query can't be split correctly (using subquery for example).
+       //  The associative array shouldn't contain the keyword itself.
+       //  ex :
+       //  array('select' => 'SUM(quantity)', 'from' => TB_PREF."stock_moves", 'group' => 'location')
        function set_sql($sql)
        {
                if ($sql != $this->sql) {
                    $this->sql = $sql;
                    $this->ready = false;
-               $parts = preg_split('/\sORDER\s*BY\s/si', $sql, 2);
-                       if(count($parts) == 2) {
-                               $sql = $parts[0];
-                               $this->order = $parts[1];
-                       }
-               $parts = preg_split('/\sGROUP\s*BY\s/si', $sql, 2);
-                       if(count($parts) == 2) {
-                               $sql = $parts[0];
-                               $this->group = $parts[1];
-                       }
-               $parts = preg_split('/\sWHERE\s/si', $sql, 2);
-                       if(count($parts) == 2) {
-                               $sql = $parts[0];
-                               $this->where = $parts[1];
-                       }
-               $parts = preg_split('/\sFROM\s/si', $sql, 2);
-                       if(count($parts) == 2) {
-                               $sql = $parts[0];
-                               $this->from = $parts[1];
+
+                               if(is_array($sql)) {
+                                       foreach(explode(' ', 'select from where group order') as $section) {
+                                               $this->$section = @$sql[$section];
+                                       }
+                                       $this->select = "SELECT ".$this->select;
+                               }
+                               else {
+                                       // parse the query
+                                               $parts = preg_split('/\sORDER\s*BY\s/si', $sql, 2);
+                                       if(count($parts) == 2) {
+                                               $sql = $parts[0];
+                                               $this->order = $parts[1];
+                                       }
+                                               $parts = preg_split('/\sGROUP\s*BY\s/si', $sql, 2);
+                                       if(count($parts) == 2) {
+                                               $sql = $parts[0];
+                                               $this->group = $parts[1];
+                                       }
+                                               $parts = preg_split('/\sWHERE\s/si', $sql, 2);
+                                       if(count($parts) == 2) {
+                                               $sql = $parts[0];
+                                               $this->where = $parts[1];
+                                       }
+                                               $parts = preg_split('/\sFROM\s/si', $sql, 2);
+                                       if(count($parts) == 2) {
+                                               $sql = $parts[0];
+                                               $this->from = $parts[1];
+                                       }
+                                       $this->select = $sql;
                        }
-                       $this->select = $sql;
                }
        }
        //