FIX Check all classes and don't rely on connection_attempted()#11807
Merged
emteknetnz merged 1 commit intosilverstripe:6from Jul 29, 2025
Merged
Conversation
GuySartorelli
commented
Jul 28, 2025
|
|
||
| // Don't check again if we already know the db is ready for this class. | ||
| if (!empty($this->tableReadyClasses[$class])) { | ||
| if (!empty($this->tableReadyClasses[$required])) { |
Member
Author
There was a problem hiding this comment.
Oops! This was only ever checking the same class over and over instead of the one in the loop 😅
The unit tests were incorrect so it looked like things were working as expected.
DB::is_active() will lazy-connect to the database if we haven't done so already. That means the DB::connection_attempted() check was actually preventing us from connecting to the database even though we were ready to do so. There's no need to add that check after checking is_active() because it'll either be active (and we're good to go) or not (and we should say we're not ready).
d199c9c to
f502863
Compare
emteknetnz
approved these changes
Jul 29, 2025
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
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.
DB::is_active()will lazy-connect to the database if we haven't done so already. That means theDB::connection_attempted()check was actually preventing us from connecting to the database even though we were ready to do so.There's no need to add that check after checking
DB::is_active()because it'll either be active (and we're good to go) or not (and we should say we're not ready).Issues
DataObjectSchema::tablesAreReadyForClass()check is faulty (6branch only) #11806