prefer limit 2 and getRows()

atk4 · Jan 17, 2022 · 7cc0378 · 7cc0378
1 parent 25e7e22
commit 7cc0378
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Persistence/Array_.php b/src/Persistence/Array_.php
@@ -215,18 +215,20 @@ public function tryLoad(Model $model, $id): ?array
         if ($id === self::ID_LOAD_ONE || $id === self::ID_LOAD_ANY) {
             $action = $this->action($model, 'select');
 
-            $selectRow = $action->getRow();
-            if ($selectRow === null) {
+            $action->limit($id === self::ID_LOAD_ANY ? 1 : 2);
+
+            $rowsRaw = $action->getRows();
+            if (count($rowsRaw) === 0) {
                 return null;
-            } elseif ($id === self::ID_LOAD_ONE && $action->getRow() !== null) {
+            } elseif (count($rowsRaw) !== 1) {
                 throw (new Exception('Ambiguous conditions, more than one record can be loaded.'))
                     ->addMoreInfo('model', $model)
                     ->addMoreInfo('id', null);
             }
 
-            $id = $selectRow[$model->id_field];
+            $idRaw = reset($rowsRaw)[$model->id_field];
 
-            $row = $this->tryLoad($model, $id);
+            $row = $this->tryLoad($model, $idRaw);
 
             return $row;
         }

diff --git a/src/Persistence/Array_/Action.php b/src/Persistence/Array_/Action.php
@@ -296,6 +296,7 @@ public function getRows(): array
      */
     public function getRow(): ?array
     {
+        $this->generator->rewind(); // TODO alternatively allow to fetch only once
         $row = $this->generator->current();
         $this->generator->next();