pradosoft / prado

framework/Data/DataGateway/TDataGatewayResultEventParameter.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	private $_command;
 	private $_result;
 
-	public function __construct($command,$result)
+	public function __construct($command, $result)
 	{
 		$this->_command=$command;
 		$this->_result=$result;

framework/Data/DataGateway/TDataGatewayCommand.php

Spacing +95 added lines, -95 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	public function __construct($builder)
 	{
-		$this->_builder = $builder;
+		$this->_builder=$builder;
 	}
 	/**
 	 * @return TDbTableInfo
@@ -73,10 +73,10 @@ 
 	 */
 	public function delete($criteria)
 	{
-		$where = $criteria->getCondition();
-		$parameters = $criteria->getParameters()->toArray();
-		$command = $this->getBuilder()->createDeleteCommand($where, $parameters);
-		$this->onCreateCommand($command,$criteria);
+		$where=$criteria->getCondition();
+		$parameters=$criteria->getParameters()->toArray();
+		$command=$this->getBuilder()->createDeleteCommand($where, $parameters);
+		$this->onCreateCommand($command, $criteria);
 		$command->prepare();
 		return $command->execute();
 	}
@@ -88,10 +88,10 @@ 
 	 */
 	public function update($data, $criteria)
 	{
-		$where = $criteria->getCondition();
-		$parameters = $criteria->getParameters()->toArray();
-		$command = $this->getBuilder()->createUpdateCommand($data,$where, $parameters);
-		$this->onCreateCommand($command,$criteria);
+		$where=$criteria->getCondition();
+		$parameters=$criteria->getParameters()->toArray();
+		$command=$this->getBuilder()->createUpdateCommand($data, $where, $parameters);
+		$this->onCreateCommand($command, $criteria);
 		$command->prepare();
 		return $this->onExecuteCommand($command, $command->execute());
 	}
@@ -102,7 +102,7 @@ 
 	 */
 	public function updateByPk($data, $keys)
 	{
-		list($where, $parameters) = $this->getPrimaryKeyCondition((array)$keys);
+		list($where, $parameters)=$this->getPrimaryKeyCondition((array) $keys);
 		return $this->update($data, new TSqlCriteria($where, $parameters));
 	}
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function find($criteria)
 	{
-		$command = $this->getFindCommand($criteria);
+		$command=$this->getFindCommand($criteria);
 		return $this->onExecuteCommand($command, $command->queryRow());
 	}
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function findAll($criteria)
 	{
-		$command = $this->getFindCommand($criteria);
+		$command=$this->getFindCommand($criteria);
 		return $this->onExecuteCommand($command, $command->query());
 	}
 	/**
@@ -134,13 +134,13 @@ 
 	{
 		if($criteria===null)
 			return $this->getBuilder()->createFindCommand();
-		$where = $criteria->getCondition();
-		$parameters = $criteria->getParameters()->toArray();
-		$ordering = $criteria->getOrdersBy();
-		$limit = $criteria->getLimit();
-		$offset = $criteria->getOffset();
-		$select = $criteria->getSelect();
-		$command = $this->getBuilder()->createFindCommand($where,$parameters,$ordering,$limit,$offset,$select);
+		$where=$criteria->getCondition();
+		$parameters=$criteria->getParameters()->toArray();
+		$ordering=$criteria->getOrdersBy();
+		$limit=$criteria->getLimit();
+		$offset=$criteria->getOffset();
+		$select=$criteria->getSelect();
+		$command=$this->getBuilder()->createFindCommand($where, $parameters, $ordering, $limit, $offset, $select);
 		$this->onCreateCommand($command, $criteria);
 		return $command;
 	}
@@ -152,9 +152,9 @@ 
 	{
 		if($keys===null)
 			return null;
-		list($where, $parameters) = $this->getPrimaryKeyCondition((array)$keys);
-		$command = $this->getBuilder()->createFindCommand($where, $parameters);
-		$this->onCreateCommand($command, new TSqlCriteria($where,$parameters));
+		list($where, $parameters)=$this->getPrimaryKeyCondition((array) $keys);
+		$command=$this->getBuilder()->createFindCommand($where, $parameters);
+		$this->onCreateCommand($command, new TSqlCriteria($where, $parameters));
 		return $this->onExecuteCommand($command, $command->queryRow());
 	}
 	/**
@@ -163,21 +163,21 @@ 
 	 */
 	public function findAllByPk($keys)
 	{
-		$where = $this->getCompositeKeyCondition((array)$keys);
-		$command = $this->getBuilder()->createFindCommand($where);
-		$this->onCreateCommand($command, new TSqlCriteria($where,$keys));
-		return $this->onExecuteCommand($command,$command->query());
+		$where=$this->getCompositeKeyCondition((array) $keys);
+		$command=$this->getBuilder()->createFindCommand($where);
+		$this->onCreateCommand($command, new TSqlCriteria($where, $keys));
+		return $this->onExecuteCommand($command, $command->query());
 	}
-	public function findAllByIndex($criteria,$fields,$values)
+	public function findAllByIndex($criteria, $fields, $values)
 	{
-		$index = $this->getIndexKeyCondition($this->getTableInfo(),$fields,$values);
-		if(strlen($where = $criteria->getCondition())>0)
+		$index=$this->getIndexKeyCondition($this->getTableInfo(), $fields, $values);
+		if(strlen($where=$criteria->getCondition()) > 0)
 			$criteria->setCondition("({$index}) AND ({$where})");
 		else
 			$criteria->setCondition($index);
-		$command = $this->getFindCommand($criteria);
+		$command=$this->getFindCommand($criteria);
 		$this->onCreateCommand($command, $criteria);
-		return $this->onExecuteCommand($command,$command->query());
+		return $this->onExecuteCommand($command, $command->query());
 	}
 
 	/**
@@ -188,22 +188,22 @@ 
 	{
 		if(count($keys)==0)
 			return 0;
-		$where = $this->getCompositeKeyCondition((array)$keys);
-		$command = $this->getBuilder()->createDeleteCommand($where);
-		$this->onCreateCommand($command, new TSqlCriteria($where,$keys));
+		$where=$this->getCompositeKeyCondition((array) $keys);
+		$command=$this->getBuilder()->createDeleteCommand($where);
+		$this->onCreateCommand($command, new TSqlCriteria($where, $keys));
 		$command->prepare();
-		return $this->onExecuteCommand($command,$command->execute());
+		return $this->onExecuteCommand($command, $command->execute());
 	}
 
-	public function getIndexKeyCondition($table,$fields,$values)
+	public function getIndexKeyCondition($table, $fields, $values)
 	{
-		if (!count($values))
+		if(!count($values))
 			return 'FALSE';
-		$columns = array();
-		$tableName = $table->getTableFullName();
+		$columns=array();
+		$tableName=$table->getTableFullName();
 		foreach($fields as $field)
-			$columns[] = $tableName.'.'.$table->getColumn($field)->getColumnName();
-		return '('.implode(', ',$columns).') IN '.$this->quoteTuple($values);
+			$columns[]=$tableName.'.'.$table->getColumn($field)->getColumnName();
+		return '('.implode(', ', $columns).') IN '.$this->quoteTuple($values);
 	}
 
 	/**
@@ -213,26 +213,26 @@ 
 	 */
 	protected function getCompositeKeyCondition($values)
 	{
-		$primary = $this->getTableInfo()->getPrimaryKeys();
-		$count = count($primary);
+		$primary=$this->getTableInfo()->getPrimaryKeys();
+		$count=count($primary);
 		if($count===0)
 		{
 			throw new TDbException('dbtablegateway_no_primary_key_found',
 				$this->getTableInfo()->getTableFullName());
 		}
-		if(!is_array($values) || count($values) === 0)
+		if(!is_array($values) || count($values)===0)
 		{
 			throw new TDbException('dbtablegateway_missing_pk_values',
 				$this->getTableInfo()->getTableFullName());
 		}
-		if($count>1 && (!isset($values[0]) || !is_array($values[0])))
-			$values = array($values);
-		if($count > 1 && count($values[0]) !== $count)
+		if($count > 1 && (!isset($values[0]) || !is_array($values[0])))
+			$values=array($values);
+		if($count > 1 && count($values[0])!==$count)
 		{
 			throw new TDbException('dbtablegateway_pk_value_count_mismatch',
 				$this->getTableInfo()->getTableFullName());
 		}
-		return $this->getIndexKeyCondition($this->getTableInfo(),$primary, $values);
+		return $this->getIndexKeyCondition($this->getTableInfo(), $primary, $values);
 	}
 
 	/**
@@ -242,10 +242,10 @@ 
 	 */
 	protected function quoteTuple($array)
 	{
-		$conn = $this->getDbConnection();
-		$data = array();
+		$conn=$this->getDbConnection();
+		$data=array();
 		foreach($array as $k=>$v)
-			$data[] = is_array($v) ? $this->quoteTuple($v) : $conn->quoteString($v);
+			$data[]=is_array($v) ? $this->quoteTuple($v) : $conn->quoteString($v);
 		return '('.implode(', ', $data).')';
 	}
 
@@ -256,7 +256,7 @@ 
 	 */
 	protected function getPrimaryKeyCondition($values)
 	{
-		$primary = $this->getTableInfo()->getPrimaryKeys();
+		$primary=$this->getTableInfo()->getPrimaryKeys();
 		if(count($primary)===0)
 		{
 			throw new TDbException('dbtablegateway_no_primary_key_found',
@@ -264,12 +264,12 @@ 
 		}
 		$criteria=array();
 		$bindings=array();
-		$i = 0;
+		$i=0;
 		foreach($primary as $key)
 		{
-			$column = $this->getTableInfo()->getColumn($key)->getColumnName();
-			$criteria[] = $column.' = :'.$key;
-			$bindings[$key] = isset($values[$key])?$values[$key]:$values[$i++];
+			$column=$this->getTableInfo()->getColumn($key)->getColumnName();
+			$criteria[]=$column.' = :'.$key;
+			$bindings[$key]=isset($values[$key]) ? $values[$key] : $values[$i++];
 		}
 		return array(implode(' AND ', $criteria), $bindings);
 	}
@@ -281,7 +281,7 @@ 
 	 */
 	public function findBySql($criteria)
 	{
-		$command = $this->getSqlCommand($criteria);
+		$command=$this->getSqlCommand($criteria);
 		return $this->onExecuteCommand($command, $command->queryRow());
 	}
 
@@ -292,7 +292,7 @@ 
 	 */
 	public function findAllBySql($criteria)
 	{
-		$command = $this->getSqlCommand($criteria);
+		$command=$this->getSqlCommand($criteria);
 		return $this->onExecuteCommand($command, $command->query());
 	}
 
@@ -303,15 +303,15 @@ 
 	 */
 	protected function getSqlCommand($criteria)
 	{
-		$sql = $criteria->getCondition();
-		$ordering = $criteria->getOrdersBy();
-		$limit = $criteria->getLimit();
-		$offset = $criteria->getOffset();
+		$sql=$criteria->getCondition();
+		$ordering=$criteria->getOrdersBy();
+		$limit=$criteria->getLimit();
+		$offset=$criteria->getOffset();
 		if(count($ordering) > 0)
-			$sql = $this->getBuilder()->applyOrdering($sql, $ordering);
-		if($limit>=0 || $offset>=0)
-			$sql = $this->getBuilder()->applyLimitOffset($sql, $limit, $offset);
-		$command = $this->getBuilder()->createCommand($sql);
+			$sql=$this->getBuilder()->applyOrdering($sql, $ordering);
+		if($limit >= 0 || $offset >= 0)
+			$sql=$this->getBuilder()->applyLimitOffset($sql, $limit, $offset);
+		$command=$this->getBuilder()->createCommand($sql);
 		$this->getBuilder()->bindArrayValues($command, $criteria->getParameters()->toArray());
 		$this->onCreateCommand($command, $criteria);
 		return $command;
@@ -324,15 +324,15 @@ 
 	public function count($criteria)
 	{
 		if($criteria===null)
-			return (int)$this->getBuilder()->createCountCommand()->queryScalar();
-		$where = $criteria->getCondition();
-		$parameters = $criteria->getParameters()->toArray();
-		$ordering = $criteria->getOrdersBy();
-		$limit = $criteria->getLimit();
-		$offset = $criteria->getOffset();
-		$command = $this->getBuilder()->createCountCommand($where,$parameters,$ordering,$limit,$offset);
+			return (int) $this->getBuilder()->createCountCommand()->queryScalar();
+		$where=$criteria->getCondition();
+		$parameters=$criteria->getParameters()->toArray();
+		$ordering=$criteria->getOrdersBy();
+		$limit=$criteria->getLimit();
+		$offset=$criteria->getOffset();
+		$command=$this->getBuilder()->createCountCommand($where, $parameters, $ordering, $limit, $offset);
 		$this->onCreateCommand($command, $criteria);
-		return $this->onExecuteCommand($command, (int)$command->queryScalar());
+		return $this->onExecuteCommand($command, (int) $command->queryScalar());
 	}
 
 	/**
@@ -345,12 +345,12 @@ 
 	public function insert($data)
 	{
 		$command=$this->getBuilder()->createInsertCommand($data);
-		$this->onCreateCommand($command, new TSqlCriteria(null,$data));
+		$this->onCreateCommand($command, new TSqlCriteria(null, $data));
 		$command->prepare();
 		if($this->onExecuteCommand($command, $command->execute()) > 0)
 		{
-			$value = $this->getLastInsertId();
-			return $value !== null ? $value : true;
+			$value=$this->getLastInsertId();
+			return $value!==null ? $value : true;
 		}
 		return false;
 	}
@@ -373,14 +373,14 @@ 
 	 */
 	public function createCriteriaFromString($method, $condition, $args)
 	{
-		$fields = $this->extractMatchingConditions($method, $condition);
-		$args=count($args) === 1 && is_array($args[0]) ? $args[0] : $args;
-		if(count($fields)>count($args))
+		$fields=$this->extractMatchingConditions($method, $condition);
+		$args=count($args)===1 && is_array($args[0]) ? $args[0] : $args;
+		if(count($fields) > count($args))
 		{
 			throw new TDbException('dbtablegateway_mismatch_args_exception',
-				$method,count($fields),count($args));
+				$method, count($fields), count($args));
 		}
-		return new TSqlCriteria(implode(' ',$fields), $args);
+		return new TSqlCriteria(implode(' ', $fields), $args);
 	}
 
 	/**
@@ -392,25 +392,25 @@ 
 	 */
 	protected function extractMatchingConditions($method, $condition)
 	{
-		$table = $this->getTableInfo();
-		$columns = $table->getLowerCaseColumnNames();
-		$regexp = '/('.implode('|', array_keys($columns)).')(and|_and_|or|_or_)?/i';
-		$matches = array();
-		if(!preg_match_all($regexp, strtolower($condition), $matches,PREG_SET_ORDER))
+		$table=$this->getTableInfo();
+		$columns=$table->getLowerCaseColumnNames();
+		$regexp='/('.implode('|', array_keys($columns)).')(and|_and_|or|_or_)?/i';
+		$matches=array();
+		if(!preg_match_all($regexp, strtolower($condition), $matches, PREG_SET_ORDER))
 		{
 			throw new TDbException('dbtablegateway_mismatch_column_name',
 				$method, implode(', ', $columns), $table->getTableFullName());
 		}
 
-		$fields = array();
+		$fields=array();
 		foreach($matches as $match)
 		{
-			$key = $columns[$match[1]];
-			$column = $table->getColumn($key)->getColumnName();
-			$sql = $column . ' = ? ';
+			$key=$columns[$match[1]];
+			$column=$table->getColumn($key)->getColumnName();
+			$sql=$column.' = ? ';
 			if(count($match) > 2)
-				$sql .= strtoupper(str_replace('_', '', $match[2]));
-			$fields[] = $sql;
+				$sql.=strtoupper(str_replace('_', '', $match[2]));
+			$fields[]=$sql;
 		}
 		return $fields;
 	}
@@ -425,7 +425,7 @@ 
 	 */
 	public function onCreateCommand($command, $criteria)
 	{
-		$this->raiseEvent('OnCreateCommand', $this, new TDataGatewayEventParameter($command,$criteria));
+		$this->raiseEvent('OnCreateCommand', $this, new TDataGatewayEventParameter($command, $criteria));
 	}
 
 	/**
@@ -439,7 +439,7 @@ 
 	 */
 	public function onExecuteCommand($command, $result)
 	{
-		$parameter = new TDataGatewayResultEventParameter($command, $result);
+		$parameter=new TDataGatewayResultEventParameter($command, $result);
 		$this->raiseEvent('OnExecuteCommand', $this, $parameter);
 		return $parameter->getResult();
 	}

framework/Data/SqlMap/Statements/TResultSetListItemParameter.php

Spacing +3 added lines, -3 removed lines

@@ -26,9 +26,9 @@
 
 	public function __construct($result, $parameter, &$list)
 	{
-		$this->_resultObject = $result;
-		$this->_parameterObject = $parameter;
-		$this->_list = &$list;
+		$this->_resultObject=$result;
+		$this->_parameterObject=$parameter;
+		$this->_list=&$list;
 	}
 
 	public function getResult()

framework/Data/SqlMap/Statements/TSqlMapObjectCollectionTree.php

Spacing +36 added lines, -36 removed lines

@@ -30,22 +30,22 @@ 
 	/**
 	 * @var array object graph as tree
 	 */
-	private $_tree = array();
+	private $_tree=array();
 	/**
 	 * @var array tree node values
 	 */
-	private $_entries = array();
+	private $_entries=array();
 	/**
 	 * @var array resulting object collection
 	 */
-	private $_list = array();
+	private $_list=array();
 
 	/**
 	 * @return boolean true if the graph is empty
 	 */
 	public function isEmpty()
 	{
-		return count($this->_entries) == 0;
+		return count($this->_entries)==0;
 	}
 
 	/**
@@ -59,22 +59,22 @@ 
 		if(isset($this->_entries[$parent]) && ($this->_entries[$parent]!==null)
 			&& isset($this->_entries[$node]) && ($this->_entries[$node]!==null))
 		{
-			$this->_entries[$node] = $object;
+			$this->_entries[$node]=$object;
 			return;
 		}
-		$this->_entries[$node] = $object;
+		$this->_entries[$node]=$object;
 		if(empty($parent))
 		{
 			if(isset($this->_entries[$node]))
 				return;
-			$this->_tree[$node] = array();
+			$this->_tree[$node]=array();
 		}
-		$found = $this->addNode($this->_tree, $parent, $node);
+		$found=$this->addNode($this->_tree, $parent, $node);
 		if(!$found && !empty($parent))
 		{
-			$this->_tree[$parent] = array();
-			if(!isset($this->_entries[$parent]) || $object !== '')
-				$this->_entries[$parent] = $object;
+			$this->_tree[$parent]=array();
+			if(!isset($this->_entries[$parent]) || $object!=='')
+				$this->_entries[$parent]=$object;
 			$this->addNode($this->_tree, $parent, $node);
 		}
 	}
@@ -88,20 +88,20 @@ 
 	 */
 	protected function addNode(&$childs, $parent, $node)
 	{
-		$found = false;
+		$found=false;
 		reset($childs);
-		for($i = 0, $k = count($childs); $i < $k; $i++)
+		for($i=0, $k=count($childs); $i < $k; $i++)
 		{
-			$key = key($childs);
+			$key=key($childs);
 			next($childs);
-			if($key == $parent)
+			if($key==$parent)
 			{
-				$found = true;
-				$childs[$key][$node] = array();
+				$found=true;
+				$childs[$key][$node]=array();
 			}
 			else
 			{
-				$found = $found || $this->addNode($childs[$key], $parent, $node);
+				$found=$found || $this->addNode($childs[$key], $parent, $node);
 			}
 		}
 		return $found;
@@ -123,9 +123,9 @@ 
 	 */
 	protected function hasChildren(&$nodes)
 	{
-		$hasChildren = false;
+		$hasChildren=false;
 		foreach($nodes as $node)
-			if(count($node) != 0)
+			if(count($node)!=0)
 				return true;
 		return $hasChildren;
 	}
@@ -137,14 +137,14 @@ 
 	 */
 	protected function collectChildren($parent, &$nodes)
 	{
-		$noChildren = !$this->hasChildren($nodes);
-		$childs = array();
-		for(reset($nodes); $key = key($nodes);)
+		$noChildren=!$this->hasChildren($nodes);
+		$childs=array();
+		for(reset($nodes); $key=key($nodes);)
 		{
 			next($nodes);
 			if($noChildren)
 			{
-				$childs[] = $key;
+				$childs[]=$key;
 				unset($nodes[$key]);
 			}
 			else
@@ -164,17 +164,17 @@ 
 		if(empty($parent) || empty($this->_entries[$parent]))
 			return;
 
-		$parentObject = $this->_entries[$parent]['object'];
-		$property = $this->_entries[$nodes[0]]['property'];
+		$parentObject=$this->_entries[$parent]['object'];
+		$property=$this->_entries[$nodes[0]]['property'];
 
-		$list = TPropertyAccess::get($parentObject, $property);
+		$list=TPropertyAccess::get($parentObject, $property);
 
 		foreach($nodes as $node)
 		{
 			if($list instanceof TList)
-				$parentObject->{$property}[] = $this->_entries[$node]['object'];
+				$parentObject->{$property}[]=$this->_entries[$node]['object'];
 			else if(is_array($list))
-				$list[] = $this->_entries[$node]['object'];
+				$list[]=$this->_entries[$node]['object'];
 			else
 				throw new TSqlMapExecutionException(
 					'sqlmap_property_must_be_list');
@@ -183,8 +183,8 @@ 
 		if(is_array($list))
 			TPropertyAccess::set($parentObject, $property, $list);
 
-		if($this->_entries[$parent]['property'] === null)
-			$this->_list[] = $parentObject;
+		if($this->_entries[$parent]['property']===null)
+			$this->_list[]=$parentObject;
 	}
 
 	/**
@@ -197,10 +197,10 @@ 
 
 	public function __sleep()
 	{
-		$exprops = array(); $cn = __CLASS__;
-		if (!count($this->_tree)) $exprops[] = "\0$cn\0_tree";
-		if (!count($this->_entries)) $exprops[] = "\0$cn\0_entries";
-		if (!count($this->_list)) $exprops[] = "\0$cn\0_list";
-		return array_diff(parent::__sleep(),$exprops);
+		$exprops=array(); $cn=__CLASS__;
+		if(!count($this->_tree)) $exprops[]="\0$cn\0_tree";
+		if(!count($this->_entries)) $exprops[]="\0$cn\0_entries";
+		if(!count($this->_list)) $exprops[]="\0$cn\0_list";
+		return array_diff(parent::__sleep(), $exprops);
 	}
 }
\ No newline at end of file

framework/Data/SqlMap/Statements/TMappedStatement.php

Spacing +137 added lines, -140 removed lines

@@ -56,7 +56,7 @@ 
 	/**
 	 * @var boolean true when data is mapped to a particular row.
 	 */
-	private $_IsRowDataFound = false;
+	private $_IsRowDataFound=false;
 
 	/**
 	 * @var TSQLMapObjectCollectionTree group by object collection tree
@@ -66,17 +66,17 @@ 
 	/**
 	 * @var Post select is to query for list.
 	 */
-	const QUERY_FOR_LIST = 0;
+	const QUERY_FOR_LIST=0;
 
 	/**
 	 * @var Post select is to query for list.
 	 */
-	const QUERY_FOR_ARRAY = 1;
+	const QUERY_FOR_ARRAY=1;
 
 	/**
 	 * @var Post select is to query for object.
 	 */
-	const QUERY_FOR_OBJECT = 2;
+	const QUERY_FOR_OBJECT=2;
 
 	/**
 	 * @return string Name used to identify the TMappedStatement amongst the others.
@@ -116,7 +116,7 @@ 
 	 */
 	protected function initialGroupByResults()
 	{
-		$this->_groupBy = new TSqlMapObjectCollectionTree();
+		$this->_groupBy=new TSqlMapObjectCollectionTree();
 	}
 
 	/**
@@ -126,9 +126,9 @@ 
 	 */
 	public function __construct(TSqlMapManager $sqlMap, TSqlMapStatement $statement)
 	{
-		$this->_manager = $sqlMap;
-		$this->_statement = $statement;
-		$this->_command = new TPreparedCommand();
+		$this->_manager=$sqlMap;
+		$this->_statement=$statement;
+		$this->_command=new TPreparedCommand();
 		$this->initialGroupByResults();
 	}
 
@@ -173,10 +173,10 @@ 
 	 */
 	protected function executeSQLQueryLimit($connection, $command, $max, $skip)
 	{
-		if($max>-1 || $skip > -1)
+		if($max > -1 || $skip > -1)
 		{
-			$maxStr=$max>0?' LIMIT '.$max:'';
-			$skipStr=$skip>0?' OFFSET '.$skip:'';
+			$maxStr=$max > 0 ? ' LIMIT '.$max : '';
+			$skipStr=$skip > 0 ? ' OFFSET '.$skip : '';
 			$command->setText($command->getText().$maxStr.$skipStr);
 		}
 		$connection->setActive(true);
@@ -213,7 +213,7 @@ 
 	 */
 	public function executeQueryForList($connection, $parameter, $result=null, $skip=-1, $max=-1, $delegate=null)
 	{
-		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter,$skip,$max);
+		$sql=$this->_command->create($this->_manager, $connection, $this->_statement, $parameter, $skip, $max);
 		return $this->runQueryForList($connection, $parameter, $sql, $result, $delegate);
 	}
 
@@ -236,17 +236,16 @@ 
 	public function runQueryForList($connection, $parameter, $sql, $result, $delegate=null)
 	{
 		$registry=$this->getManager()->getTypeHandlers();
-		$list = $result instanceof \ArrayAccess ? $result :
-							$this->_statement->createInstanceOfListClass($registry);
+		$list=$result instanceof \ArrayAccess ? $result : $this->_statement->createInstanceOfListClass($registry);
 		$connection->setActive(true);
-		$reader = $sql->query();
+		$reader=$sql->query();
 		//$reader = $this->executeSQLQueryLimit($connection, $sql, $max, $skip);
 		if($delegate!==null)
 		{
 			foreach($reader as $row)
 			{
-				$obj = $this->applyResultMap($row);
-				$param = new TResultSetListItemParameter($obj, $parameter, $list);
+				$obj=$this->applyResultMap($row);
+				$param=new TResultSetListItemParameter($obj, $parameter, $list);
 				$this->raiseRowDelegate($delegate, $param);
 			}
 		}
@@ -256,13 +255,13 @@ 
 			foreach($reader as $row)
 			{
 //				var_dump($row);
-				$list[] = $this->applyResultMap($row);
+				$list[]=$this->applyResultMap($row);
 			}
 		}
 
 		if(!$this->_groupBy->isEmpty())
 		{
-			$list = $this->_groupBy->collect();
+			$list=$this->_groupBy->collect();
 			$this->initialGroupByResults();
 		}
 
@@ -284,9 +283,9 @@ 
 	 * @param callback row delegate handler
 	 * @return array An array of object containing the rows keyed by keyProperty.
 	 */
-	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty=null,  $skip=-1, $max=-1, $delegate=null)
+	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty=null, $skip=-1, $max=-1, $delegate=null)
 	{
-		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter, $skip, $max);
+		$sql=$this->_command->create($this->_manager, $connection, $this->_statement, $parameter, $skip, $max);
 		return $this->runQueryForMap($connection, $parameter, $sql, $keyProperty, $valueProperty, $delegate);
 	}
 
@@ -310,20 +309,19 @@ 
 	 */
 	public function runQueryForMap($connection, $parameter, $command, $keyProperty, $valueProperty=null, $delegate=null)
 	{
-		$map = array();
+		$map=array();
 		//$recordSet = $this->executeSQLQuery($connection, $sql);
 		$connection->setActive(true);
-		$reader = $command->query();
+		$reader=$command->query();
 		if($delegate!==null)
 		{
 			//while($row = $recordSet->fetchRow())
 			foreach($reader as $row)
 			{
-				$obj = $this->applyResultMap($row);
-				$key = TPropertyAccess::get($obj, $keyProperty);
-				$value = ($valueProperty===null) ? $obj :
-							TPropertyAccess::get($obj, $valueProperty);
-				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);
+				$obj=$this->applyResultMap($row);
+				$key=TPropertyAccess::get($obj, $keyProperty);
+				$value=($valueProperty===null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
+				$param=new TResultSetMapItemParameter($key, $value, $parameter, $map);
 				$this->raiseRowDelegate($delegate, $param);
 			}
 		}
@@ -332,10 +330,9 @@ 
 			//while($row = $recordSet->fetchRow())
 			foreach($reader as $row)
 			{
-				$obj = $this->applyResultMap($row);
-				$key = TPropertyAccess::get($obj, $keyProperty);
-				$map[$key] = ($valueProperty===null) ? $obj :
-								TPropertyAccess::get($obj, $valueProperty);
+				$obj=$this->applyResultMap($row);
+				$key=TPropertyAccess::get($obj, $keyProperty);
+				$map[$key]=($valueProperty===null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
 			}
 		}
 		$this->onExecuteQuery($command);
@@ -352,22 +349,22 @@ 
 	{
 		if(is_string($handler))
 		{
-			call_user_func($handler,$this,$param);
+			call_user_func($handler, $this, $param);
 		}
-		else if(is_callable($handler,true))
+		else if(is_callable($handler, true))
 		{
 			// an array: 0 - object, 1 - method name/path
-			list($object,$method)=$handler;
+			list($object, $method)=$handler;
 			if(is_string($object))	// static method call
-				call_user_func($handler,$this,$param);
+				call_user_func($handler, $this, $param);
 			else
 			{
-				if(($pos=strrpos($method,'.'))!==false)
+				if(($pos=strrpos($method, '.'))!==false)
 				{
-					$object=$this->getSubProperty(substr($method,0,$pos));
-					$method=substr($method,$pos+1);
+					$object=$this->getSubProperty(substr($method, 0, $pos));
+					$method=substr($method, $pos + 1);
 				}
-				$object->$method($this,$param);
+				$object->$method($this, $param);
 			}
 		}
 		else
@@ -384,7 +381,7 @@ 
 	 */
 	public function executeQueryForObject($connection, $parameter, $result=null)
 	{
-		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
+		$sql=$this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
 		return $this->runQueryForObject($connection, $sql, $result);
 	}
 
@@ -403,16 +400,16 @@ 
 	 */
 	public function runQueryForObject($connection, $command, &$result)
 	{
-		$object = null;
+		$object=null;
 		$connection->setActive(true);
 		foreach($command->query() as $row)
-			$object = $this->applyResultMap($row, $result);
+			$object=$this->applyResultMap($row, $result);
 
 		if(!$this->_groupBy->isEmpty())
 		{
-			$list = $this->_groupBy->collect();
+			$list=$this->_groupBy->collect();
 			$this->initialGroupByResults();
-			$object = $list[0];
+			$object=$list[0];
 		}
 
 		$this->executePostSelect($connection);
@@ -430,14 +427,14 @@ 
 	 */
 	public function executeInsert($connection, $parameter)
 	{
-		$generatedKey = $this->getPreGeneratedSelectKey($connection, $parameter);
+		$generatedKey=$this->getPreGeneratedSelectKey($connection, $parameter);
 
-		$command = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
+		$command=$this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
 //		var_dump($command,$parameter);
-		$result = $command->execute();
+		$result=$command->execute();
 
 		if($generatedKey===null)
-			$generatedKey = $this->getPostGeneratedSelectKey($connection, $parameter);
+			$generatedKey=$this->getPostGeneratedSelectKey($connection, $parameter);
 
 		$this->executePostSelect($connection);
 		$this->onExecuteQuery($command);
@@ -454,7 +451,7 @@ 
 	{
 		if($this->_statement instanceof TSqlMapInsert)
 		{
-			$selectKey = $this->_statement->getSelectKey();
+			$selectKey=$this->_statement->getSelectKey();
 			if(($selectKey!==null) && !$selectKey->getIsAfter())
 				return $this->executeSelectKey($connection, $parameter, $selectKey);
 		}
@@ -470,7 +467,7 @@ 
 	{
 		if($this->_statement instanceof TSqlMapInsert)
 		{
-			$selectKey = $this->_statement->getSelectKey();
+			$selectKey=$this->_statement->getSelectKey();
 			if(($selectKey!==null) && $selectKey->getIsAfter())
 				return $this->executeSelectKey($connection, $parameter, $selectKey);
 		}
@@ -485,10 +482,10 @@ 
 	 */
 	protected function executeSelectKey($connection, $parameter, $selectKey)
 	{
-		$mappedStatement = $this->getManager()->getMappedStatement($selectKey->getID());
-		$generatedKey = $mappedStatement->executeQueryForObject(
+		$mappedStatement=$this->getManager()->getMappedStatement($selectKey->getID());
+		$generatedKey=$mappedStatement->executeQueryForObject(
 									$connection, $parameter, null);
-		if(strlen($prop = $selectKey->getProperty()) > 0)
+		if(strlen($prop=$selectKey->getProperty()) > 0)
 				TPropertyAccess::set($parameter, $prop, $generatedKey);
 		return $generatedKey;
 	}
@@ -502,8 +499,8 @@ 
 	 */
 	public function executeUpdate($connection, $parameter)
 	{
-		$sql = $this->_command->create($this->getManager(),$connection, $this->_statement, $parameter);
-		$affectedRows = $sql->execute();
+		$sql=$this->_command->create($this->getManager(), $connection, $this->_statement, $parameter);
+		$affectedRows=$sql->execute();
 		//$this->executeSQLQuery($connection, $sql);
 		$this->executePostSelect($connection);
 		$this->onExecuteQuery($sql);
@@ -518,24 +515,24 @@ 
 	{
 		while(count($this->_selectQueue))
 		{
-			$postSelect = array_shift($this->_selectQueue);
-			$method = $postSelect->getMethod();
-			$statement = $postSelect->getStatement();
-			$property = $postSelect->getResultProperty()->getProperty();
-			$keys = $postSelect->getKeys();
-			$resultObject = $postSelect->getResultObject();
-
-			if($method == self::QUERY_FOR_LIST || $method == self::QUERY_FOR_ARRAY)
+			$postSelect=array_shift($this->_selectQueue);
+			$method=$postSelect->getMethod();
+			$statement=$postSelect->getStatement();
+			$property=$postSelect->getResultProperty()->getProperty();
+			$keys=$postSelect->getKeys();
+			$resultObject=$postSelect->getResultObject();
+
+			if($method==self::QUERY_FOR_LIST || $method==self::QUERY_FOR_ARRAY)
 			{
-				$values = $statement->executeQueryForList($connection, $keys, null);
+				$values=$statement->executeQueryForList($connection, $keys, null);
 
-				if($method == self::QUERY_FOR_ARRAY)
-					$values = $values->toArray();
+				if($method==self::QUERY_FOR_ARRAY)
+					$values=$values->toArray();
 				TPropertyAccess::set($resultObject, $property, $values);
 			}
-			else if($method == self::QUERY_FOR_OBJECT)
+			else if($method==self::QUERY_FOR_OBJECT)
 			{
-				$value = $statement->executeQueryForObject($connection, $keys, null);
+				$value=$statement->executeQueryForObject($connection, $keys, null);
 				TPropertyAccess::set($resultObject, $property, $value);
 			}
 		}
@@ -558,21 +555,21 @@ 
 	 */
 	protected function applyResultMap($row, &$resultObject=null)
 	{
-		if($row === false) return null;
+		if($row===false) return null;
 
-		$resultMapName = $this->_statement->getResultMap();
-		$resultClass = $this->_statement->getResultClass();
+		$resultMapName=$this->_statement->getResultMap();
+		$resultClass=$this->_statement->getResultClass();
 
 		$obj=null;
 		if($this->getManager()->getResultMaps()->contains($resultMapName))
-			$obj = $this->fillResultMap($resultMapName, $row, null, $resultObject);
+			$obj=$this->fillResultMap($resultMapName, $row, null, $resultObject);
 		else if(strlen($resultClass) > 0)
-			$obj = $this->fillResultClass($resultClass, $row, $resultObject);
+			$obj=$this->fillResultClass($resultClass, $row, $resultObject);
 		else
-			$obj = $this->fillDefaultResultMap(null, $row, $resultObject);
-		if(class_exists('TActiveRecord',false) && $obj instanceof TActiveRecord)
+			$obj=$this->fillDefaultResultMap(null, $row, $resultObject);
+		if(class_exists('TActiveRecord', false) && $obj instanceof TActiveRecord)
 			//Create a new clean active record.
-			$obj=TActiveRecord::createRecord(get_class($obj),$obj);
+			$obj=TActiveRecord::createRecord(get_class($obj), $obj);
 		return $obj;
 	}
 
@@ -587,8 +584,8 @@ 
 	{
 		if($resultObject===null)
 		{
-			$registry = $this->getManager()->getTypeHandlers();
-			$resultObject = $this->_statement->createInstanceOfResultClass($registry,$row);
+			$registry=$this->getManager()->getTypeHandlers();
+			$resultObject=$this->_statement->createInstanceOfResultClass($registry, $row);
 		}
 
 		if($resultObject instanceOf \ArrayAccess)
@@ -609,10 +606,10 @@ 
 	{
 		if($resultObject instanceof TList)
 			foreach($row as $v)
-				$resultObject[] = $v;
+				$resultObject[]=$v;
 		else
 			foreach($row as $k => $v)
-				$resultObject[$k] = $v;
+				$resultObject[$k]=$v;
 		return $resultObject;
 	}
 
@@ -624,18 +621,18 @@ 
 	 */
 	protected function fillResultObjectProperty($row, $resultObject)
 	{
-		$index = 0;
+		$index=0;
 		$registry=$this->getManager()->getTypeHandlers();
 		foreach($row as $k=>$v)
 		{
-			$property = new TResultProperty;
+			$property=new TResultProperty;
 			if(is_string($k) && strlen($k) > 0)
 				$property->setColumn($k);
 			$property->setColumnIndex(++$index);
-			$type = gettype(TPropertyAccess::get($resultObject,$k));
+			$type=gettype(TPropertyAccess::get($resultObject, $k));
 			$property->setType($type);
-			$value = $property->getPropertyValue($registry,$row);
-			TPropertyAccess::set($resultObject, $k,$value);
+			$value=$property->getPropertyValue($registry, $row);
+			TPropertyAccess::set($resultObject, $k, $value);
 		}
 		return $resultObject;
 	}
@@ -649,12 +646,12 @@ 
 	 */
 	protected function fillResultMap($resultMapName, $row, $parentGroup=null, &$resultObject=null)
 	{
-		$resultMap = $this->getManager()->getResultMap($resultMapName);
-		$registry = $this->getManager()->getTypeHandlers();
-		$resultMap = $resultMap->resolveSubMap($registry,$row);
+		$resultMap=$this->getManager()->getResultMap($resultMapName);
+		$registry=$this->getManager()->getTypeHandlers();
+		$resultMap=$resultMap->resolveSubMap($registry, $row);
 
 		if($resultObject===null)
-			$resultObject = $resultMap->createInstanceOfResult($registry);
+			$resultObject=$resultMap->createInstanceOfResult($registry);
 
 		if(is_object($resultObject))
 		{
@@ -666,7 +663,7 @@ 
 		}
 		else
 		{
-			$resultObject = $this->fillDefaultResultMap($resultMap, $row, $resultObject);
+			$resultObject=$this->fillDefaultResultMap($resultMap, $row, $resultObject);
 		}
 		return $resultObject;
 	}
@@ -681,11 +678,11 @@ 
 	 */
 	protected function addResultMapGroupBy($resultMap, $row, $parent, &$resultObject)
 	{
-		$group = $this->getResultMapGroupKey($resultMap, $row);
+		$group=$this->getResultMapGroupKey($resultMap, $row);
 
 		if(empty($parent))
 		{
-			$rootObject = array('object'=>$resultObject, 'property' => null);
+			$rootObject=array('object'=>$resultObject, 'property' => null);
 			$this->_groupBy->add(null, $group, $rootObject);
 		}
 
@@ -693,23 +690,23 @@ 
 		{
 			//set properties.
 			$this->setObjectProperty($resultMap, $property, $row, $resultObject);
-			$nested = $property->getResultMapping();
+			$nested=$property->getResultMapping();
 
 			//nested property
 			if($this->getManager()->getResultMaps()->contains($nested))
 			{
-				$nestedMap = $this->getManager()->getResultMap($nested);
-				$groupKey = $this->getResultMapGroupKey($nestedMap, $row);
+				$nestedMap=$this->getManager()->getResultMap($nested);
+				$groupKey=$this->getResultMapGroupKey($nestedMap, $row);
 
 				//add the node reference first
 				if(empty($parent))
 					$this->_groupBy->add($group, $groupKey, '');
 
 				//get the nested result mapping value
-				$value = $this->fillResultMap($nested, $row, $groupKey);
+				$value=$this->fillResultMap($nested, $row, $groupKey);
 
 				//add it to the object tree graph
-				$groupObject = array('object'=>$value, 'property' => $property->getProperty());
+				$groupObject=array('object'=>$value, 'property' => $property->getProperty());
 				if(empty($parent))
 					$this->_groupBy->add($group, $groupKey, $groupObject);
 				else
@@ -727,7 +724,7 @@ 
 	 */
 	protected function getResultMapGroupKey($resultMap, $row)
 	{
-		$groupBy = $resultMap->getGroupBy();
+		$groupBy=$resultMap->getGroupBy();
 		if(isset($row[$groupBy]))
 			return $resultMap->getID().$row[$groupBy];
 		else
@@ -748,12 +745,12 @@ 
 			$resultObject='';
 
 		if($resultMap!==null)
-			$result = $this->fillArrayResultMap($resultMap, $row, $resultObject);
+			$result=$this->fillArrayResultMap($resultMap, $row, $resultObject);
 		else
-			$result = $row;
+			$result=$row;
 
 		//if scalar result types
-		if(count($result) == 1 && ($type = gettype($resultObject))!= 'array')
+		if(count($result)==1 && ($type=gettype($resultObject))!='array')
 			return $this->getScalarResult($result, $type);
 		else
 			return $result;
@@ -768,14 +765,14 @@ 
 	 */
 	protected function fillArrayResultMap($resultMap, $row, $resultObject)
 	{
-		$result = array();
+		$result=array();
 		$registry=$this->getManager()->getTypeHandlers();
 		foreach($resultMap->getColumns() as $column)
 		{
 			if(($column->getType()===null)
 				&& ($resultObject!==null) && !is_object($resultObject))
 			$column->setType(gettype($resultObject));
-			$result[$column->getProperty()] = $column->getPropertyValue($registry,$row);
+			$result[$column->getProperty()]=$column->getPropertyValue($registry, $row);
 		}
 		return $result;
 	}
@@ -788,7 +785,7 @@ 
 	 */
 	protected function getScalarResult($result, $type)
 	{
-		$scalar = array_shift($result);
+		$scalar=array_shift($result);
 		settype($scalar, $type);
 		return $scalar;
 	}
@@ -802,23 +799,23 @@ 
 	 */
 	protected function setObjectProperty($resultMap, $property, $row, &$resultObject)
 	{
-		$select = $property->getSelect();
-		$key = $property->getProperty();
-		$nested = $property->getNestedResultMap();
+		$select=$property->getSelect();
+		$key=$property->getProperty();
+		$nested=$property->getNestedResultMap();
 		$registry=$this->getManager()->getTypeHandlers();
-		if($key === '')
+		if($key==='')
 		{
-			$resultObject = $property->getPropertyValue($registry,$row);
+			$resultObject=$property->getPropertyValue($registry, $row);
 		}
-		else if(strlen($select) == 0 && ($nested===null))
+		else if(strlen($select)==0 && ($nested===null))
 		{
-			$value = $property->getPropertyValue($registry,$row);
+			$value=$property->getPropertyValue($registry, $row);
 
-			$this->_IsRowDataFound = $this->_IsRowDataFound || ($value != null);
+			$this->_IsRowDataFound=$this->_IsRowDataFound || ($value!=null);
 			if(is_array($resultObject) || is_object($resultObject))
 				TPropertyAccess::set($resultObject, $key, $value);
 			else
-				$resultObject = $value;
+				$resultObject=$value;
 		}
 		else if($nested!==null)
 		{
@@ -831,9 +828,9 @@ 
 			}
 			else
 			{
-				$obj = $nested->createInstanceOfResult($this->getManager()->getTypeHandlers());
-				if($this->fillPropertyWithResultMap($nested, $row, $obj) == false)
-					$obj = null;
+				$obj=$nested->createInstanceOfResult($this->getManager()->getTypeHandlers());
+				if($this->fillPropertyWithResultMap($nested, $row, $obj)==false)
+					$obj=null;
 				TPropertyAccess::set($resultObject, $key, $obj);
 			}
 		}
@@ -853,9 +850,9 @@ 
 	 */
 	protected function enquequePostSelect($select, $resultMap, $property, $row, $resultObject)
 	{
-		$statement = $this->getManager()->getMappedStatement($select);
-		$key = $this->getPostSelectKeys($resultMap, $property, $row);
-		$postSelect = new TPostSelectBinding;
+		$statement=$this->getManager()->getMappedStatement($select);
+		$key=$this->getPostSelectKeys($resultMap, $property, $row);
+		$postSelect=new TPostSelectBinding;
 		$postSelect->setStatement($statement);
 		$postSelect->setResultObject($resultObject);
 		$postSelect->setResultProperty($property);
@@ -863,10 +860,10 @@ 
 
 		if($property->instanceOfListType($resultObject))
 		{
-			$values = null;
+			$values=null;
 			if($property->getLazyLoad())
 			{
-				$values = TLazyLoadList::newInstance($statement, $key,
+				$values=TLazyLoadList::newInstance($statement, $key,
 								$resultObject, $property->getProperty());
 				TPropertyAccess::set($resultObject, $property->getProperty(), $values);
 			}
@@ -879,7 +876,7 @@ 
 			$postSelect->setMethod(self::QUERY_FOR_OBJECT);
 
 		if(!$property->getLazyLoad())
-			$this->_selectQueue[] = $postSelect;
+			$this->_selectQueue[]=$postSelect;
 	}
 
 	/**
@@ -889,23 +886,23 @@ 
 	 * @param array current row data.
 	 * @return array list of primary key values.
 	 */
-	protected function getPostSelectKeys($resultMap, $property,$row)
+	protected function getPostSelectKeys($resultMap, $property, $row)
 	{
-		$value = $property->getColumn();
-		if(is_int(strpos($value.',',0)) || is_int(strpos($value, '=',0)))
+		$value=$property->getColumn();
+		if(is_int(strpos($value.',', 0)) || is_int(strpos($value, '=', 0)))
 		{
-			$keys = array();
+			$keys=array();
 			foreach(explode(',', $value) as $entry)
 			{
-				$pair =explode('=',$entry);
-				$keys[trim($pair[0])] = $row[trim($pair[1])];
+				$pair=explode('=', $entry);
+				$keys[trim($pair[0])]=$row[trim($pair[1])];
 			}
 			return $keys;
 		}
 		else
 		{
 			$registry=$this->getManager()->getTypeHandlers();
-			return $property->getPropertyValue($registry,$row);
+			return $property->getPropertyValue($registry, $row);
 		}
 	}
 
@@ -918,28 +915,28 @@ 
 	 */
 	protected function fillPropertyWithResultMap($resultMap, $row, &$resultObject)
 	{
-		$dataFound = false;
+		$dataFound=false;
 		foreach($resultMap->getColumns() as $property)
 		{
-			$this->_IsRowDataFound = false;
+			$this->_IsRowDataFound=false;
 			$this->setObjectProperty($resultMap, $property, $row, $resultObject);
-			$dataFound = $dataFound || $this->_IsRowDataFound;
+			$dataFound=$dataFound || $this->_IsRowDataFound;
 		}
-		$this->_IsRowDataFound = $dataFound;
+		$this->_IsRowDataFound=$dataFound;
 		return $dataFound;
 	}
 
 	public function __wakeup()
 	{
-		if (is_null($this->_selectQueue)) $this->_selectQueue = array();
+		if(is_null($this->_selectQueue)) $this->_selectQueue=array();
 	}
 
 	public function __sleep()
 	{
-		$exprops = array(); $cn = __CLASS__;
-		if (!count($this->_selectQueue)) $exprops[] = "\0$cn\0_selectQueue";
-		if (is_null($this->_groupBy)) $exprops[] = "\0$cn\0_groupBy";
-		if (!$this->_IsRowDataFound) $exprops[] = "\0$cn\0_IsRowDataFound";
-		return array_diff(parent::__sleep(),$exprops);
+		$exprops=array(); $cn=__CLASS__;
+		if(!count($this->_selectQueue)) $exprops[]="\0$cn\0_selectQueue";
+		if(is_null($this->_groupBy)) $exprops[]="\0$cn\0_groupBy";
+		if(!$this->_IsRowDataFound) $exprops[]="\0$cn\0_IsRowDataFound";
+		return array_diff(parent::__sleep(), $exprops);
 	}
 }
\ No newline at end of file

framework/Data/SqlMap/Statements/TPostSelectBinding.php

Spacing +10 added lines, -10 removed lines

@@ -26,18 +26,18 @@
 	private $_keys=null;
 	private $_method=TMappedStatement::QUERY_FOR_LIST;
 
-	public function getStatement(){ return $this->_statement; }
-	public function setStatement($value){ $this->_statement = $value; }
+	public function getStatement() { return $this->_statement; }
+	public function setStatement($value) { $this->_statement=$value; }
 
-	public function getResultProperty(){ return $this->_property; }
-	public function setResultProperty($value){ $this->_property = $value; }
+	public function getResultProperty() { return $this->_property; }
+	public function setResultProperty($value) { $this->_property=$value; }
 
-	public function getResultObject(){ return $this->_resultObject; }
-	public function setResultObject($value){ $this->_resultObject = $value; }
+	public function getResultObject() { return $this->_resultObject; }
+	public function setResultObject($value) { $this->_resultObject=$value; }
 
-	public function getKeys(){ return $this->_keys; }
-	public function setKeys($value){ $this->_keys = $value; }
+	public function getKeys() { return $this->_keys; }
+	public function setKeys($value) { $this->_keys=$value; }
 
-	public function getMethod(){ return $this->_method; }
-	public function setMethod($value){ $this->_method = $value; }
+	public function getMethod() { return $this->_method; }
+	public function setMethod($value) { $this->_method=$value; }
 }
\ No newline at end of file

framework/Data/SqlMap/Statements/TResultSetMapItemParameter.php

Spacing +4 added lines, -4 removed lines

@@ -27,10 +27,10 @@
 
 	public function __construct($key, $value, $parameter, &$map)
 	{
-		$this->_key = $key;
-		$this->_value = $value;
-		$this->_parameterObject = $parameter;
-		$this->_map = &$map;
+		$this->_key=$key;
+		$this->_value=$value;
+		$this->_parameterObject=$parameter;
+		$this->_map=&$map;
 	}
 
 	public function getKey()

framework/Data/SqlMap/Configuration/TSqlMapSelectKey.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
  */
 class TSqlMapSelectKey extends TSqlMapStatement
 {
-	private $_type = 'post';
+	private $_type='post';
 	private $_property;
 
 	/**
@@ -38,7 +38,7 @@ 
 	 */
 	public function setType($value)
 	{
-		$this->_type = strtolower($value) == 'post' ? 'post' : 'pre';
+		$this->_type=strtolower($value)=='post' ? 'post' : 'pre';
 	}
 
 	/**
@@ -54,7 +54,7 @@ 
 	 */
 	public function setProperty($value)
 	{
-		$this->_property = $value;
+		$this->_property=$value;
 	}
 
 	/**
@@ -70,6 +70,6 @@ 
 	 */
 	public function getIsAfter()
 	{
-		return $this->_type == 'post';
+		return $this->_type=='post';
 	}
 }
\ No newline at end of file

framework/Data/SqlMap/Configuration/TSubMap.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->_value = $value;
+		$this->_value=$value;
 	}
 
 	/**
@@ -58,6 +58,6 @@ 
 	 */
 	public function setResultMapping($value)
 	{
-		$this->_resultMapping = $value;
+		$this->_resultMapping=$value;
 	}
 }
\ No newline at end of file