Commit f3bb644

authored

Merge 4.8 into 5.0 (#3116)

2 parents fbed3dc + f24b464 commit f3bb644Copy full SHA for f3bb644

File tree

+25

-0

lines changed

+25

-0

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,12 @@ public function getDriverName()`
`294`	`294`	`return 'mongodb';`
`295`	`295`	`}`
`296`	`296`
	`297`	`+ /** @inheritdoc */`
	`298`	`+ public function getDriverTitle()`
	`299`	`+ {`
	`300`	`+ return 'MongoDB';`
	`301`	`+ }`
	`302`	`+`
`297`	`303`	`/** @inheritdoc */`
`298`	`304`	`protected function getDefaultPostProcessor()`
`299`	`305`	`{`
`@@ -320,6 +326,14 @@ public function setDatabase(Database $db)`
`320`	`326`	`$this->db = $db;`
`321`	`327`	`}`
`322`	`328`
	`329`	`+ /** @inheritdoc */`
	`330`	`+ public function threadCount()`
	`331`	`+ {`
	`332`	`+ $status = $this->db->command(['serverStatus' => 1])->toArray();`
	`333`	`+`
	`334`	`+ return $status[0]['connections']['current'];`
	`335`	`+ }`
	`336`	`+`
`323`	`337`	`/**`
`324`	`338`	`* Dynamically pass methods to the connection.`
`325`	`339`	`*`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,9 @@ public function testConnection()`
`25`	`25`	`{`
`26`	`26`	`$connection = DB::connection('mongodb');`
`27`	`27`	`$this->assertInstanceOf(Connection::class, $connection);`
	`28`	`+`
	`29`	`+ $this->assertSame('mongodb', $connection->getDriverName());`
	`30`	`+ $this->assertSame('MongoDB', $connection->getDriverTitle());`
`28`	`31`	`}`
`29`	`32`
`30`	`33`	`public function testReconnect()`
`@@ -305,4 +308,12 @@ public function testServerVersion()`
`305`	`308`	`$version = DB::connection('mongodb')->getServerVersion();`
`306`	`309`	`$this->assertIsString($version);`
`307`	`310`	`}`
	`311`	`+`
	`312`	`+ public function testThreadsCount()`
	`313`	`+ {`
	`314`	`+ $threads = DB::connection('mongodb')->threadCount();`
	`315`	`+`
	`316`	`+ $this->assertIsInt($threads);`
	`317`	`+ $this->assertGreaterThanOrEqual(1, $threads);`
	`318`	`+ }`
`308`	`319`	`}`

Comments

(0)