Skip to content

Commit

Permalink
Fix numericAggregate on eloquent builder (#53880)
Browse files Browse the repository at this point in the history
  • Loading branch information
AmirRezaM75 authored Dec 13, 2024
1 parent 275539a commit fadcb3d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/Illuminate/Database/Eloquent/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ class Builder implements BuilderContract
'insertorignoreusing',
'max',
'min',
'numericaggregate',
'raw',
'rawvalue',
'sum',
Expand Down
15 changes: 15 additions & 0 deletions tests/Integration/Database/EloquentAggregateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,21 @@ public function testSum()
$this->assertEquals(0, $result);
$this->assertEquals(2, UserAggregateTest::query()->where('c', '>', 1)->sum('balance'));
}

public function testNumericAggregate()
{
UserAggregateTest::create(['c' => 1, 'name' => 'name-1', 'balance' => 40]);
UserAggregateTest::create(['c' => 2, 'name' => 'name-2', 'balance' => -40]);
UserAggregateTest::create(['c' => 3, 'name' => 'name-3', 'balance' => 0]);
UserAggregateTest::create(['c' => 4, 'name' => 'name-4', 'balance' => 20]);
UserAggregateTest::create(['c' => 5, 'name' => 'name-5', 'balance' => null]);

$this->assertEquals(20, UserAggregateTest::query()->numericAggregate('sum', ['balance']));
// When calculating the average, rows with NULL values are excluded
$this->assertEquals(5, UserAggregateTest::query()->numericAggregate('avg', ['balance']));
$this->assertEquals(40, UserAggregateTest::query()->numericAggregate('max', ['balance']));
$this->assertEquals(-40, UserAggregateTest::query()->numericAggregate('min', ['balance']));
}
}

class UserAggregateTest extends Model
Expand Down

0 comments on commit fadcb3d

Please sign in to comment.