Fixed #458

3 files changed, 16 insertions, 16 deletions

diff --git a/framework/Data/SqlMap/Statements/TCachingStatement.php b/framework/Data/SqlMap/Statements/TCachingStatement.php
index 051a8ec3..4d39993d 100644
--- a/framework/Data/SqlMap/Statements/TCachingStatement.php
+++ b/framework/Data/SqlMap/Statements/TCachingStatement.php
@@ -42,15 +42,15 @@ class TCachingStatement implements IMappedStatement
 		return $this->_mappedStatement->getManager();

 	}

 

-	public function executeQueryForMap($connection, $parameter,$keyProperty, $valueProperty=null, $delegate=null)

+	public function executeQueryForMap($connection, $parameter,$keyProperty, $valueProperty=null,  $skip=-1, $max=-1,$delegate=null)

 	{

-		$sql = $this->createCommand($connection, $parameter);

-		$key = $this->getCacheKey(array(clone($sql), $keyProperty, $valueProperty));

+		$sql = $this->createCommand($connection, $parameter, $skip, $max);

+		$key = $this->getCacheKey(array(clone($sql), $keyProperty, $valueProperty,$skip, $max));

 		$map = $this->getStatement()->getCache()->get($key);

 		if(is_null($map))

 		{

 			$map = $this->_mappedStatement->runQueryForMap(

-				$connection, $parameter, $sql, $keyProperty, $valueProperty, $delegate);

+				$connection, $parameter, $sql, $keyProperty, $valueProperty,  $delegate);

 			$this->getStatement()->getCache()->set($key, $map);

 		}

 		return $map;

@@ -68,13 +68,13 @@ class TCachingStatement implements IMappedStatement
 

 	public function executeQueryForList($connection, $parameter, $result=null, $skip=-1, $max=-1, $delegate=null)

 	{

-		$sql = $this->createCommand($connection, $parameter);

+		$sql = $this->createCommand($connection, $parameter, $skip, $max);

 		$key = $this->getCacheKey(array(clone($sql), $parameter, $skip, $max));

 		$list = $this->getStatement()->getCache()->get($key);

 		if(is_null($list))

 		{

 			$list = $this->_mappedStatement->runQueryForList(

-				$connection, $parameter, $sql, $result, $skip, $max, $delegate);

+				$connection, $parameter, $sql, $result, $delegate);

 			$this->getStatement()->getCache()->set($key, $list);

 		}

 		return $list;

@@ -99,10 +99,10 @@ class TCachingStatement implements IMappedStatement
 		return $cacheKey->getHash();

 	}

 

-	protected function createCommand($connection, $parameter)

+	protected function createCommand($connection, $parameter, $skip=null, $max=null)

 	{

 		return $this->_mappedStatement->getCommand()->create($this->getManager(),

-					$connection, $this->getStatement(), $parameter);

+					$connection, $this->getStatement(), $parameter, $skip, $max);

 	}

 }

 

diff --git a/framework/Data/SqlMap/Statements/TMappedStatement.php b/framework/Data/SqlMap/Statements/TMappedStatement.php
index db02857f..3b935e7f 100644
--- a/framework/Data/SqlMap/Statements/TMappedStatement.php
+++ b/framework/Data/SqlMap/Statements/TMappedStatement.php
@@ -204,7 +204,7 @@ class TMappedStatement extends TComponent implements IMappedStatement
 	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);

-		return $this->runQueryForList($connection, $parameter, $sql, $result, $skip, $max, $delegate);

+		return $this->runQueryForList($connection, $parameter, $sql, $result, $delegate);

 	}

 

 	/**

@@ -223,7 +223,7 @@ class TMappedStatement extends TComponent implements IMappedStatement
 	 * @return array a list of result objects

 	 * @see executeQueryForList()

 	 */

-	public function runQueryForList($connection, $parameter, $sql, $result, $skip=-1, $max=-1, $delegate=null)

+	public function runQueryForList($connection, $parameter, $sql, $result, $delegate=null)

 	{

 		$registry=$this->getManager()->getTypeHandlers();

 		$list = $result instanceof ArrayAccess ? $result :

@@ -274,9 +274,9 @@ class TMappedStatement extends TComponent implements IMappedStatement
 	 * @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, $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);

+		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter, $skip, $max);

 		return $this->runQueryForMap($connection, $parameter, $sql, $keyProperty, $valueProperty, $delegate);

 	}

 

diff --git a/framework/Data/SqlMap/TSqlMapGateway.php b/framework/Data/SqlMap/TSqlMapGateway.php
index b2819740..51a13a82 100644
--- a/framework/Data/SqlMap/TSqlMapGateway.php
+++ b/framework/Data/SqlMap/TSqlMapGateway.php
@@ -163,10 +163,10 @@ class TSqlMapGateway extends TComponent
 	 * @param string The property of the result object to be used as the value.

 	 * @return TMap Array object containing the rows keyed by keyProperty.

 	 */

-	public function queryForMap($statementName, $parameter=null, $keyProperty=null, $valueProperty=null)

+	public function queryForMap($statementName, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)

 	{

 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);

-		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty);

+		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max);

 	}

 

 	/**

@@ -182,10 +182,10 @@ class TSqlMapGateway extends TComponent
 	 * @param string The property of the result object to be used as the value.

 	 * @return TMap Array object containing the rows keyed by keyProperty.

 	 */

-	public function queryForMapWithRowDelegate($statementName, $delegate, $parameter=null, $keyProperty=null, $valueProperty=null)

+	public function queryForMapWithRowDelegate($statementName, $delegate, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)

 	{

 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);

-		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $delegate);

+		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max, $delegate);

 	}

 

 	/**