Commit f1ffd1b

authored

Merge 4.8 into 5.0 (#3120)

2 parents 457971b + aaf3982 commit f1ffd1bCopy full SHA for f1ffd1b

File tree

+14

-7

lines changed

+14

-7

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,17 @@ All notable changes to this project will be documented in this file.`
`5`	`5`
`6`	`6`	* BREAKING CHANGE Use `id` as an alias for `_id` in commands and queries for compatibility with Eloquent packages by @GromNaN in [#3040](https://github.com/mongodb/laravel-mongodb/pull/3040)
`7`	`7`
`8`		`-## [4.8.0] - next`
	`8`	`+## [4.8.0] - 2024年08月27日`
`9`	`9`
`10`	`10`	* Add `Query\Builder::incrementEach()` and `decrementEach()` methods by @SmallRuralDog in [#2550](https://github.com/mongodb/laravel-mongodb/pull/2550)
`11`	`11`	* Add `Query\Builder::whereLike()` and `whereNotLike()` methods by @GromNaN in [#3108](https://github.com/mongodb/laravel-mongodb/pull/3108)
`12`	`12`	* Deprecate `Connection::collection()` and `Schema\Builder::collection()` methods by @GromNaN in [#3062](https://github.com/mongodb/laravel-mongodb/pull/3062)
`13`	`13`	* Deprecate `Model::$collection` property to customize collection name. Use `$table` instead by @GromNaN in [#3064](https://github.com/mongodb/laravel-mongodb/pull/3064)
`14`	`14`
	`15`	`+## [4.7.2] - 2024年08月27日`
	`16`	`+`
	`17`	+* Add `Query\Builder::upsert()` method with a single document by @GromNaN in [#3100](https://github.com/mongodb/laravel-mongodb/pull/3100)
	`18`	`+`
`15`	`19`	`## [4.7.1] - 2024年07月25日`
`16`	`20`
`17`	`21`	* Fix registration of `BusServiceProvider` for compatibility with Horizon by @GromNaN in [#3071](https://github.com/mongodb/laravel-mongodb/pull/3071)

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -746,6 +746,11 @@ public function upsert(array $values, $uniqueBy, $update = null): int`
`746`	`746`	`return 0;`
`747`	`747`	`}`
`748`	`748`
	`749`	`+ // Single document provided`
	`750`	`+ if (! array_is_list($values)) {`
	`751`	`+ $values = [$values];`
	`752`	`+ }`
	`753`	`+`
`749`	`754`	`$this->applyBeforeQueryCallbacks();`
`750`	`755`
`751`	`756`	`$options = $this->inheritConnectionOptions();`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -168,9 +168,8 @@ public function testUpsert()`
`168`	`168`	`$this->assertSame('bar2', User::where('email', 'foo')->first()->name);`
`169`	`169`
`170`	`170`	`// If no update fields are specified, all fields are updated`
`171`		`- $result = User::upsert([`
`172`		`- ['email' => 'foo', 'name' => 'bar3'],`
`173`		`- ], 'email');`
	`171`	`+ // Test single document update`
	`172`	`+ $result = User::upsert(['email' => 'foo', 'name' => 'bar3'], 'email');`
`174`	`173`
`175`	`174`	`$this->assertSame(1, $result);`
`176`	`175`	`$this->assertSame(2, User::count());`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -633,9 +633,8 @@ public function testUpsert()`
`633`	`633`	`$this->assertSame('bar2', DB::table('users')->where('email', 'foo')->first()['name']);`
`634`	`634`
`635`	`635`	`// If no update fields are specified, all fields are updated`
`636`		`- $result = DB::table('users')->upsert([`
`637`		`- ['email' => 'foo', 'name' => 'bar3'],`
`638`		`- ], 'email');`
	`636`	`+ // Test single document update`
	`637`	`+ $result = DB::table('users')->upsert(['email' => 'foo', 'name' => 'bar3'], 'email');`
`639`	`638`
`640`	`639`	`$this->assertSame(1, $result);`
`641`	`640`	`$this->assertSame(2, DB::table('users')->count());`

Comments

(0)