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: 2 additions & 1 deletion src/Processor/Expression/FunctionEvaluator.php
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,8 @@ private static function sqlSum(
$sum = 0;

if (!$result->rows) {
if ($expr instanceof FunctionExpression) {
$isQueryWithoutFromClause = empty($result->columns);
if ($expr instanceof FunctionExpression && $isQueryWithoutFromClause) {
return self::evaluate($conn, $scope, $expr, [], $result);
}

Expand Down
26 changes: 23 additions & 3 deletions tests/EndToEndTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
namespace Vimeo\MysqlEngine\Tests;

use PDOException;
use Vimeo\MysqlEngine\Parser\Token;
use Vimeo\MysqlEngine\Query\Expression\ColumnExpression;
use Vimeo\MysqlEngine\TokenType;

class EndToEndTest extends \PHPUnit\Framework\TestCase
{
Expand All @@ -13,6 +10,29 @@ public function tearDown() : void
\Vimeo\MysqlEngine\Server::reset();
}

public function testSumWithEmptyResultSetReturnsNull()
{
$sql = "
SELECT
SUM(
IF(
id > 1,
0,
1
)
)
FROM
video_game_characters
WHERE
id > 100;
";

$pdo = self::getConnectionToFullDB();
$query= $pdo->query($sql);

$this->assertNull($query->fetchColumn());
}

public function testSelectEmptyResults()
{
$pdo = self::getConnectionToFullDB();
Expand Down
Loading