mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use fetch method instead of fetchRow because fetchRow is only an owncloud internal alias that exists purely for compability

This commit is contained in:
Bernhard Posselt 2014-05-14 01:07:19 +02:00
parent 512373fadf
commit 9e36c33104
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/public/appframework/db/mapper.php
View File

@ -225,12 +225,12 @@ abstract class Mapper {
*/
protected function findOneQuery($sql, array $params=array(), $limit=null, $offset=null){
$result = $this->execute($sql, $params, $limit, $offset);
$row = $result->fetchRow();
$row = $result->fetch();
if($row === false || $row === null){
throw new DoesNotExistException('No matching entry found');
}
$row2 = $result->fetchRow();
$row2 = $result->fetch();
//MDB2 returns null, PDO and doctrine false when no row is available
if( ! ($row2 === false || $row2 === null )) {
throw new MultipleObjectsReturnedException('More than one result');
@ -264,7 +264,7 @@ abstract class Mapper {
$entities = array();
while($row = $result->fetchRow()){
while($row = $result->fetch()){
$entities[] = $this->mapRowToEntity($row);
}

6
tests/lib/appframework/db/MapperTestUtility.php
View File

@ -51,7 +51,7 @@ abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase {
->getMock();
$this->query = $this->getMock('Query', array('execute', 'bindValue'));
$this->pdoResult = $this->getMock('Result', array('fetchRow'));
$this->pdoResult = $this->getMock('Result', array('fetch'));
$this->queryAt = 0;
$this->prepareAt = 0;
$this->iterators = array();
@ -65,7 +65,7 @@ abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase {
* @param array $arguments the expected arguments for the prepare query
* method
* @param array $returnRows the rows that should be returned for the result
* of the database query. If not provided, it wont be assumed that fetchRow
* of the database query. If not provided, it wont be assumed that fetch
* will be called on the result
*/
protected function setMapperResult($sql, $arguments=array(), $returnRows=array(),
@ -77,7 +77,7 @@ abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase {
$fetchAt = $this->fetchAt;
$this->pdoResult->expects($this->any())
->method('fetchRow')
->method('fetch')
->will($this->returnCallback(
function() use ($iterators, $fetchAt){
$iterator = $iterators[$fetchAt];