Merge 1.5.2.3 (~r10623)

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

classes/db/queryparts/Query.class.php

@@ -25,7 +25,8 @@
 			, $conditions = null
 			, $groups = null
 			, $orderby = null
-			, $limit = null){
+			, $limit = null
+			, $priority = null){
 			$this->queryID = $queryID;
 			$this->action = $action;
 			$this->priority = $priority;
@@ -313,8 +314,8 @@
 				if(count($this->columns) > 0){ // The if is for delete statements, all others must have columns
 					foreach($this->columns as $column){
 						if($column->show()){
-							$arg = $column->getArgument();
-							if($arg) $this->arguments[] = $arg;
+							$args = $column->getArguments();
+							if($args) $this->arguments = array_merge($this->arguments, $args);
 						}
 					}
 				}
@@ -339,4 +340,4 @@
 
 
 
-?>
+?>

classes/db/queryparts/Subquery.class.php

@@ -30,6 +30,7 @@
 
                 function toString($with_values = true){
                     $oDB = &DB::getInstance();
+
                     return '(' .$oDB->getSelectSql($this, $with_values) . ')';
 
                 }
@@ -38,5 +39,3 @@
                     return true;
                 }
 	}
-
-?>

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

@@ -31,6 +31,14 @@
 		function getArgument(){
 			return $this->argument;
 		}
+
+		function getArguments()
+		{
+			if ($this->argument)
+			    return array($this->argument);
+			else
+			    return array();
+		}
 	}
 
-?>
+?>

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

@@ -33,8 +33,13 @@
 			return null;
 		}
 
+		function getArguments()
+		{
+		    return array();
+		}
+
                 function isSubquery(){
                     return false;
                 }
 	}
-?>
+?>

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

@@ -16,5 +16,10 @@
 		function getArgument(){
 			return null;
 		}
+
+		function getArguments(){
+		    // StarExpression has no arguments
+			return array();
+		}
 	}
-?>
+?>

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

@@ -52,7 +52,15 @@
 		function getArgument(){
 			return $this->argument;
 		}
+
+		function getArguments()
+		{
+		    if ($this->argument)
+			return array($this->argument);
+		    else
+			return array();
+		}
 	}
 
 
-?>
+?>

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

@@ -35,6 +35,10 @@
 		function getArgument(){
 			return null;
 		}
+		
+		function getArguments(){
+			return array();
+		}
 	}