Skip to content

Get base query before update so that scopes are applied #1799

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.

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

Merged
merged 1 commit into from
Aug 1, 2019
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
2 changes: 1 addition & 1 deletion src/Jenssegers/Mongodb/Eloquent/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function update(array $values, array $options = [])
return 1;
}

return $this->query->update($this->addUpdatedAtColumn($values), $options);
return $this->toBase()->update($this->addUpdatedAtColumn($values), $options);
}

/**
Expand Down
18 changes: 18 additions & 0 deletions tests/QueryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public function setUp(): void
public function tearDown(): void
{
User::truncate();
Scoped::truncate();
parent::tearDown();
}

Expand Down Expand Up @@ -309,4 +310,21 @@ public function testPaginate()
$this->assertEquals(9, $results->total());
$this->assertEquals(1, $results->currentPage());
}

public function testUpdate()
{
$this->assertEquals(1, User::where(['name' => 'John Doe'])->update(['name' => 'Jim Morrison']));
$this->assertEquals(1, User::where(['name' => 'Jim Morrison'])->count());

Scoped::create(['favorite' => true]);
Scoped::create(['favorite' => false]);

$this->assertCount(1, Scoped::get());
$this->assertEquals(1, Scoped::query()->update(['name' => 'Johnny']));
$this->assertCount(1, Scoped::withoutGlobalScopes()->where(['name' => 'Johnny'])->get());

$this->assertCount(2, Scoped::withoutGlobalScopes()->get());
$this->assertEquals(2, Scoped::withoutGlobalScopes()->update(['name' => 'Jimmy']));
$this->assertCount(2, Scoped::withoutGlobalScopes()->where(['name' => 'Jimmy'])->get());
}
}
20 changes: 20 additions & 0 deletions tests/models/Scoped.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
use Jenssegers\Mongodb\Eloquent\Builder;

class Scoped extends Eloquent
{
protected $connection = 'mongodb';
protected $collection = 'scoped';
protected $fillable = ['name', 'favorite'];

protected static function boot()
{
parent::boot();

static::addGlobalScope('favorite', function (Builder $builder) {
$builder->where('favorite', true);
});
}
}