tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-03 14:48:38 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9098 from sminnee/fix-9097

Browse Source 
FIX: Repeated iteration should return all records
This commit is contained in:
Guy Marriott 2019-07-03 17:03:36 +12:00 committed by GitHub
commit d0b4f61310
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ORM/Connect/MySQLQuery.php
View File

@ -48,8 +48,11 @@ class MySQLQuery extends Query
public function seek($row) public function seek($row)
{ {
if (is_object($this->handle)) { if (is_object($this->handle)) {
// Fix for https://github.com/silverstripe/silverstripe-framework/issues/9097 without breaking the seek() API
$this->handle->data_seek($row); $this->handle->data_seek($row);
return $this->nextRecord(); $result = $this->nextRecord();
$this->handle->data_seek($row);
return $result;
} }
return null; return null;
} }

11
src/ORM/Connect/MySQLStatement.php
View File

@ -105,8 +105,12 @@ class MySQLStatement extends Query
public function seek($row) public function seek($row)
{ {
$this->rowNum = $row - 1; $this->rowNum = $row - 1;
// Fix for https://github.com/silverstripe/silverstripe-framework/issues/9097 without breaking the seek() API
$this->statement->data_seek($row); $this->statement->data_seek($row);
return $this->next(); $result = $this->next();
$this->statement->data_seek($row);
return $result;
} }
public function numRecords() public function numRecords()
@ -132,9 +136,4 @@ class MySQLStatement extends Query
} }
return $row; return $row;
} }
public function rewind()
{
return $this->seek(0);
}
} }

5
src/ORM/Connect/Query.php
View File

@ -168,16 +168,15 @@ abstract class Query implements Iterator
* Iterator function implementation. Rewind the iterator to the first item and return it. * Iterator function implementation. Rewind the iterator to the first item and return it.
* Makes use of {@link seek()} and {@link numRecords()}, takes care of the plumbing. * Makes use of {@link seek()} and {@link numRecords()}, takes care of the plumbing.
* *
* @return array * @return void
*/ */
public function rewind() public function rewind()
{ {
if ($this->queryHasBegun && $this->numRecords() > 0) { if ($this->queryHasBegun && $this->numRecords() > 0) {
$this->queryHasBegun = false; $this->queryHasBegun = false;
$this->currentRecord = null; $this->currentRecord = null;
return $this->seek(0); $this->seek(0);
} }
return null;
} }
/** /**

21
tests/php/ORM/DatabaseTest.php
View File

@ -272,4 +272,25 @@ class DatabaseTest extends SapphireTest
$result = DB::query('SELECT TRUE')->first(); $result = DB::query('SELECT TRUE')->first();
$this->assertInternalType('int', reset($result)); $this->assertInternalType('int', reset($result));
} }
/**
* Test that repeated iteration of a query returns all records.
* See https://github.com/silverstripe/silverstripe-framework/issues/9097
*/
public function testRepeatedIteration()
{
$inputData = ['one', 'two', 'three', 'four'];
foreach ($inputData as $i => $text) {
$x = new MyObject();
$x->MyField = $text;
$x->MyInt = $i;
$x->write();
}
$query = DB::query('SELECT "MyInt", "MyField" FROM "DatabaseTest_MyObject" ORDER BY "MyInt"');
$this->assertEquals($inputData, $query->map());
$this->assertEquals($inputData, $query->map());
}
} }