Selection: iterator skips missing rows after refetch

Author: Unlink

src/Database/Table/ActiveRow.php

@@ -323,7 +323,7 @@ public function accessColumn($key, $selectColumn = TRUE)
 	{
 		if ($this->table->accessColumn($key, $selectColumn) && !$this->dataRefreshed) {
 			if (!isset($this->table[$this->getSignature()])) {
-				throw new Nette\InvalidStateException('Database refetch failed; row does not exist!');
+				throw new Nette\InvalidStateException("Database refetch failed; row with signature '{$this->getSignature()}' does not exist!");
 			}
 			$this->data = $this->table[$this->getSignature()]->data;
 			$this->dataRefreshed = TRUE;

src/Database/Table/Selection.php

@@ -1012,7 +1012,9 @@ public function key()
 
 	public function next()
 	{
-		next($this->keys);
+		do {
+			next($this->keys);
+		} while (($key = current($this->keys)) !== FALSE && !isset($this->data[$key]));
 	}
 
 

tests/Database/Table/bugs/deleteCacheBug.phpt

@@ -21,7 +21,7 @@ test(function () use ($context) {
 			$book->delete();
 			Assert::exception(function () use ($book) {
 				$book->toArray();
-			}, Nette\InvalidStateException::class, 'Database refetch failed; row does not exist!');
+			}, Nette\InvalidStateException::class, "Database refetch failed; row with signature '1' does not exist!");
 		}
 
 		$booksSelection->__destruct();
@@ -42,13 +42,35 @@ test(function () use ($context) {
 
 			Assert::exception(function () use ($book) {
 				$book->toArray();
-			}, Nette\InvalidStateException::class, 'Database refetch failed; row does not exist!');
+			}, Nette\InvalidStateException::class, "Database refetch failed; row with signature '2' does not exist!");
 		}
 
 		$booksSelection->__destruct();
 	}
 });
 
+test(function () use ($context) {
+	$books = [];
+	for ($i=0; $i<2; $i++) {
+		$booksSelection = $context->table('book')->where('id IN ?', [3,4]);
+		foreach ($booksSelection as $book) {
+			$books[] = $book->id;
+
+			if ($i === 1) {
+				$context->query('DELETE FROM book WHERE id = 4'); //After refetch second row is skipped
+				$book->title; // cause refetch
+			}
+
+			$booksSelection->__destruct();
+		}
+	}
+	Assert::same([
+		3,
+		4,
+		3,
+	], $books);
+});
+
 test(function () use ($context) {
 
 	for ($i=0; $i<2; $i++) {
@@ -60,7 +82,7 @@ test(function () use ($context) {
 			$context->query('DELETE FROM book WHERE id = 3');
 			Assert::exception(function () use ($book) {
 				$book->title;
-			}, Nette\InvalidStateException::class, 'Database refetch failed; row does not exist!');
+			}, Nette\InvalidStateException::class, "Database refetch failed; row with signature '3' does not exist!");
 		}
 
 		$booksSelection->__destruct();