From e8a396f9731dda3f3febdcc3ec258add1dbe972b Mon Sep 17 00:00:00 2001
From: Maxime Bourget <bmx007@gmail.com>
Date: Sun, 23 Jun 2013 20:58:12 +0100
Subject: [PATCH] Improved db_pager::set_sql to use array as well as query
 string.

---
 includes/db_pager.inc | 56 +++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index 8684281d..f3f0050d 100644
--- 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;
 		}
 	}
 	//
-- 
2.30.2