issue 2662 db class coding convention

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

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

@@ -1,46 +1,52 @@
 <?php 
+/**
+ * ClickCountExpression
+ * @author Arnia Software
+ * @package /classes/db/queryparts/expression
+ * @version 0.1
+ */
+class ClickCountExpression extends SelectExpression
+{
 	/**
-	 * ClickCountExpression
-	 * @author Arnia Software
-	 * @package /classes/db/queryparts/expression
-	 * @version 0.1
+	 * click count
+	 * @var bool
 	 */
-	class ClickCountExpression extends SelectExpression {
-		/**
-		 * click count
-		 * @var bool
-		 */
-		var $click_count;
-	
-		/**
-		 * constructor
-		 * @param string $column_name
-		 * @param string $alias
-		 * @param bool $click_count
-		 * @return void
-		 */
-		function ClickCountExpression($column_name, $alias = NULL, $click_count = false){
-			parent::SelectExpression($column_name, $alias);
-			
-			if(!is_bool($click_count)){
-				error_log("Click_count value for $column_name was not boolean", 0);
-				$this->click_count = false;
-				return;
-			}
-			$this->click_count = $click_count;
-		}
-		
-		function show() {
-			return $this->click_count;
-		}
-		
-		/**
-		 * Return column expression, ex) column = column + 1
-		 * @return string
-		 */
-		function getExpression(){
-			return "$this->column_name = $this->column_name + 1";
+	var $click_count;
+
+	/**
+	 * constructor
+	 * @param string $column_name
+	 * @param string $alias
+	 * @param bool $click_count
+	 * @return void
+	 */
+	function ClickCountExpression($column_name, $alias = NULL, $click_count = false)
+	{
+		parent::SelectExpression($column_name, $alias);
+
+		if(!is_bool($click_count))
+		{
+			error_log("Click_count value for $column_name was not boolean", 0);
+			$this->click_count = false;
+			return;
 		}
+		$this->click_count = $click_count;
 	}
 
-?>
+	function show()
+	{
+		return $this->click_count;
+	}
+
+	/**
+	 * Return column expression, ex) column = column + 1
+	 * @return string
+	 */
+	function getExpression()
+	{
+		return "$this->column_name = $this->column_name + 1";
+	}
+}
+
+/* End of file ClickCountExpression.class.php */
+/* Location: ./classes/db/queryparts/expression/ClickCountExpression.class.php */

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

@@ -1,50 +1,53 @@
 <?php 
+/**
+ * DeleteExpression
+ *
+ * @author Arnia Software
+ * @package /classes/db/queryparts/expression
+ * @version 0.1
+ * @todo Fix this class 
+ */
+class DeleteExpression extends Expression
+{
 	/**
-	 * DeleteExpression
-	 *
-	 * @author Arnia Software
-	 * @package /classes/db/queryparts/expression
-	 * @version 0.1
-	 * @todo Fix this class 
+	 * column value
+	 * @var mixed
 	 */
+	var $value;
 
-	class DeleteExpression extends Expression {
-		/**
-		 * column value
-		 * @var mixed
-		 */
-		var $value;
-		
-		/**
-		 * constructor
-		 * @param string $column_name
-		 * @param mixed $value
-		 * @return void
-		 */
-		function DeleteExpression($column_name, $value){
-			parent::Expression($column_name);
-			$this->value = $value;
-		}
-		
-		/**
-		 * Return column expression, ex) column = value
-		 * @return string
-		 */
-		function getExpression(){
-			return "$this->column_name = $this->value";
-		}
-		
-		function getValue(){
-			// TODO Escape value according to column type instead of variable type
-			if(!is_numeric($this->value)) return "'".$this->value."'";
-			return $this->value;
-		}
-		
-		function show(){
-			if(!$this->value) return false;
-			return true;
-		}
+	/**
+	 * constructor
+	 * @param string $column_name
+	 * @param mixed $value
+	 * @return void
+	 */
+	function DeleteExpression($column_name, $value)
+	{
+		parent::Expression($column_name);
+		$this->value = $value;
 	}
 
+	/**
+	 * Return column expression, ex) column = value
+	 * @return string
+	 */
+	function getExpression()
+	{
+		return "$this->column_name = $this->value";
+	}
 
-?>
+	function getValue()
+	{
+		// TODO Escape value according to column type instead of variable type
+		if(!is_numeric($this->value)) return "'".$this->value."'";
+		return $this->value;
+	}
+
+	function show()
+	{
+		if(!$this->value) return false;
+		return true;
+	}
+}
+/* End of file DeleteExpression.class.php */
+/* Location: ./classes/db/queryparts/expression/DeleteExpression.class.php */

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

@@ -1,44 +1,52 @@
 <?php
+/**
+ * Expression
+ * Represents an expression used in select/update/insert/delete statements
+ * 
+ *  Examples (expressions are inside double square brackets):
+ *  	select [[columnA]], [[columnB as aliasB]] from tableA
+ *  	update tableA set [[columnA = valueA]] where columnB = something
+ *
+ * @author Corina
+ * @package /classes/db/queryparts/expression
+ * @version 0.1
+ */
+class Expression
+{
 	/**
-	 * Expression
-	 * Represents an expression used in select/update/insert/delete statements
-	 * 
-	 *  Examples (expressions are inside double square brackets):
-	 *  	select [[columnA]], [[columnB as aliasB]] from tableA
-	 *  	update tableA set [[columnA = valueA]] where columnB = something
-	 *
-	 * @author Corina
-	 * @package /classes/db/queryparts/expression
-	 * @version 0.1
+	 * column name
+	 * @var string
 	 */
-	class Expression {
-		/**
-		 * column name
-		 * @var string
-		 */
-		var $column_name;
-		
-		/**
-		 * constructor
-		 * @param string $column_name
-		 * @return void
-		 */
-		function Expression($column_name){
-			$this->column_name = $column_name;
-		}
-		
-		function getColumnName(){
-			return $this->column_name;
-		}
-		
-		function show() {
-			return false;
-		}
-		
-		/**
-		 * Return column expression, ex) column as alias
-		 * @return string
-		 */
-		function getExpression() {
-		}
+	var $column_name;
+
+	/**
+	 * constructor
+	 * @param string $column_name
+	 * @return void
+	 */
+	function Expression($column_name)
+	{
+		$this->column_name = $column_name;
 	}
+
+	function getColumnName()
+	{
+		return $this->column_name;
+	}
+
+	function show()
+	{
+		return false;
+	}
+
+	/**
+	 * Return column expression, ex) column as alias
+	 * @return string
+	 */
+	function getExpression()
+	{
+	}
+}
+
+/* End of file Expression.class.php */
+/* Location: ./classes/db/queryparts/expression/Expression.class.php */

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

@@ -1,53 +1,58 @@
 <?php
+/**
+ * InsertExpression
+ *
+ * @author Arnia Software
+ * @package /classes/db/queryparts/expression
+ * @version 0.1
+ */
+class InsertExpression extends Expression
+{
 	/**
-	 * InsertExpression
-	 *
-	 * @author Arnia Software
-	 * @package /classes/db/queryparts/expression
-	 * @version 0.1
+	 * argument
+	 * @var object
 	 */
-	class InsertExpression extends Expression {
-		/**
-		 * argument
-		 * @var object
-		 */
-		var $argument;
+	var $argument;
 
-		/**
-		 * constructor
-		 * @param string $column_name
-		 * @param object $argument
-		 * @return void
-		 */
-		function InsertExpression($column_name, $argument){
-			parent::Expression($column_name);
-			$this->argument = $argument;
-		}
-
-		function getValue($with_values = true){
-			if($with_values)
-				return $this->argument->getValue();
-			return '?';
-		}
-
-		function show(){
-                    if(!$this->argument) return false;
-                    $value = $this->argument->getValue();
-                    if(!isset($value)) return false;
-                    return true;
-		}
-
-		function getArgument(){
-			return $this->argument;
-		}
-
-		function getArguments()
-		{
-			if ($this->argument)
-			    return array($this->argument);
-			else
-			    return array();
-		}
+	/**
+	 * constructor
+	 * @param string $column_name
+	 * @param object $argument
+	 * @return void
+	 */
+	function InsertExpression($column_name, $argument)
+	{
+		parent::Expression($column_name);
+		$this->argument = $argument;
 	}
 
-?>
+	function getValue($with_values = true)
+	{
+		if($with_values)
+			return $this->argument->getValue();
+		return '?';
+	}
+
+	function show()
+	{
+		if(!$this->argument) return false;
+		$value = $this->argument->getValue();
+		if(!isset($value)) return false;
+		return true;
+	}
+
+	function getArgument()
+	{
+		return $this->argument;
+	}
+
+	function getArguments()
+	{
+		if ($this->argument)
+			return array($this->argument);
+		else
+			return array();
+	}
+}
+/* End of file InsertExpression.class.php */
+/* Location: ./classes/db/queryparts/expression/InsertExpression.class.php */

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

@@ -1,59 +1,66 @@
 <?php
+/**
+ * SelectExpression
+ * Represents an expresion that appears in the select clause
+ *
+ * 		$column_name can be:
+ *  		- a table column name
+ *  		- an sql function - like count(*)
+ *	  		- an sql expression - substr(column_name, 1, 8) or score1 + score2
+ *		$column_name is already escaped
+ *
+ * @author Arnia Software
+ * @package /classes/db/queryparts/expression
+ * @version 0.1
+ */
+class SelectExpression extends Expression
+{
 	/**
-	 * SelectExpression
-	 * Represents an expresion that appears in the select clause
-	 *
-	 * 		$column_name can be:
-	 *  		- a table column name
-	 *  		- an sql function - like count(*)
-	 *	  		- an sql expression - substr(column_name, 1, 8) or score1 + score2
-	 *		$column_name is already escaped
-	 *
-	 * @author Arnia Software
-	 * @package /classes/db/queryparts/expression
-	 * @version 0.1
+	 * column alias name
+	 * @var string
 	 */
-	class SelectExpression extends Expression {
-		/**
-		 * column alias name
-		 * @var string
-		 */
-		var $column_alias;
+	var $column_alias;
 
-		/**
-		 * constructor
-		 * @param string $column_name
-		 * @param string $alias
-		 * @return void
-		 */
-		function SelectExpression($column_name, $alias = NULL){
-			parent::Expression($column_name);
-			$this->column_alias = $alias;
-		}
-
-		/**
-		 * Return column expression, ex) column as alias
-		 * @return string
-		 */
-		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 getArguments()
-		{
-		    return array();
-		}
-
-                function isSubquery(){
-                    return false;
-                }
+	/**
+	 * constructor
+	 * @param string $column_name
+	 * @param string $alias
+	 * @return void
+	 */
+	function SelectExpression($column_name, $alias = NULL)
+	{
+		parent::Expression($column_name);
+		$this->column_alias = $alias;
 	}
-?>
+
+	/**
+	 * Return column expression, ex) column as alias
+	 * @return string
+	 */
+	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 getArguments()
+	{
+		return array();
+	}
+
+	function isSubquery()
+	{
+		return false;
+	}
+}
+/* End of file SelectExpression.class.php */
+/* Location: ./classes/db/queryparts/expression/SelectExpression.class.php */

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

@@ -1,28 +1,33 @@
 <?php 
+/**
+ * StarExpression
+ * Represents the * in 'select * from ...' statements 
+ *
+ * @author Corina
+ * @package /classes/db/queryparts/expression
+ * @version 0.1
+ */
+class StarExpression extends SelectExpression
+{
 	/**
-	 * StarExpression
-	 * Represents the * in 'select * from ...' statements 
-	 *
-	 * @author Corina
-	 * @package /classes/db/queryparts/expression
-	 * @version 0.1
+	 * constructor, set the column to asterisk
+	 * @return void
 	 */
-	class StarExpression extends SelectExpression {
-		/**
-		 * constructor, set the column to asterisk
-		 * @return void
-		 */
-		function StarExpression(){
-			parent::SelectExpression("*");
-		}
-		
-		function getArgument(){
-			return null;
-		}
-
-		function getArguments(){
-		    // StarExpression has no arguments
-			return array();
-		}
+	function StarExpression()
+	{
+		parent::SelectExpression("*");
 	}
-?>
+
+	function getArgument()
+	{
+		return null;
+	}
+
+	function getArguments()
+	{
+		// StarExpression has no arguments
+		return array();
+	}
+}
+/* End of file StarExpression.class.php */
+/* Location: ./classes/db/queryparts/expression/StarExpression.class.php */

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

@@ -1,89 +1,97 @@
 <?php
+/**
+ * UpdateExpression
+ *
+ * @author Arnia Software
+ * @package /classes/db/queryparts/expression
+ * @version 0.1
+ */
+class UpdateExpression extends Expression
+{
 	/**
-	 * UpdateExpression
-	 *
-	 * @author Arnia Software
-	 * @package /classes/db/queryparts/expression
-	 * @version 0.1
+	 * argument
+	 * @var object
 	 */
-	class UpdateExpression extends Expression {
-		/**
-		 * argument
-		 * @var object
-		 */
-		var $argument;
+	var $argument;
 
-		/**
-		 * constructor
-		 * @param string $column_name
-		 * @param object $argument
-		 * @return void
-		 */
-		function UpdateExpression($column_name, $argument){
-			parent::Expression($column_name);
-			$this->argument = $argument;
-		}
-
-		/**
-		 * Return column expression, ex) column = value
-		 * @return string
-		 */
-		function getExpression($with_value = true){
-			if($with_value)
-				return $this->getExpressionWithValue();
-			return $this->getExpressionWithoutValue();
-		}
-
-		/**
-		 * Return column expression, ex) column = value
-		 * @return string
-		 */
-		function getExpressionWithValue(){
-			$value = $this->argument->getValue();
-                        $operation = $this->argument->getColumnOperation();
-                        if(isset($operation))
-                                return "$this->column_name = $this->column_name $operation $value";
-			return "$this->column_name = $value";
-		}
-
-		/**
-		 * Return column expression, ex) column = ?
-		 * Can use prepare statement
-		 * @return string
-		 */
-		function getExpressionWithoutValue(){
-                        $operation = $this->argument->getColumnOperation();
-                        if(isset($operation))
-                                return "$this->column_name = $this->column_name $operation ?";
-			return "$this->column_name = ?";
-		}
-
-		function getValue(){
-			// TODO Escape value according to column type instead of variable type
-			$value = $this->argument->getValue();
-			if(!is_numeric($value)) return "'".$value."'";
-			return $value;
-		}
-
-		function show(){
-                        if(!$this->argument) return false;
-                        $value = $this->argument->getValue();
-			if(!isset($value)) return false;
-			return true;
-		}
-
-		function getArgument(){
-			return $this->argument;
-		}
-
-		function getArguments()
-		{
-		    if ($this->argument)
-			return array($this->argument);
-		    else
-			return array();
-		}
+	/**
+	 * constructor
+	 * @param string $column_name
+	 * @param object $argument
+	 * @return void
+	 */
+	function UpdateExpression($column_name, $argument)
+	{
+		parent::Expression($column_name);
+		$this->argument = $argument;
 	}
 
+	/**
+	 * Return column expression, ex) column = value
+	 * @return string
+	 */
+	function getExpression($with_value = true)
+	{
+		if($with_value)
+			return $this->getExpressionWithValue();
+		return $this->getExpressionWithoutValue();
+	}
 
-?>
+	/**
+	 * Return column expression, ex) column = value
+	 * @return string
+	 */
+	function getExpressionWithValue()
+	{
+		$value = $this->argument->getValue();
+		$operation = $this->argument->getColumnOperation();
+		if(isset($operation))
+			return "$this->column_name = $this->column_name $operation $value";
+		return "$this->column_name = $value";
+	}
+
+	/**
+	 * Return column expression, ex) column = ?
+	 * Can use prepare statement
+	 * @return string
+	 */
+	function getExpressionWithoutValue()
+	{
+		$operation = $this->argument->getColumnOperation();
+		if(isset($operation))
+			return "$this->column_name = $this->column_name $operation ?";
+		return "$this->column_name = ?";
+	}
+
+	function getValue()
+	{
+		// TODO Escape value according to column type instead of variable type
+		$value = $this->argument->getValue();
+		if(!is_numeric($value)) return "'".$value."'";
+		return $value;
+	}
+
+	function show()
+	{
+		if(!$this->argument) return false;
+		$value = $this->argument->getValue();
+		if(!isset($value)) return false;
+		return true;
+	}
+
+	function getArgument()
+	{
+		return $this->argument;
+	}
+
+	function getArguments()
+	{
+		if ($this->argument)
+			return array($this->argument);
+		else
+			return array();
+	}
+}
+
+/* End of file UpdateExpression.class.php */
+/* Location: ./classes/db/queryparts/expression/UpdateExpression.class.php */

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

@@ -1,55 +1,61 @@
 <?php
+/**
+ * UpdateExpression
+ *
+ * @author Arnia Software
+ * @package /classes/db/queryparts/expression
+ * @version 0.1
+ */
+class UpdateExpressionWithoutArgument extends UpdateExpression
+{
 	/**
-	 * UpdateExpression
-	 *
-	 * @author Arnia Software
-	 * @package /classes/db/queryparts/expression
-	 * @version 0.1
+	 * argument
+	 * @var object
 	 */
-	class UpdateExpressionWithoutArgument extends UpdateExpression {
-		/**
-		 * argument
-		 * @var object
-		 */
-		var $argument;
+	var $argument;
 
-		/**
-		 * constructor
-		 * @param string $column_name
-		 * @param object $argument
-		 * @return void
-		 */
-		function UpdateExpressionWithoutArgument($column_name, $argument){
-			parent::Expression($column_name);
-			$this->argument = $argument;
-		}
-
-		function getExpression($with_value = true){
-                        return "$this->column_name = $this->argument";
-		}
-
-		function getValue(){
-			// TODO Escape value according to column type instead of variable type
-			$value = $this->argument;
-			if(!is_numeric($value)) return "'".$value."'";
-			return $value;
-		}
-
-		function show(){
-                        if(!$this->argument) return false;
-                        $value = $this->argument;
-			if(!isset($value)) return false;
-			return true;
-		}
-
-		function getArgument(){
-			return null;
-		}
-	
-		function getArguments(){
-			return array();
-		}
+	/**
+	 * constructor
+	 * @param string $column_name
+	 * @param object $argument
+	 * @return void
+	 */
+	function UpdateExpressionWithoutArgument($column_name, $argument)
+	{
+		parent::Expression($column_name);
+		$this->argument = $argument;
 	}
 
+	function getExpression($with_value = true)
+	{
+		return "$this->column_name = $this->argument";
+	}
 
-?>
+	function getValue()
+	{
+		// TODO Escape value according to column type instead of variable type
+		$value = $this->argument;
+		if(!is_numeric($value)) return "'".$value."'";
+		return $value;
+	}
+
+	function show()
+	{
+		if(!$this->argument) return false;
+		$value = $this->argument;
+		if(!isset($value)) return false;
+		return true;
+	}
+
+	function getArgument()
+	{
+		return null;
+	}
+
+	function getArguments()
+	{
+		return array();
+	}
+}
+/* End of file UpdateExpressionWithoutArgument.class.php */
+/* Location: ./classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php */

classes/db/queryparts/limit/Limit.class.php

@@ -1,69 +1,77 @@
 <?php 
+/**
+ * @author NHN (developers@xpressengine.com)
+ * @package /classes/db/queryparts/limit
+ * @version 0.1
+ */
+class Limit
+{
 	/**
-	 * @author NHN (developers@xpressengine.com)
-	 * @package /classes/db/queryparts/limit
-	 * @version 0.1
+	 * start number
+	 * @var int
 	 */
-	class Limit {
-		/**
-		 * start number
-		 * @var int
-		 */
-		var $start;
-		/**
-		 * list count
-		 * @var int
-		 */
-		var $list_count;
-		/**
-		 * page count
-		 * @var int
-		 */
-		var $page_count;
-		/**
-		 * current page
-		 * @var int
-		 */
-		var $page;
+	var $start;
+	/**
+	 * list count
+	 * @var int
+	 */
+	var $list_count;
+	/**
+	 * page count
+	 * @var int
+	 */
+	var $page_count;
+	/**
+	 * current page
+	 * @var int
+	 */
+	var $page;
 
-		/**
-		 * constructor
-		 * @param int $list_count
-		 * @param int $page
-		 * @param int $page_count
-		 * @return void
-		 */
-		function Limit($list_count, $page= NULL, $page_count= NULL){
-			$this->list_count = $list_count;
-			if ($page){
-				$list_count_value = $list_count->getValue();
-				$page_value = $page->getValue();
-				$this->start = ($page_value - 1) * $list_count_value;
-				$this->page_count = $page_count;
-				$this->page = $page;
-			}			
-		}
-		
-		/**
-		 * In case you choose to use query limit in other cases than page select
-		 * @return boolean
-		 */
-		function isPageHandler(){
-			if ($this->page)return true;
-			else return false;
-		}
-		
-		function getOffset(){
-			return $this->start;
-		}
-		
-		function getLimit(){
-			return $this->list_count->getValue();
-		}
-		
-		function toString(){
-			if ($this->page) return $this->start . ' , ' . $this->list_count->getValue();
-			else return $this->list_count->getValue();
+	/**
+	 * constructor
+	 * @param int $list_count
+	 * @param int $page
+	 * @param int $page_count
+	 * @return void
+	 */
+	function Limit($list_count, $page= NULL, $page_count= NULL)
+	{
+		$this->list_count = $list_count;
+		if ($page)
+		{
+			$list_count_value = $list_count->getValue();
+			$page_value = $page->getValue();
+			$this->start = ($page_value - 1) * $list_count_value;
+			$this->page_count = $page_count;
+			$this->page = $page;
 		}
 	}
-?>
+
+	/**
+	 * In case you choose to use query limit in other cases than page select
+	 * @return boolean
+	 */
+	function isPageHandler()
+	{
+		if ($this->page)return true;
+		else return false;
+	}
+
+	function getOffset()
+	{
+		return $this->start;
+	}
+
+	function getLimit()
+	{
+		return $this->list_count->getValue();
+	}
+
+	function toString()
+	{
+		if ($this->page) return $this->start . ' , ' . $this->list_count->getValue();
+		else return $this->list_count->getValue();
+	}
+}
+/* End of file Limit.class.php */
+/* Location: ./classes/db/limit/Limit.class.php */

classes/db/queryparts/order/OrderByColumn.class.php

@@ -1,50 +1,55 @@
 <?php 
+/**
+ * @author NHN (developers@xpressengine.com)
+ * @package /classes/db/queryparts/order
+ * @version 0.1
+ */
+class OrderByColumn
+{
 	/**
-	 * @author NHN (developers@xpressengine.com)
-	 * @package /classes/db/queryparts/order
-	 * @version 0.1
+	 * column name
+	 * @var string
 	 */
-	class OrderByColumn {
-		/**
-		 * column name
-		 * @var string
-		 */
-		var $column_name;
-		/**
-		 * sort order
-		 * @var string
-		 */
-		var $sort_order;
-		
-		/**
-		 * constructor
-		 * @param string $column_name
-		 * @param string $sort_order
-		 * @return void
-		 */
-		function OrderByColumn($column_name, $sort_order){
-			$this->column_name = $column_name;
-			$this->sort_order = $sort_order;
-		}
-		
-		function toString(){
-			$result = $this->getColumnName();
-			$result .= ' ';
-			$result .= is_a($this->sort_order, 'Argument') ? $this->sort_order->getValue() : $this->sort_order;
-			return $result;
-		}
-		
-		function getColumnName(){
-		    return is_a($this->column_name, 'Argument') ? $this->column_name->getValue() : $this->column_name;
-		}
-		
-		function getArguments(){
-			$args = array();
-			if(is_a($this->column_name, 'Argument'))
-				$args[]= $this->column_name;
-			if(is_a($this->sort_order, 'Argument'))
-				$args[] = $this->sort_order; 
-		}
+	var $column_name;
+	/**
+	 * sort order
+	 * @var string
+	 */
+	var $sort_order;
+
+	/**
+	 * constructor
+	 * @param string $column_name
+	 * @param string $sort_order
+	 * @return void
+	 */
+	function OrderByColumn($column_name, $sort_order)
+	{
+		$this->column_name = $column_name;
+		$this->sort_order = $sort_order;
 	}
 
-?>
+	function toString()
+	{
+		$result = $this->getColumnName();
+		$result .= ' ';
+		$result .= is_a($this->sort_order, 'Argument') ? $this->sort_order->getValue() : $this->sort_order;
+		return $result;
+	}
+
+	function getColumnName()
+	{
+		return is_a($this->column_name, 'Argument') ? $this->column_name->getValue() : $this->column_name;
+	}
+
+	function getArguments()
+	{
+		$args = array();
+		if(is_a($this->column_name, 'Argument'))
+			$args[]= $this->column_name;
+		if(is_a($this->sort_order, 'Argument'))
+			$args[] = $this->sort_order; 
+	}
+}
+/* End of file OrderByColumn.class.php */
+/* Location: ./classes/db/order/OrderByColumn.class.php */

classes/db/queryparts/table/CubridTableWithHint.class.php

@@ -1,62 +1,66 @@
 <?php
+/**
+ * @author NHN (developers@xpressengine.com)
+ * @package /classes/db/queryparts/table
+ * @version 0.1
+ */
+class CubridTableWithHint extends Table
+{
 	/**
-	 * @author NHN (developers@xpressengine.com)
-	 * @package /classes/db/queryparts/table
-	 * @version 0.1
+	 * table name
+	 * @var string
 	 */
-	class CubridTableWithHint extends Table {
-		/**
-		 * table name
-		 * @var string
-		 */
-		var $name;
-		/**
-		 * table alias
-		 * @var string
-		 */
-		var $alias;
-		/**
-		 * index hint list
-		 * @var array
-		 */
-                var $index_hints_list;
+	var $name;
+	/**
+	 * table alias
+	 * @var string
+	 */
+	var $alias;
+	/**
+	 * index hint list
+	 * @var array
+	 */
+	var $index_hints_list;
 
-		/**
-		 * constructor
-		 * @param string $name
-		 * @param string $alias
-		 * @param array $index_hints_list
-		 * @return void
-		 */
-		function CubridTableWithHint($name, $alias = NULL, $index_hints_list){
-                    parent::Table($name, $alias);
-                    $this->index_hints_list = $index_hints_list;
-		}
-
-		/**
-		 * Return index hint string
-		 * @return string
-		 */
-		function getIndexHintString(){
-                    $result = '';
-
-                    // Retrieve table prefix, to add it to index name
-                    $db_info = Context::getDBInfo();
-                    $prefix = $db_info->master_db["db_table_prefix"];
-
-                    foreach($this->index_hints_list as $index_hint){
-                        $index_hint_type = $index_hint->getIndexHintType();
-                        if($index_hint_type !== 'IGNORE'){
-                            $result .= $this->alias . '.'
-                                        . '"' . $prefix . substr($index_hint->getIndexName(), 1)
-                                        . ($index_hint_type == 'FORCE' ? '(+)' : '')
-                                        . ', ';
-                        }
-
-                    }
-                    $result = substr($result, 0, -2);
-                    return $result;
-		}
+	/**
+	 * constructor
+	 * @param string $name
+	 * @param string $alias
+	 * @param array $index_hints_list
+	 * @return void
+	 */
+	function CubridTableWithHint($name, $alias = NULL, $index_hints_list)
+	{
+		parent::Table($name, $alias);
+		$this->index_hints_list = $index_hints_list;
 	}
 
-?>
+	/**
+	 * Return index hint string
+	 * @return string
+	 */
+	function getIndexHintString()
+	{
+		$result = '';
+
+		// Retrieve table prefix, to add it to index name
+		$db_info = Context::getDBInfo();
+		$prefix = $db_info->master_db["db_table_prefix"];
+
+		foreach($this->index_hints_list as $index_hint)
+		{
+			$index_hint_type = $index_hint->getIndexHintType();
+			if($index_hint_type !== 'IGNORE')
+			{
+				$result .= $this->alias . '.'
+					. '"' . $prefix . substr($index_hint->getIndexName(), 1)
+					. ($index_hint_type == 'FORCE' ? '(+)' : '')
+					. ', ';
+			}
+		}
+		$result = substr($result, 0, -2);
+		return $result;
+	}
+}
+/* End of file CubridTableWithHint.class.php */
+/* Location: ./classes/db/queryparts/table/CubridTableWithHint.class.php */

classes/db/queryparts/table/IndexHint.class.php

@@ -1,39 +1,43 @@
 <?php
+/**
+ * @author NHN (developers@xpressengine.com)
+ * @package /classes/db/queryparts/table
+ * @version 0.1
+ */
+class IndexHint
+{
 	/**
-	 * @author NHN (developers@xpressengine.com)
-	 * @package /classes/db/queryparts/table
-	 * @version 0.1
+	 * index name
+	 * @var string
 	 */
-	class IndexHint {
-		/**
-		 * index name
-		 * @var string
-		 */
-		var $index_name;
-		/**
-		 * index hint type, ex) IGNORE, FORCE, USE...
-		 * @var string
-		 */
-		var $index_hint_type;
+	var $index_name;
+	/**
+	 * index hint type, ex) IGNORE, FORCE, USE...
+	 * @var string
+	 */
+	var $index_hint_type;
 
-		/**
-		 * constructor
-		 * @param string $index_name
-		 * @param string $index_hint_type
-		 * @return void
-		 */
-		function IndexHint($index_name, $index_hint_type){
-                    $this->index_name = $index_name;
-                    $this->index_hint_type = $index_hint_type;
-		}
-
-                function getIndexName(){
-                    return $this->index_name;
-                }
-
-                function getIndexHintType() {
-                    return $this->index_hint_type;
-                }
+	/**
+	 * constructor
+	 * @param string $index_name
+	 * @param string $index_hint_type
+	 * @return void
+	 */
+	function IndexHint($index_name, $index_hint_type)
+	{
+		$this->index_name = $index_name;
+		$this->index_hint_type = $index_hint_type;
 	}
 
-?>
+	function getIndexName()
+	{
+		return $this->index_name;
+	}
+
+	function getIndexHintType()
+	{
+		return $this->index_hint_type;
+	}
+}
+/* End of file IndexHint.class.php */
+/* Location: ./classes/db/queryparts/table/IndexHint.class.php */

classes/db/queryparts/table/JoinTable.class.php

@@ -1,59 +1,62 @@
 <?php 
+/**
+ * class JoinTable
+ * 		$conditions in an array of Condition objects 
+ * 
+ * @author Arnia Software
+ * @package /classes/db/queryparts/table
+ * @version 0.1
+ */
+class JoinTable extends Table
+{
 	/**
-	 * class JoinTable
-	 * 		$conditions in an array of Condition objects 
-	 * 
-	 * @author Arnia Software
-	 * @package /classes/db/queryparts/table
-	 * @version 0.1
+	 * join type
+	 * @var string
 	 */
-	class JoinTable extends Table {
-		/**
-		 * join type
-		 * @var string
-		 */
-		var $join_type;
-		/**
-		 * condition list
-		 * @var array
-		 */
-		var $conditions;
-		
-		/**
-		 * constructor
-		 * @param string $name
-		 * @param string $alias
-		 * @param string $join_type
-		 * @param array $conditions
-		 * @return void
-		 */
-		function JoinTable($name, $alias, $join_type, $conditions){
-			parent::Table($name, $alias);
-			$this->join_type = $join_type;
-			$this->conditions = $conditions;
-		}
-		
-		function toString($with_value = true){
-			$part = $this->join_type . ' ' . $this->name ;
-			$part .= $this->alias ? ' as ' . $this->alias : '';
-			$part .= ' on ';
-			foreach($this->conditions as $conditionGroup)
-				$part .= $conditionGroup->toString($with_value);
-			return $part;
-		}
-		
-		function isJoinTable(){
-			return true;
-		}
-		
-		function getArguments()
-		{
-			$args = array();
-			foreach($this->conditions as $conditionGroup)
-				$args = array_merge($args, $conditionGroup->getArguments());			
-			return $args;
-		}
-		
+	var $join_type;
+	/**
+	 * condition list
+	 * @var array
+	 */
+	var $conditions;
+
+	/**
+	 * constructor
+	 * @param string $name
+	 * @param string $alias
+	 * @param string $join_type
+	 * @param array $conditions
+	 * @return void
+	 */
+	function JoinTable($name, $alias, $join_type, $conditions)
+	{
+		parent::Table($name, $alias);
+		$this->join_type = $join_type;
+		$this->conditions = $conditions;
 	}
 
-?>
+	function toString($with_value = true)
+	{
+		$part = $this->join_type . ' ' . $this->name ;
+		$part .= $this->alias ? ' as ' . $this->alias : '';
+		$part .= ' on ';
+		foreach($this->conditions as $conditionGroup)
+			$part .= $conditionGroup->toString($with_value);
+		return $part;
+	}
+
+	function isJoinTable()
+	{
+		return true;
+	}
+
+	function getArguments()
+	{
+		$args = array();
+		foreach($this->conditions as $conditionGroup)
+			$args = array_merge($args, $conditionGroup->getArguments());			
+		return $args;
+	}
+}
+/* End of file JoinTable.class.php */
+/* Location: ./classes/db/queryparts/table/JoinTable.class.php */

classes/db/queryparts/table/MssqlTableWithHint.class.php

@@ -1,53 +1,58 @@
 <?php
+/**
+ * @author NHN (developers@xpressengine.com)
+ * @package /classes/db/queryparts/table
+ * @version 0.1
+ */
+class MssqlTableWithHint extends Table
+{
 	/**
-	 * @author NHN (developers@xpressengine.com)
-	 * @package /classes/db/queryparts/table
-	 * @version 0.1
+	 * table name
+	 * @var string
 	 */
-	class MssqlTableWithHint extends Table {
-		/**
-		 * table name
-		 * @var string
-		 */
-		var $name;
-		/**
-		 * table alias
-		 * @var string
-		 */
-		var $alias;
-		/**
-		 * index hint type, ex) IGNORE, FORCE, USE...
-		 * @var array
-		 */
-                var $index_hints_list;
+	var $name;
+	/**
+	 * table alias
+	 * @var string
+	 */
+	var $alias;
+	/**
+	 * index hint type, ex) IGNORE, FORCE, USE...
+	 * @var array
+	 */
+	var $index_hints_list;
 
-		/**
-		 * constructor
-		 * @param string $name
-		 * @param string $alias
-		 * @param string $index_hints_list
-		 * @return void
-		 */
-		function MssqlTableWithHint($name, $alias = NULL, $index_hints_list){
-                    parent::Table($name, $alias);
-                    $this->index_hints_list = $index_hints_list;
-		}
-
-                function toString(){
-                    $result = parent::toString();
-
-                    $index_hint_string = '';
-					$indexTypeList = array('USE'=>1, 'FORCE'=>1);
-                    foreach($this->index_hints_list as $index_hint){
-                        $index_hint_type = $index_hint->getIndexHintType();
-                        if(isset($indexTypeList[$index_hint_type]))
-                                $index_hint_string .= 'INDEX(' . $index_hint->getIndexName() . '), ';
-                    }
-                    if($index_hint_string != ''){
-                        $result .= ' WITH(' . substr($index_hint_string, 0, -2) . ') ';
-                    }
-                    return $result;
-                }
+	/**
+	 * constructor
+	 * @param string $name
+	 * @param string $alias
+	 * @param string $index_hints_list
+	 * @return void
+	 */
+	function MssqlTableWithHint($name, $alias = NULL, $index_hints_list)
+	{
+		parent::Table($name, $alias);
+		$this->index_hints_list = $index_hints_list;
 	}
 
-?>
+	function toString()
+	{
+		$result = parent::toString();
+
+		$index_hint_string = '';
+		$indexTypeList = array('USE'=>1, 'FORCE'=>1);
+		foreach($this->index_hints_list as $index_hint)
+		{
+			$index_hint_type = $index_hint->getIndexHintType();
+			if(isset($indexTypeList[$index_hint_type]))
+				$index_hint_string .= 'INDEX(' . $index_hint->getIndexName() . '), ';
+		}
+		if($index_hint_string != '')
+		{
+			$result .= ' WITH(' . substr($index_hint_string, 0, -2) . ') ';
+		}
+		return $result;
+	}
+}
+/* End of file MssqlTableWithHint.class.php */
+/* Location: ./classes/db/queryparts/table/MssqlTableWithHint.class.php */

classes/db/queryparts/table/MysqlTableWithHint.class.php

@@ -1,59 +1,66 @@
 <?php
+/**
+ * @author NHN (developers@xpressengine.com)
+ * @package /classes/db/queryparts/table
+ * @version 0.1
+ */
+class MysqlTableWithHint extends Table
+{
 	/**
-	 * @author NHN (developers@xpressengine.com)
-	 * @package /classes/db/queryparts/table
-	 * @version 0.1
+	 * table name
+	 * @var string
 	 */
-	class MysqlTableWithHint extends Table {
-		/**
-		 * table name
-		 * @var string
-		 */
-		var $name;
-		/**
-		 * table alias
-		 * @var string
-		 */
-		var $alias;
-		/**
-		 * index hint type, ex) IGNORE, FORCE, USE...
-		 * @var array
-		 */
-                var $index_hints_list;
+	var $name;
+	/**
+	 * table alias
+	 * @var string
+	 */
+	var $alias;
+	/**
+	 * index hint type, ex) IGNORE, FORCE, USE...
+	 * @var array
+	 */
+	var $index_hints_list;
 
-		/**
-		 * constructor
-		 * @param string $name
-		 * @param string $alias
-		 * @param string $index_hints_list
-		 * @return void
-		 */
-		function MysqlTableWithHint($name, $alias = NULL, $index_hints_list){
-                    parent::Table($name, $alias);
-                    $this->index_hints_list = $index_hints_list;
-		}
-
-                function toString(){
-                    $result = parent::toString();
-
-                    $use_index_hint = ''; $force_index_hint = ''; $ignore_index_hint = '';
-                    foreach($this->index_hints_list as $index_hint){
-                        $index_hint_type = $index_hint->getIndexHintType();
-                        if($index_hint_type == 'USE') $use_index_hint .= $index_hint->getIndexName() . ', ';
-                        else if($index_hint_type == 'FORCE') $force_index_hint .= $index_hint->getIndexName() . ', ';
-                        else if($index_hint_type == 'IGNORE') $ignore_index_hint .= $index_hint->getIndexName() . ', ';
-                    }
-                    if($use_index_hint != ''){
-                        $result .= ' USE INDEX (' . substr($use_index_hint, 0, -2) . ') ';
-                    }
-                    if($force_index_hint != ''){
-                        $result .= ' FORCE INDEX (' . substr($force_index_hint, 0, -2) . ') ';
-                    }
-                    if($ignore_index_hint != ''){
-                        $result .= ' IGNORE INDEX (' . substr($ignore_index_hint, 0, -2) . ') ';
-                    }
-                    return $result;
-                }
+	/**
+	 * constructor
+	 * @param string $name
+	 * @param string $alias
+	 * @param string $index_hints_list
+	 * @return void
+	 */
+	function MysqlTableWithHint($name, $alias = NULL, $index_hints_list)
+	{
+		parent::Table($name, $alias);
+		$this->index_hints_list = $index_hints_list;
 	}
 
-?>
+	function toString()
+	{
+		$result = parent::toString();
+
+		$use_index_hint = ''; $force_index_hint = ''; $ignore_index_hint = '';
+		foreach($this->index_hints_list as $index_hint)
+		{
+			$index_hint_type = $index_hint->getIndexHintType();
+			if($index_hint_type == 'USE') $use_index_hint .= $index_hint->getIndexName() . ', ';
+			else if($index_hint_type == 'FORCE') $force_index_hint .= $index_hint->getIndexName() . ', ';
+			else if($index_hint_type == 'IGNORE') $ignore_index_hint .= $index_hint->getIndexName() . ', ';
+		}
+		if($use_index_hint != '')
+		{
+			$result .= ' USE INDEX (' . substr($use_index_hint, 0, -2) . ') ';
+		}
+		if($force_index_hint != '')
+		{
+			$result .= ' FORCE INDEX (' . substr($force_index_hint, 0, -2) . ') ';
+		}
+		if($ignore_index_hint != '')
+		{
+			$result .= ' IGNORE INDEX (' . substr($ignore_index_hint, 0, -2) . ') ';
+		}
+		return $result;
+	}
+}
+/* End of file MysqlTableWithHint.class.php */
+/* Location: ./classes/db/queryparts/table/MysqlTableWithHint.class.php */

classes/db/queryparts/table/Table.class.php

@@ -1,48 +1,55 @@
 <?php 
+/**
+ * @author NHN (developers@xpressengine.com)
+ * @package /classes/db/queryparts/table
+ * @version 0.1
+ */
+class Table
+{
 	/**
-	 * @author NHN (developers@xpressengine.com)
-	 * @package /classes/db/queryparts/table
-	 * @version 0.1
+	 * table name
+	 * @var string
 	 */
-	class Table {
-		/**
-		 * table name
-		 * @var string
-		 */
-		var $name;
-		/**
-		 * table alias
-		 * @var string
-		 */
-		var $alias;
-		
-		/**
-		 * constructor
-		 * @param string $name
-		 * @param string $alias
-		 * @return void
-		 */
-		function Table($name, $alias = NULL){
-			$this->name = $name;
-			$this->alias = $alias;
-		}
-		
-		function toString(){
-                    //return $this->name;
-                    return sprintf("%s%s", $this->name, $this->alias ? ' as ' . $this->alias : '');
-		}
-		
-		function getName(){
-			return $this->name;
-		}
-		
-		function getAlias(){
-			return $this->alias;
-		}
-		
-		function isJoinTable(){
-                    return false;
-		}
+	var $name;
+	/**
+	 * table alias
+	 * @var string
+	 */
+	var $alias;
+
+	/**
+	 * constructor
+	 * @param string $name
+	 * @param string $alias
+	 * @return void
+	 */
+	function Table($name, $alias = NULL)
+	{
+		$this->name = $name;
+		$this->alias = $alias;
 	}
 
-?>
+	function toString()
+	{
+		//return $this->name;
+		return sprintf("%s%s", $this->name, $this->alias ? ' as ' . $this->alias : '');
+	}
+
+	function getName()
+	{
+		return $this->name;
+	}
+
+	function getAlias()
+	{
+		return $this->alias;
+	}
+
+	function isJoinTable()
+	{
+		return false;
+	}
+}
+
+/* End of file Table.class.php */
+/* Location: ./classes/db/queryparts/table/Table.class.php */