Fix(Database): Ensure read/write settings correctly inherit shared config #18744
+37
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
A test, which makes sure the config is created as expected, would be highly appreciated 👍🏻 Also you can fix the code style issues if you execute |
|
I just checked the codebase and the Connection class is the only place, where we had |
fc95d2e to
f86d780
Compare
|
Thanks for the review! I've added a test to cover the fix and also ran cs-fix to correct the code style. |
LordSimal
approved these changes
Jun 16, 2025
ADmad
approved these changes
Jun 16, 2025
|
Surprised we didn't use any shared config values in other tests. |
|
Windows does not include the mysql driver so the test is failing. |
othercorey
reviewed
Jun 17, 2025
| public function testRoleConfigInheritance(): void | ||
| { | ||
| $config = [ | ||
| 'driver' => 'Cake\Database\Driver\Mysql', |
There was a problem hiding this comment.
Can you change this to sqlite to see if it passes on windows and add this skip line at the start of the test:
$this->skipIf(!extension_loaded('pdo_sqlite'), 'Skipping as SQLite extension is missing');
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Changes
Currently, in the
Database\Connection::createDrivers()method, if a configuration array is provided for thereadorwriteroles, it does not correctly inherit the values from the shared (default) configuration.For instance, if a user only specifies the
portfor thereadconnection, other essential parameters likehost,username, anddatabaseare not carried over from the shared config. This leads to a connection failure, contrary to the behavior described in the documentation.This issue stems from PHP's operator precedence, where the array union operator (
+) is evaluated before the null coalescing operator (??).Proposed Changes
This PR corrects this behavior by adding parentheses to the configuration merging logic.
The line is changed from:
$readConfig = $config['read'] ?? [] + $sharedConfig;To:
$readConfig = ($config['read'] ?? []) + $sharedConfig;This small but critical change ensures that the
readorwritespecific configuration is resolved first, and then the shared configuration is correctly applied as a fallback for any keys that were not specified.With this fix, users can define only the parameters they wish to override in the
readandwriteconfigurations, making the feature work as intended and documented.