Skip to content

Simplify ON keyword check to only needed case #652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
predictor2718 wants to merge 2 commits into
base: 5.11.x
Choose a base branch
from
Open

Simplify ON keyword check to only needed case #652

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
166fa16
Simplify ON keyword check to only needed case
predictor2718 Apr 13, 2026
0bd40a6
Fix phpcs: place if condition on single line
predictor2718 Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Components/SetOperation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,17 @@ public static function parse(Parser $parser, TokensList $list, array $options =
$commaLastSeenAt = $token;
}
} elseif ($state === 1) {
// Reserved keywords like ON are valid values in SET statements
// (e.g. SET @@sql_log_bin = ON). Try parsing as expression first,
// and if that fails, accept reserved keywords as literal values.
$tmp = Expression::parse(
$parser,
$list,
['breakOnAlias' => true]
);
if ($tmp === null) {
if ($tmp === null && $token->type === Token::TYPE_KEYWORD && $token->value === 'ON') {
$tmp = new Expression($token->token);
} elseif ($tmp === null) {
$parser->error('Missing expression.', $token);
break;
}
Expand Down