tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Fixing SQLQueryTest failures on PHPUnit 3.7.30

Browse Source
This commit is contained in:
Sean Harvey 2014-02-10 13:32:39 +13:00
parent 51a936345a
commit c322cb2d65
2 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/Query.php
View File

@ -249,4 +249,4 @@ abstract class SS_Query implements Iterator {
* @return array
*/
abstract public function seek($rowNum);
}
}

56
tests/model/SQLQueryTest.php
View File

@ -358,19 +358,28 @@ class SQLQueryTest extends SapphireTest {
$query->setFrom('"SQLQueryTest_DO"');
$query->setOrderBy('"Name"');
$result = $query->firstRow()->execute();
$this->assertCount(1, $result);
$records = array();
foreach($result as $row) {
$this->assertEquals('Object 1', $row['Name']);
$records[] = $row;
}
$this->assertCount(1, $records);
$this->assertEquals('Object 1', $records[0]['Name']);
// Test first from empty sequence
$query = new SQLQuery();
$query->setFrom('"SQLQueryTest_DO"');
$query->setOrderBy('"Name"');
$query->setWhere(array("\"Name\" = 'Nonexistent Object'"));
$result = $query->firstRow()->execute();
$this->assertCount(0, $result);
$records = array();
foreach($result as $row) {
$records[] = $row;
}
$this->assertCount(0, $records);
// Test that given the last item, the 'first' in this list matches the last
$query = new SQLQuery();
@ -378,10 +387,14 @@ class SQLQueryTest extends SapphireTest {
$query->setOrderBy('"Name"');
$query->setLimit(1, 1);
$result = $query->firstRow()->execute();
$this->assertCount(1, $result);
$records = array();
foreach($result as $row) {
$this->assertEquals('Object 2', $row['Name']);
$records[] = $row;
}
$this->assertCount(1, $records);
$this->assertEquals('Object 2', $records[0]['Name']);
}
public function testSelectLast() {
@ -391,11 +404,14 @@ class SQLQueryTest extends SapphireTest {
$query->setFrom('"SQLQueryTest_DO"');
$query->setOrderBy('"Name"');
$result = $query->lastRow()->execute();
$this->assertCount(1, $result);
$records = array();
foreach($result as $row) {
$this->assertEquals('Object 2', $row['Name']);
$records[] = $row;
}
$this->assertCount(1, $records);
$this->assertEquals('Object 2', $records[0]['Name']);
// Test last from empty sequence
$query = new SQLQuery();
@ -403,20 +419,30 @@ class SQLQueryTest extends SapphireTest {
$query->setOrderBy('"Name"');
$query->setWhere(array("\"Name\" = 'Nonexistent Object'"));
$result = $query->lastRow()->execute();
$this->assertCount(0, $result);
$records = array();
foreach($result as $row) {
$records[] = $row;
}
$this->assertCount(0, $records);
// Test that given the first item, the 'last' in this list matches the first
$query = new SQLQuery();
$query->setFrom('"SQLQueryTest_DO"');
$query->setOrderBy('"Name"');
$query->setLimit(1);
$result = $query->lastRow()->execute();
$this->assertCount(1, $result);
$records = array();
foreach($result as $row) {
$this->assertEquals('Object 1', $row['Name']);
$records[] = $row;
}
$this->assertCount(1, $records);
$this->assertEquals('Object 1', $records[0]['Name']);
}
/**
* Tests aggregate() function
*/