Commit 103f1a9

michalsnpaulbalandan

and

authored

fix: prevent non-shared DB instances from polluting shared cache (#9679)

* fix: prevent non-shared DB instances from polluting shared cache * Update user_guide_src/source/changelogs/v4.6.4.rst Co-authored-by: John Paul E. Balandan, CPA <paulbalandan@gmail.com> --------- Co-authored-by: John Paul E. Balandan, CPA <paulbalandan@gmail.com>

1 parent 509ed87 commit 103f1a9Copy full SHA for 103f1a9

File tree

3 files changed

+23

-1

lines changed

system/Database
- Config.php
tests/system/Database/Live
- ConnectTest.php
user_guide_src/source/changelogs
- v4.6.4.rst

3 files changed

+23

-1

lines changed

`‎system/Database/Config.php`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,9 @@ public static function connect($group = null, bool $getShared = true)`
`81`	`81`
`82`	`82`	`$connection = static::$factory->load($config, $group);`
`83`	`83`
`84`		`- static::$instances[$group] = $connection;`
	`84`	`+ if ($getShared) {`
	`85`	`+ static::$instances[$group] = $connection;`
	`86`	`+ }`
`85`	`87`
`86`	`88`	`return $connection;`
`87`	`89`	`}`

`‎tests/system/Database/Live/ConnectTest.php`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -115,4 +115,22 @@ public function testConnectWithFailover(): void`
`115`	`115`
`116`	`116`	`$this->assertGreaterThanOrEqual(0, count($db1->listTables()));`
`117`	`117`	`}`
	`118`	`+`
	`119`	`+ public function testNonSharedInstanceDoesNotAffectSharedInstances(): void`
	`120`	`+ {`
	`121`	`+ $firstSharedDb = Database::connect('tests');`
	`122`	`+ $originalDebugValue = (bool) self::getPrivateProperty($firstSharedDb, 'DBDebug');`
	`123`	`+`
	`124`	`+ $nonSharedDb = Database::connect('tests', false);`
	`125`	`+ self::setPrivateProperty($nonSharedDb, 'DBDebug', ! $originalDebugValue);`
	`126`	`+`
	`127`	`+ $secondSharedDb = Database::connect('tests');`
	`128`	`+`
	`129`	`+ $this->assertSame($firstSharedDb, $secondSharedDb);`
	`130`	`+ $this->assertNotSame($firstSharedDb, $nonSharedDb);`
	`131`	`+`
	`132`	`+ $this->assertSame($originalDebugValue, self::getPrivateProperty($firstSharedDb, 'DBDebug'));`
	`133`	`+ $this->assertSame($originalDebugValue, self::getPrivateProperty($secondSharedDb, 'DBDebug'));`
	`134`	`+ $this->assertSame(! $originalDebugValue, self::getPrivateProperty($nonSharedDb, 'DBDebug'));`
	`135`	`+ }`
`118`	`136`	`}`

`‎user_guide_src/source/changelogs/v4.6.4.rst`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ Deprecations`
`30`	`30`	`Bugs Fixed`
`31`	`31`	`**********`
`32`	`32`
	`33`	+- Database: Fixed a bug in ``Database::connect()`` which was causing to store non-shared connection instances in shared cache.
	`34`	`+`
`33`	`35`	`See the repo's`
`34`	`36`	`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
`35`	`37`	`for a complete list of bugs fixed.`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 103f1a9

File tree

3 files changed

3 files changed

`‎system/Database/Config.php`

`‎tests/system/Database/Live/ConnectTest.php`

`‎user_guide_src/source/changelogs/v4.6.4.rst`

0 commit comments