Fix replace clause of select statement with FOR UPDATE#555
Merged
MauricioFauth merged 1 commit intophpmyadmin:5.10.xfrom May 23, 2024
Merged
Fix replace clause of select statement with FOR UPDATE#555MauricioFauth merged 1 commit intophpmyadmin:5.10.xfrom
MauricioFauth merged 1 commit intophpmyadmin:5.10.xfrom
Conversation
FOR UPDATE and LOCK IN SHARE MODE are not in the clauses array, replace _END_OPTIONS with these values so they are found. Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
MoonE
commented
Apr 28, 2024
Comment on lines
+472
to
+474
| if (static::$END_OPTIONS !== []) { | ||
| array_push($clauses, ...array_keys(static::$END_OPTIONS)); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
When merging to master (PHP >= 7.3) the if is no long needed
Suggested change
| if (static::$END_OPTIONS !== []) { | |
| array_push($clauses, ...array_keys(static::$END_OPTIONS)); | |
| } | |
| array_push($clauses, ...array_keys(static::$END_OPTIONS)); |
williamdes
reviewed
May 9, 2024
| { | ||
| $clauses = []; | ||
| foreach (array_keys($this->getClauses()) as $key) { | ||
| if ($key === '_END_OPTIONS') { |
Member
There was a problem hiding this comment.
When merging in master, this key changes name
williamdes
approved these changes
May 9, 2024
MauricioFauth
approved these changes
May 23, 2024
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.
Fixes phpmyadmin/phpmyadmin#17190
Replaces _END_OPTIONS with the actual names from here:
sql-parser/src/Statements/SelectStatement.php
Lines 84 to 228 in 29f982a