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
3 changes: 1 addition & 2 deletions src/Driver/Mysqli/Mysqli.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
Query\Generator\SQL,
Query\Query,
Query\QueryResult,
Query\UpdateQuery
};
Query\UpdateQuery};
use mysqli_result;
use mysqli_sql_exception;

Expand Down
1 change: 0 additions & 1 deletion src/Driver/Mysqli/MysqliException.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Aternos\Model\Driver\Mysqli;

use Aternos\Model\ModelException;
use mysqli;
use mysqli_sql_exception;
use Throwable;

Expand Down
2 changes: 1 addition & 1 deletion src/Driver/Test/TestDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public function save(ModelInterface $model): bool
$table = $this->getTable($model::getName());
$entry = $table->getById($model->getId(), $model::getIdField());
if (!$entry) {
$table->addEntry((new TestTableEntry(get_object_vars($model))));
$table->addEntry(new TestTableEntry(get_object_vars($model)));
return true;
}
$entry->applyFromModel($model);
Expand Down
7 changes: 1 addition & 6 deletions src/Driver/Test/TestTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,7 @@ public function clear(): static
*/
public function getById(mixed $id, string $idField = "id"): ?TestTableEntry
{
foreach ($this->entries as $entry) {
if ($entry->hasId($id, $idField)) {
return $entry;
}
}
return null;
return array_find($this->entries, fn($entry) => $entry->hasId($id, $idField));
}

/**
Expand Down
7 changes: 1 addition & 6 deletions src/Driver/Test/TestTableEntryGroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,7 @@ public function addEntry(TestTableEntry $entry): static
*/
public function matches(TestTableEntry $entry): bool
{
foreach ($this->conditions as $key => $value) {
if ($entry[$key] !== $value) {
return false;
}
}
return true;
return array_all($this->conditions, fn($value, $key) => $entry[$key] === $value);
}

/**
Expand Down
1 change: 0 additions & 1 deletion src/Query/Generator/SQL.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
UpdateQuery,
WhereCondition,
WhereGroup};
use UnexpectedValueException;

/**
* Class SQL
Expand Down
4 changes: 3 additions & 1 deletion test/src/TestModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

namespace Aternos\Model\Test\Src;

class TestModel extends \Aternos\Model\GenericModel
use Aternos\Model\GenericModel;

class TestModel extends GenericModel
{
public mixed $id;
public ?string $text = null;
Expand Down
18 changes: 9 additions & 9 deletions test/tests/SQLTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ public function testSelectOrder()
public function testSelectCount()
{
$query = new SelectQuery(fields: [
(new SelectField('number'))->setFunction(AggregateFunction::COUNT),
new SelectField('number')->setFunction(AggregateFunction::COUNT),
]);
$query->modelClassName = TestModel::class;

Expand All @@ -201,7 +201,7 @@ public function testSelectCount()
public function testSelectCountStar()
{
$query = new SelectQuery(fields: [
(new SelectField('*'))->setFunction(AggregateFunction::COUNT),
new SelectField('*')->setFunction(AggregateFunction::COUNT),
]);
$query->modelClassName = TestModel::class;

Expand All @@ -211,7 +211,7 @@ public function testSelectCountStar()
public function testSelectSum()
{
$query = new SelectQuery(fields: [
(new SelectField('number'))->setFunction(AggregateFunction::SUM),
new SelectField('number')->setFunction(AggregateFunction::SUM),
]);
$query->modelClassName = TestModel::class;

Expand All @@ -221,7 +221,7 @@ public function testSelectSum()
public function testSelectSumAs()
{
$query = new SelectQuery(fields: [
(new SelectField('number'))->setFunction(AggregateFunction::SUM)->setAlias('sum'),
new SelectField('number')->setFunction(AggregateFunction::SUM)->setAlias('sum'),
]);
$query->modelClassName = TestModel::class;

Expand All @@ -231,7 +231,7 @@ public function testSelectSumAs()
public function testSelectAVG()
{
$query = new SelectQuery(fields: [
(new SelectField('number'))->setFunction(AggregateFunction::AVERAGE),
new SelectField('number')->setFunction(AggregateFunction::AVERAGE),
]);
$query->modelClassName = TestModel::class;

Expand All @@ -241,7 +241,7 @@ public function testSelectAVG()
public function testSelectMin()
{
$query = new SelectQuery(fields: [
(new SelectField('number'))->setFunction(AggregateFunction::MIN),
new SelectField('number')->setFunction(AggregateFunction::MIN),
]);
$query->modelClassName = TestModel::class;

Expand All @@ -251,7 +251,7 @@ public function testSelectMin()
public function testSelectMinAs()
{
$query = new SelectQuery(fields: [
(new SelectField('number'))->setFunction(AggregateFunction::MIN)->setAlias('minNumber'),
new SelectField('number')->setFunction(AggregateFunction::MIN)->setAlias('minNumber'),
]);
$query->modelClassName = TestModel::class;

Expand All @@ -261,7 +261,7 @@ public function testSelectMinAs()
public function testSelectMax()
{
$query = new SelectQuery(fields: [
(new SelectField('number'))->setFunction(AggregateFunction::MAX),
new SelectField('number')->setFunction(AggregateFunction::MAX),
]);
$query->modelClassName = TestModel::class;

Expand All @@ -271,7 +271,7 @@ public function testSelectMax()
public function testSelectMaxAs()
{
$query = new SelectQuery(fields: [
(new SelectField('number'))->setFunction(AggregateFunction::MAX)->setAlias('maxNumber'),
new SelectField('number')->setFunction(AggregateFunction::MAX)->setAlias('maxNumber'),
]);
$query->modelClassName = TestModel::class;

Expand Down
6 changes: 3 additions & 3 deletions test/tests/TestDriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ public function testSelectSum(): void
public function testSelectAverage(): void
{
$result = TestModel::select(fields: [
(new SelectField("number"))
new SelectField("number")
->setAlias("average")
->setFunction(AggregateFunction::AVERAGE)]);
$this->assertEquals(4.5, $result[0]->getField("average"));
Expand Down Expand Up @@ -426,7 +426,7 @@ public function testSelectGroupSum(): void
$model->save();

$models = TestModel::select(fields: [
(new SumField("number"))->setAlias("sum"),
new SumField("number")->setAlias("sum"),
new SelectField("number")],
group: ["number"]
);
Expand All @@ -449,7 +449,7 @@ public function testSelectGroupAverage(): void
$model->save();

$models = TestModel::select(fields: [
(new SelectField("number"))
new SelectField("number")
->setAlias("average")
->setFunction(AggregateFunction::AVERAGE),
new SelectField("number"),
Expand Down
Loading