Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/GenericModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
use Aternos\Model\Query\DeleteQuery;
use Aternos\Model\Query\GroupField;
use Aternos\Model\Query\Limit;
use Aternos\Model\Query\MultiQueryResult;
use Aternos\Model\Query\Query;
use Aternos\Model\Query\QueryResult;
use Aternos\Model\Query\QueryResultCollection;
use Aternos\Model\Query\SelectQuery;
use Aternos\Model\Query\UpdateQuery;
use Aternos\Model\Query\WhereCondition;
Expand Down Expand Up @@ -480,10 +480,11 @@ public static function query(Query $query): QueryResult
$results = [];
$lastException = null;
foreach ($drivers as $queryableDriver) {
/** @var QueryableInterface $driver */
/** @var QueryableInterface|DriverInterface $driver */
$driver = static::getDriverRegistry()->getDriver($queryableDriver);
try {
$result = $driver->query($query);
$result->setDriver($driver);

if ($query instanceof SelectQuery) {
$lastException = null;
Expand Down Expand Up @@ -519,7 +520,7 @@ public static function query(Query $query): QueryResult
if ($query instanceof SelectQuery || count($results) === 1) {
return $result;
} else {
return new QueryResultCollection($results);
return new MultiQueryResult()->addQueryResults($results);
}
}

Expand Down
51 changes: 51 additions & 0 deletions src/Query/MultiQueryResult.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?php

namespace Aternos\Model\Query;

class MultiQueryResult extends QueryResult
{
/** @var QueryResult[] */
protected array $queryResults = [];

/**
* Add a QueryResult
*
* If a query string or affected rows are set in the QueryResult, they will overwrite the ones in this MultiQueryResult
*
* @param QueryResult $queryResult
* @return $this
*/
public function addQueryResult(QueryResult $queryResult): static
{
$this->queryResults[] = $queryResult;
if ($queryResult->getQueryString() !== null) {
$this->setQueryString($queryResult->getQueryString());
}
if ($queryResult->getQueryString() !== null) {
$this->setAffectedRows($queryResult->getAffectedRows());
}
return $this;
}

/**
* @param QueryResult[] $queryResults
* @return $this
*/
public function addQueryResults(array $queryResults): static
{
foreach ($queryResults as $queryResult) {
if ($queryResult instanceof QueryResult) {
$this->addQueryResult($queryResult);
}
}
return $this;
}

/**
* @return QueryResult[]
*/
public function getAllQueryResults(): array
{
return $this->queryResults;
}
}
21 changes: 21 additions & 0 deletions src/Query/QueryResult.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Aternos\Model\Query;

use Aternos\Model\Driver\DriverInterface;
use Aternos\Model\ModelCollection;
use Aternos\Model\ModelInterface;

Expand All @@ -14,6 +15,8 @@
*/
class QueryResult extends ModelCollection
{
protected ?DriverInterface $driver = null;

/**
* Raw query string that was executed
*
Expand Down Expand Up @@ -83,4 +86,22 @@ public function setAffectedRows(?int $affectedRows): static
}
return $this;
}

/**
* @param DriverInterface $driver
* @return $this
*/
public function setDriver(DriverInterface $driver): static
{
$this->driver = $driver;
return $this;
}

/**
* @return DriverInterface|null
*/
public function getDriver(): ?DriverInterface
{
return $this->driver;
}
}
28 changes: 0 additions & 28 deletions src/Query/QueryResultCollection.php

This file was deleted.

Loading