Skip to content

Fix #306 - ":=" was not recognized as an operator just like "=" #486

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

Merged
merged 2 commits into from
Jun 29, 2023
Merged

Fix #306 - ":=" was not recognized as an operator just like "=" #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3e700c
Add test case about using SET statement with ":=" operator.
niconoe- Jun 21, 2023
0076001
Fix operator ":=" not recognized on SET statement.
niconoe- Jun 21, 2023
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
5 changes: 3 additions & 2 deletions src/Components/SetOperation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use PhpMyAdmin\SqlParser\TokensList;

use function implode;
use function in_array;
use function is_array;
use function trim;

Expand Down Expand Up @@ -63,7 +64,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
* Below are the states of the parser.
*
* 0 ---------------------[ col_name ]--------------------> 0
* 0 ------------------------[ = ]------------------------> 1
* 0 ---------------------[ = or := ]---------------------> 1
* 1 -----------------------[ value ]---------------------> 1
* 1 ------------------------[ , ]------------------------> 0
*
Expand Down Expand Up @@ -104,7 +105,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
}

if ($state === 0) {
if ($token->token === '=') {
if (in_array($token->token, ['=', ':='], true)) {
$state = 1;
} elseif ($token->value !== ',') {
$expr->column .= $token->token;
Expand Down
1 change: 1 addition & 0 deletions tests/Parser/SetStatementTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public function setProvider(): array
['parser/parseSetError1'],
['parser/parseInsertIntoSet'],
['parser/parseSetVariable'],
['parser/parseSetVariable2'],
['parser/parseSetGlobalVariable'],
];
}
Expand Down
1 change: 1 addition & 0 deletions tests/data/parser/parseSetVariable2.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SET @foo := 1
133 changes: 133 additions & 0 deletions tests/data/parser/parseSetVariable2.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
{
"query": "SET @foo := 1\n",
"lexer": {
"@type": "PhpMyAdmin\\SqlParser\\Lexer",
"str": "SET @foo := 1\n",
"len": 14,
"last": 14,
"list": {
"@type": "PhpMyAdmin\\SqlParser\\TokensList",
"tokens": [
{
"@type": "PhpMyAdmin\\SqlParser\\Token",
"token": "SET",
"value": "SET",
"keyword": "SET",
"type": 1,
"flags": 11,
"position": 0
},
{
"@type": "PhpMyAdmin\\SqlParser\\Token",
"token": " ",
"value": " ",
"keyword": null,
"type": 3,
"flags": 0,
"position": 3
},
{
"@type": "PhpMyAdmin\\SqlParser\\Token",
"token": "@foo",
"value": "foo",
"keyword": null,
"type": 8,
"flags": 1,
"position": 4
},
{
"@type": "PhpMyAdmin\\SqlParser\\Token",
"token": " ",
"value": " ",
"keyword": null,
"type": 3,
"flags": 0,
"position": 8
},
{
"@type": "PhpMyAdmin\\SqlParser\\Token",
"token": ":=",
"value": ":=",
"keyword": null,
"type": 2,
"flags": 8,
"position": 9
},
{
"@type": "PhpMyAdmin\\SqlParser\\Token",
"token": " ",
"value": " ",
"keyword": null,
"type": 3,
"flags": 0,
"position": 11
},
{
"@type": "PhpMyAdmin\\SqlParser\\Token",
"token": "1",
"value": 1,
"keyword": null,
"type": 6,
"flags": 0,
"position": 12
},
{
"@type": "PhpMyAdmin\\SqlParser\\Token",
"token": "\n",
"value": " ",
"keyword": null,
"type": 3,
"flags": 0,
"position": 13
},
{
"@type": "PhpMyAdmin\\SqlParser\\Token",
"token": null,
"value": null,
"keyword": null,
"type": 9,
"flags": 0,
"position": null
}
],
"count": 9,
"idx": 9
},
"delimiter": ";",
"delimiterLen": 1,
"strict": false,
"errors": []
},
"parser": {
"@type": "PhpMyAdmin\\SqlParser\\Parser",
"list": {
"@type": "@1"
},
"statements": [
{
"@type": "PhpMyAdmin\\SqlParser\\Statements\\SetStatement",
"options": {
"@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray",
"options": []
},
"end_options": null,
"set": [
{
"@type": "PhpMyAdmin\\SqlParser\\Components\\SetOperation",
"column": "@foo",
"value": "1"
}
],
"first": 0,
"last": 7
}
],
"brackets": 0,
"strict": false,
"errors": []
},
"errors": {
"lexer": [],
"parser": []
}
}