Remove wasSuccessful method from query results

src/Driver/Cassandra/Cassandra.php

@@ -221,7 +221,7 @@ public function query(Query $query): QueryResult
 
         $rawQueryResult = $this->rawQuery($queryString);
 
-        $result = new QueryResult((bool)$rawQueryResult);
+        $result = new QueryResult();
         $result->setQueryString($queryString);
         foreach ($rawQueryResult as $resultRow) {
             /** @var class-string<ModelInterface> $modelClass */

src/Driver/Mysqli/Mysqli.php

@@ -117,7 +117,7 @@ protected function connect(): void
      * @throws MysqlConnectionFailedException if connecting to the mysql database fails
      * @throws MysqlException if a mysql error occurs while executing the query
      */
-    protected function rawQuery(string $query): mysqli_result|bool
+    protected function rawQuery(string $query): mysqli_result|true
     {
         $this->connect();
         $result = mysqli_query($this->connection, $query);
@@ -239,7 +239,7 @@ public function query(Query $query): QueryResult
 
         $rawQueryResult = $this->rawQuery($queryString);
 
-        $result = new QueryResult((bool)$rawQueryResult);
+        $result = new QueryResult();
         $result->setQueryString($queryString);
         if ($query instanceof UpdateQuery || $query instanceof DeleteQuery) {
             $result->setAffectedRows(mysqli_affected_rows($this->connection));

src/Driver/OpenSearch/OpenSearch.php

@@ -219,7 +219,7 @@ public function search(Search $search): SearchResult
             throw new SerializeException("Received invalid search response from OpenSearch");
         }
 
-        $result = new SearchResult(true);
+        $result = new SearchResult();
         if (isset($response->took) && is_int($response->took)) {
             $result->setSearchTime($response->took);
         }

src/Driver/Test/TestTable.php

@@ -66,7 +66,7 @@ public function query(Query $query): QueryResult
             $entries = $this->groupAndAggregateEntries($clonedEntries, $query->getGroup(), $query->getFields());
         }
 
-        $queryResult = new QueryResult(true);
+        $queryResult = new QueryResult();
         foreach ($entries as $entry) {
             if ($query instanceof SelectQuery) {
                 /** @var class-string<ModelInterface> $modelClass */

src/GenericModel.php

@@ -468,21 +468,19 @@ public static function query(Query $query): QueryResult
             $driver = static::getDriverRegistry()->getDriver($queryableDriver);
             $result = $driver->query($query);
 
-            if ($result->wasSuccessful() && $query instanceof SelectQuery) {
+            if ($query instanceof SelectQuery) {
                 break;
             }
 
-            if (!$query instanceof SelectQuery) {
-                $results[] = $result;
-            }
+            $results[] = $result;
         }
 
         if ($result === false) {
             throw new BadMethodCallException("You can't query the model if no queryable driver is available.");
         }
 
         if (static::$registry) {
-            if ($query instanceof SelectQuery && $result->wasSuccessful() && $query->shouldSaveResultsToRegistry()) {
+            if ($query instanceof SelectQuery && $query->shouldSaveResultsToRegistry()) {
                 foreach ($result as $model) {
                     if ($model->getId() === null) {
                         continue;
@@ -495,7 +493,7 @@ public static function query(Query $query): QueryResult
         if ($query instanceof SelectQuery || count($results) === 1) {
             return $result;
         } else {
-            return new QueryResultCollection(true, $results);
+            return new QueryResultCollection($results);
         }
     }
 
@@ -513,6 +511,7 @@ public static function query(Query $query): QueryResult
      * @param array|GroupField[]|string[]|null $group
      * @param bool $saveResultsToRegistry Whether results of this query should be saved in the model registry.
      * @return QueryResult<static>|static[]
+     * @throws ModelException
      * @noinspection PhpDocSignatureInspection
      */
     public static function select(null|WhereCondition|array|WhereGroup $where = null,
@@ -527,14 +526,12 @@ public static function select(null|WhereCondition|array|WhereGroup $where = null
 
     /**
      * @param WhereCondition|array|WhereGroup|null $where
-     * @return int|null
+     * @return int
+     * @throws ModelException
      */
-    public static function count(null|WhereCondition|array|WhereGroup $where = null): ?int
+    public static function count(null|WhereCondition|array|WhereGroup $where = null): int
     {
         $result = static::select(where: $where, fields: [new CountField()]);
-        if (!$result->wasSuccessful()) {
-            return null;
-        }
         if (count($result) === 0) {
             return 0;
         }
@@ -666,28 +663,35 @@ public function set(array $data): QueryResult
      *
      * @param Search $search
      * @return SearchResult<static>
+     * @throws ModelException
      */
     public static function search(Search $search): SearchResult
     {
         $search->setModelClassName(static::class);
 
         $result = false;
+        $lastException = null;
         foreach (static::getSearchableDrivers() as $searchableDriver) {
             /** @var SearchableInterface $driver */
             $driver = static::getDriverRegistry()->getDriver($searchableDriver);
-            $result = $driver->search($search);
-
-            if ($result->wasSuccessful()) {
-                break;
+            try {
+                $result = $driver->search($search);
+            } catch (ModelException $e) {
+                $lastException = $e;
             }
         }
 
         if ($result === false) {
             throw new BadMethodCallException("You can't search the model if no searchable driver is available.");
         }
 
+        if ($lastException !== null) {
+            /** @var ModelException|null $lastException */
+            throw $lastException;
+        }
+
         if (static::$registry) {
-            if ($result->wasSuccessful() && count($result) > 0) {
+            if (count($result) > 0) {
                 foreach ($result as $model) {
                     if ($model->getId() === null) {
                         continue;

src/ModelCollection.php

@@ -14,9 +14,19 @@
  */
 class ModelCollection implements Iterator, Countable, ArrayAccess
 {
-    protected array $models = [];
+    protected array $models;
     protected int $iterator = 0;
 
+    /**
+     * ModelCollection constructor.
+     *
+     * @param TModel[] $models
+     */
+    public function __construct(array $models = [])
+    {
+        $this->models = $models;
+    }
+
     /**
      * Add a model
      *
@@ -131,4 +141,4 @@ public function offsetUnset(mixed $offset): void
         unset($this->models[$offset]);
     }
 
-}
+}

src/Query/QueryResult.php

@@ -2,17 +2,17 @@
 
 namespace Aternos\Model\Query;
 
-use Aternos\Model\ModelCollectionResult;
+use Aternos\Model\ModelCollection;
 use Aternos\Model\ModelInterface;
 
 /**
  * Class QueryResult
  *
  * @template TModel of ModelInterface
- * @extends ModelCollectionResult<TModel>
+ * @extends ModelCollection<TModel>
  * @package Aternos\Model\Query
  */
-class QueryResult extends ModelCollectionResult
+class QueryResult extends ModelCollection
 {
     /**
      * Raw query string that was executed
@@ -33,13 +33,12 @@ class QueryResult extends ModelCollectionResult
     /**
      * QueryResult constructor.
      *
-     * @param bool $success
-     * @param TModel[] $result
+     * @param TModel[] $models
      * @param string|null $queryString
      */
-    public function __construct(bool $success, array $result = [], ?string $queryString = null)
+    public function __construct(array $models = [], ?string $queryString = null)
     {
-        parent::__construct($success, $result);
+        parent::__construct($models);
         $this->queryString = $queryString;
     }
 
@@ -84,4 +83,4 @@ public function setAffectedRows(?int $affectedRows): static
         }
         return $this;
     }
-}
+}

src/Query/QueryResultCollection.php

@@ -18,25 +18,11 @@ class QueryResultCollection extends QueryResult
 
     /**
      * QueryResultCollection constructor.
-     * @param bool $success
-     * @param array|QueryResult[] $result
+     * @param array|QueryResult[] $models
      * @param string|null $queryString
      */
-    public function __construct(bool $success, $result = [], ?string $queryString = null)
+    public function __construct($models = [], ?string $queryString = null)
     {
-        parent::__construct($success, $result, $queryString);
+        parent::__construct($models, $queryString);
     }
-
-    /**
-     * @return bool
-     */
-    public function wasSuccessful(): bool
-    {
-        foreach ($this->models as $result) {
-            if (!$result->wasSuccessful()) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
+}

src/Search/SearchResult.php

@@ -2,16 +2,16 @@
 
 namespace Aternos\Model\Search;
 
-use Aternos\Model\ModelCollectionResult;
+use Aternos\Model\ModelCollection;
 use Aternos\Model\ModelInterface;
 
 /**
  * Class SearchResult
  * @template TModel of ModelInterface
- * @extends ModelCollectionResult<TModel>
+ * @extends ModelCollection<TModel>
  * @package Aternos\Model\Search
  */
-class SearchResult extends ModelCollectionResult
+class SearchResult extends ModelCollection
 {
     protected ?int $searchTime = null;
     protected ?int $totalCount = null;