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/Illuminate/Database/Query/Grammars/Grammar.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Illuminate\Database\Query\Grammars;

use Illuminate\Contracts\Database\Query\Expression;
use Illuminate\Database\Concerns\CompilesJsonPaths;
use Illuminate\Database\Grammar as BaseGrammar;
use Illuminate\Database\Query\Builder;
Expand Down Expand Up @@ -246,7 +247,7 @@ protected function concatenateWhereClauses($query, $sql)
*/
protected function whereRaw(Builder $query, $where)
{
return $where['sql'];
return $where['sql'] instanceof Expression ? $where['sql']->getValue($this) : $where['sql'];
}

/**
Expand Down
44 changes: 44 additions & 0 deletions tests/Database/DatabaseQueryGrammarTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php

namespace Illuminate\Tests\Database;

use Illuminate\Database\Query\Builder;
use Illuminate\Database\Query\Expression;
use Illuminate\Database\Query\Grammars\Grammar;
use Mockery as m;
use PHPUnit\Framework\TestCase;
use ReflectionClass;

class DatabaseQueryGrammarTest extends TestCase
{
protected function tearDown(): void
{
m::close();
}

public function testWhereRawReturnsStringWhenExpressionPassed()
{
$builder = m::mock(Builder::class);
$grammar = new Grammar;
$reflection = new ReflectionClass($grammar);
$method = $reflection->getMethod('whereRaw');
$expressionArray = ['sql' => new Expression('select * from "users"')];

$rawQuery = $method->invoke($grammar, $builder, $expressionArray);

$this->assertSame('select * from "users"', $rawQuery);
}

public function testWhereRawReturnsStringWhenStringPassed()
{
$builder = m::mock(Builder::class);
$grammar = new Grammar;
$reflection = new ReflectionClass($grammar);
$method = $reflection->getMethod('whereRaw');
$stringArray = ['sql' => 'select * from "users"'];

$rawQuery = $method->invoke($grammar, $builder, $stringArray);

$this->assertSame('select * from "users"', $rawQuery);
}
}