Skip to content

[10.x] Fix an error when $query->from is of type Illuminate\Database\Query\Expression #49937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[10.x] Fix an error when $query->from is of type Illuminate\Database\Query\Expression #49937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Query/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ protected function prependDatabaseNameIfCrossDatabaseQuery($query)
$this->getConnection()->getDatabaseName()) {
$databaseName = $query->getConnection()->getDatabaseName();

if (! str_starts_with($query->from, $databaseName) && ! str_contains($query->from, '.')) {
if (is_string($query->from) && ! str_starts_with($query->from, $databaseName) && ! str_contains($query->from, '.')) {
$query->from($databaseName.'.'.$query->from);
}
}
Expand Down
34 changes: 34 additions & 0 deletions tests/Database/DatabaseQueryBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2504,6 +2504,40 @@ public function testJoinSubWithPrefix()
$this->assertSame('select * from "prefix_users" inner join (select * from "contacts") as "prefix_sub" on "prefix_users"."id" = "prefix_sub"."id"', $builder->toSql());
}

public function testJoinSubWithCrossDatabaseQuery()
{
// Create another database connection and builder.
$connection2 = m::mock(ConnectionInterface::class);
$connection2->shouldReceive('getDatabaseName')->andReturn('database2');
$builder2 = new Builder($connection2, new Grammar, m::mock(Processor::class));

// Create subquery that use another databases.
// Case1: 'from' property is string
$subquery = $builder2
->from('posts')
->select('user_id, title');

$builder = $this->getBuilder();
$builder->from('users')->joinSub($subquery, 'sub', function ($join) {
$join->on('users.id', '=', 'sub.user_id');
});

$this->assertSame('select * from "users" inner join (select "user_id, title" from "database2"."posts") as "sub" on "users"."id" = "sub"."user_id"', $builder->toSql());

// Create subquery that use another databases.
// Case2: 'from' property is Expression
$subquery = $builder2
->from(new Raw('database2.posts')) // set Expression
->select('user_id, title');

$builder = $this->getBuilder();
$builder->from('users')->joinSub($subquery, 'sub', function ($join) {
$join->on('users.id', '=', 'sub.user_id');
});

$this->assertSame('select * from "users" inner join (select "user_id, title" from database2.posts) as "sub" on "users"."id" = "sub"."user_id"', $builder->toSql());
}

public function testLeftJoinSub()
{
$builder = $this->getBuilder();
Expand Down