[Cache][Lock] PdoAdapter/PdoStore minor cleanup
#52667
Merged
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
HypeMC
commented
Nov 21, 2023
HypeMC
commented
Nov 21, 2023
|
can you please rebase? |
5fae508 to
f5baad5
Compare
@nicolas-grekas Done |
Comment on lines
379
to
386
| return match (true) { | ||
| 'pgsql' === $driver && '42P01' === $code, | ||
| 'sqlite' === $driver && str_contains($exception->getMessage(), 'no such table:'), | ||
| 'oci' === $driver && 942 === $code, | ||
| 'sqlsrv' === $driver && 208 === $code, | ||
| 'mysql' === $driver && 1146 === $code => true, | ||
| default => false, | ||
| }; |
There was a problem hiding this comment.
Suggested change
| return match (true) { | |
| 'pgsql' === $driver && '42P01' === $code, | |
| 'sqlite' === $driver && str_contains($exception->getMessage(), 'no such table:'), | |
| 'oci' === $driver && 942 === $code, | |
| 'sqlsrv' === $driver && 208 === $code, | |
| 'mysql' === $driver && 1146 === $code => true, | |
| default => false, | |
| }; | |
| return match ($driver) { | |
| 'pgsql' => '42P01' === $code, | |
| 'sqlite' => str_contains($exception->getMessage(), 'no such table:'), | |
| 'oci' => 942 === $code, | |
| 'sqlsrv' => 208 === $code, | |
| 'mysql' => 1146 === $code, | |
| default => false, | |
| }; |
There was a problem hiding this comment.
Good point, looks much better this way, done.
Comment on lines
246
to
253
| return match (true) { | ||
| 'pgsql' === $driver && '42P01' === $code, | ||
| 'sqlite' === $driver && str_contains($exception->getMessage(), 'no such table:'), | ||
| 'oci' === $driver && 942 === $code, | ||
| 'sqlsrv' === $driver && 208 === $code, | ||
| 'mysql' === $driver && 1146 === $code => true, | ||
| default => false, | ||
| }; |
There was a problem hiding this comment.
return match ($driver) {
'pgsql' => '42P01' === $code,
'sqlite' => str_contains($exception->getMessage(), 'no such table:'),
'oci' => 942 === $code,
'sqlsrv' => 208 === $code,
'mysql' => 1146 === $code,
default => false,
};
f5baad5 to
45e17d5
Compare
|
Thank you @HypeMC. |
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.
Follow up to #52459.
Basically some code cleanup such as using
matchinstead ofswitch+ a minor sync between thePdoAdapterandPdoStore.I've targeted 6.4 since this is just a minor code cleanup, but I can switch to 7.1 if needed.