Improvements for query classes.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9102 201d5d3c-b55e-5fd7-737f-ddc643e51545

classes/db/DB.class.php

@@ -582,7 +582,7 @@
 		}
 
     	function getUpdateSql($query, $with_values = true){
-			$columnsList = $query->getSelectString($with_values);
+			$columnsList = $query->getUpdateString($with_values);
 			if($columnsList == '') return new Object(-1, "Invalid query");
 
 			$tableName = $query->getFirstTableName();

classes/db/queryparts/Query.class.php

@@ -48,8 +48,18 @@
 		}
 
                 function setColumnList($columnList){
-                    if(count($columnList) > 0)
                         $this->columnList = $columnList;
+                        if(count($this->columnList) > 0) {
+                            $selectColumns = array();
+                            $dbParser = XmlQueryParser::getDBParser();
+
+                            foreach($this->columnList as $columnName){
+                                    $columnName = $dbParser->escapeColumn($columnName);
+                                    $selectColumns[] = new SelectExpression($columnName);
+                            }
+                            unset($this->columns);
+                            $this->columns = $selectColumns;
+                        }
                 }
 
 		function setColumns($columns){
@@ -76,10 +86,13 @@
 		}
 
 		function setConditions($conditions){
-			if(!isset($conditions) || count($conditions) === 0) return;
+                    $this->conditions = array();
-			if(!is_array($conditions)) $conditions = array($conditions);
+                    if(!isset($conditions) || count($conditions) === 0) return;
+		    if(!is_array($conditions)) $conditions = array($conditions);
 
-			$this->conditions = $conditions;
+                    foreach($conditions as $conditionGroup){
+                        if($conditionGroup->show()) $this->conditions[] = $conditionGroup;
+                    }
 		}
 
 		function setGroups($groups){
@@ -139,34 +152,23 @@
 		}
 
 		function getSelectString($with_values = true){
-                        if(isset($this->columnList)){
+                    foreach($this->columns as $column){
-                            $selectColumns = array();
+                            if($column->show())
-                            $dbParser = XmlQueryParser::getDBParser();
+                                    if($column->isSubquery()){
-
+                                            $select[] = $column->toString($with_values) . ' as '. $column->getAlias();
-                            foreach($this->columnList as $columnName){
+                                    }
-                                    $columnName = $dbParser->escapeColumn($columnName);
+                                    else
-                                    $selectColumns[] = new SelectExpression($columnName);
+                                            $select[] = $column->getExpression($with_values);
-                            }
+                    }
-                        }
+                    return trim(implode($select, ', '));
-                        else
-                            $selectColumns = $this->columns;
-
-			$select = '';
-			foreach($selectColumns as $column){
-				if($column->show())
-					if(is_a($column, 'Subquery')){
-						$select .= $column->toString($with_values) . ' as '. $column->getAlias() .', ';
-					}
-					else
-						$select .= $column->getExpression($with_values) . ', ';
-			}
-			if(trim($select) == '') return '';
-			$select = substr($select, 0, -2);
-			return $select;
 		}
 
 		function getUpdateString($with_values = true){
-			return $this->getSelectString($with_values);
+                    foreach($this->columns as $column){
+                        if($column->show())
+                           $update[] = $column->getExpression($with_values);
+                    }
+                    return trim(implode($update, ', '));
 		}
 
 		function getInsertString($with_values = true){
@@ -209,21 +211,16 @@
 
 		function getWhereString($with_values = true){
 			$where = '';
-			if(count($this->conditions) > 0){
+                        $condition_count = 0;
-                                $condition_count = 0;
+                        foreach($this->conditions as $conditionGroup){
-				foreach($this->conditions as $conditionGroup){
+                                if($condition_count === 0){
-                                        $condition_string = $conditionGroup->toString($with_values);
+                                    $conditionGroup->setPipe("");
-                                        if($condition_string !== '') $condition_count++;
+                                }
-                                        if($condition_count === 1){
+                                $condition_string = $conditionGroup->toString($with_values);
-                                            $conditionGroup->setPipe("");
+                                $where .= $condition_string;
-                                            $condition_string = $conditionGroup->toString($with_values);
+                                $condition_count++;
-                                        }
+                        }
-					$where .= $condition_string;
+                        return trim($where);
-				}
-				if(trim($where) == '') return '';
-
-			}
-			return $where;
 		}
 
 		function getGroupByString(){

classes/db/queryparts/Subquery.class.php

@@ -1,15 +1,15 @@
-<?php 
+<?php
 
 	class Subquery extends Query {
 		var $alias;
 		var $join_type;
-                
+
 		function Subquery($alias, $columns, $tables, $conditions, $groups, $orderby, $limit, $join_type = null){
 			$this->alias = $alias;
-			
+
 			$this->queryID = null;
 			$this->action = "select";
-			
+
 			$this->columns = $columns;
 			$this->tables = $tables;
 			$this->conditions = $conditions;
@@ -18,20 +18,24 @@
 			$this->limit = $limit;
                         $this->join_type = $join_type;
 		}
-		
+
 		function getAlias(){
 			return $this->alias;
 		}
-                
+
                 function isJoinTable(){
                     if($this->join_type) return true;
                     return false;
                 }
-                
+
                 function toString($with_values = true){
                     $oDB = &DB::getInstance();
-                    return '(' .$oDB->getSelectSql($this, $with_values) . ')'; 
+                    return '(' .$oDB->getSelectSql($this, $with_values) . ')';
-                            
+
+                }
+
+                function isSubquery(){
+                    return true;
                 }
 	}
 

classes/db/queryparts/condition/ConditionGroup.class.php

@@ -4,20 +4,32 @@
 		var $conditions;
 		var $pipe;
 
+                var $_group;
+                var $_show;
+
 		function ConditionGroup($conditions, $pipe = "") {
                         $this->conditions = array();
                         foreach($conditions as $condition){
                             if($condition->show())
                                     $this->conditions[] = $condition;
                         }
+                        if(count($this->conditions) === 0) $this->_show = false;
+                        else $this->_show = true;
+
 			$this->pipe = $pipe;
 		}
 
+                function show(){
+                    return $this->_show;
+                }
+
                 function setPipe($pipe){
+                    if($this->pipe !== $pipe) $this->_group = null;
                     $this->pipe = $pipe;
                 }
 
 		function toString($with_value = true){
+                    if(!isset($this->_group)){
 			$cond_indx = 0;
                         $group = '';
 
@@ -26,23 +38,23 @@
                             $group .= $condition->toString($with_value) . ' ';
                             $cond_indx++;
 			}
-			// If the group has no conditions in it, return ''
-			if($cond_indx === 0) return '';
 
-			if($this->pipe !== ""){
+			if($this->pipe !== "" && trim($group) !== ''){
                             $group = $this->pipe . ' (' . $group . ')';
                         }
 
-			return $group;
+                        $this->_group = $group;
+                    }
+                    return $this->_group;
 		}
 
 		function getArguments(){
-			$args = array();
+                    $args = array();
-			foreach($this->conditions as $condition){
+                    foreach($this->conditions as $condition){
-                            $arg = $condition->getArgument();
+                        $arg = $condition->getArgument();
-                            if($arg) $args[] = $arg;
+                        if($arg) $args[] = $arg;
-			}
+                    }
-			return $args;
+                    return $args;
 		}
 	}
 ?>

classes/db/queryparts/expression/SelectExpression.class.php

@@ -1,11 +1,11 @@
-<?php 
+<?php
 
 	/**
 	 * @class SelectExpression
 	 * @author Arnia Software
 	 * @brief Represents an expresion that appears in the select clause
-	 * 
+	 *
-	 * @remarks  
+	 * @remarks
 	 * 		$column_name can be:
 	 *  		- a table column name
 	 *  		- an sql function - like count(*)
@@ -15,22 +15,26 @@
 
 	class SelectExpression extends Expression {
 		var $column_alias;
-		
+
 		function SelectExpression($column_name, $alias = NULL){
 			parent::Expression($column_name);
 			$this->column_alias = $alias;
 		}
-		
+
 		function getExpression() {
 			return sprintf("%s%s", $this->column_name, $this->column_alias ? " as ".$this->column_alias : "");
 		}
-		
+
 		function show() {
 			return true;
 		}
-		
+
 		function getArgument(){
 			return null;
 		}
+
+                function isSubquery(){
+                    return false;
+                }
 	}
 ?>

classes/xml/xmlquery/argument/ConditionArgument.class.php

@@ -12,11 +12,6 @@
                         }
 			parent::Argument($name, $value);
 			$this->operation = $operation;
-
-			if($this->type !== 'date'){
-				$dbParser = XmlQueryParser::getDBParser();
-				$this->value = $dbParser->escapeStringValue($this->value);
-			}
 		}
 
 		function createConditionValue(){