Condition pipe defaults to AND

XML 쿼리 작성시 pipe="and"를 일일이 추가하지 않아도 기본값이 AND가 되도록 함

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

@@ -29,7 +29,7 @@ class ConditionGroup
 	 * @param string $pipe
 	 * @return void
 	 */
-	function __construct($conditions, $pipe = "")
+	function __construct($conditions, $pipe = 'and')
 	{
 		$this->conditions = array();
 		foreach($conditions as $condition)
@@ -89,7 +89,7 @@ class ConditionGroup
 
 			if($this->pipe !== "" && trim($group) !== '')
 			{
-				$group = $this->pipe . ' (' . $group . ')';
+				$group = strtoupper($this->pipe) . ' (' . $group . ')';
 			}
 
 			$this->_group = $group;