Commit 6a8a2e3

authored

Merge 4.7 into 4.8 (#3117)

2 parents 500ae9b + 62f6449 commit 6a8a2e3Copy full SHA for 6a8a2e3

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
`@@ -1,13 +1,17 @@`
`1`	`1`	`# Changelog`
`2`	`2`	`All notable changes to this project will be documented in this file.`
`3`	`3`
`4`		`-## [4.8.0] - next`
	`4`	`+## [4.8.0] - 2024年08月27日`
`5`	`5`
`6`	`6`	* Add `Query\Builder::incrementEach()` and `decrementEach()` methods by @SmallRuralDog in [#2550](https://github.com/mongodb/laravel-mongodb/pull/2550)
`7`	`7`	* Add `Query\Builder::whereLike()` and `whereNotLike()` methods by @GromNaN in [#3108](https://github.com/mongodb/laravel-mongodb/pull/3108)
`8`	`8`	* Deprecate `Connection::collection()` and `Schema\Builder::collection()` methods by @GromNaN in [#3062](https://github.com/mongodb/laravel-mongodb/pull/3062)
`9`	`9`	* Deprecate `Model::$collection` property to customize collection name. Use `$table` instead by @GromNaN in [#3064](https://github.com/mongodb/laravel-mongodb/pull/3064)
`10`	`10`
	`11`	`+## [4.7.2] - 2024年08月27日`
	`12`	`+`
	`13`	+* Add `Query\Builder::upsert()` method with a single document by @GromNaN in [#3100](https://github.com/mongodb/laravel-mongodb/pull/3100)
	`14`	`+`
`11`	`15`	`## [4.7.1] - 2024年07月25日`
`12`	`16`
`13`	`17`	* 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
`@@ -732,6 +732,11 @@ public function upsert(array $values, $uniqueBy, $update = null): int`
`732`	`732`	`return 0;`
`733`	`733`	`}`
`734`	`734`
	`735`	`+ // Single document provided`
	`736`	`+ if (! array_is_list($values)) {`
	`737`	`+ $values = [$values];`
	`738`	`+ }`
	`739`	`+`
`735`	`740`	`$this->applyBeforeQueryCallbacks();`
`736`	`741`
`737`	`742`	`$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
`@@ -632,9 +632,8 @@ public function testUpsert()`
`632`	`632`	`$this->assertSame('bar2', DB::table('users')->where('email', 'foo')->first()['name']);`
`633`	`633`
`634`	`634`	`// If no update fields are specified, all fields are updated`
`635`		`- $result = DB::table('users')->upsert([`
`636`		`- ['email' => 'foo', 'name' => 'bar3'],`
`637`		`- ], 'email');`
	`635`	`+ // Test single document update`
	`636`	`+ $result = DB::table('users')->upsert(['email' => 'foo', 'name' => 'bar3'], 'email');`
`638`	`637`
`639`	`638`	`$this->assertSame(1, $result);`
`640`	`639`	`$this->assertSame(2, DB::table('users')->count());`

Comments

(0)