FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge branch '5.11.x' · phpmyadmin/sql-parser@8db6524 · GitHub

/ sql-parser Public

Commit 8db6524

Browse files
williamdes
committed
Merge branch '5.11.x'
2 parents 2ce9a41 + 2142141 commit 8db6524

6 files changed

Lines changed: 128 additions & 10 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212

1313
- Add Translator::setLocale() method (#599)
1414

15+
# [5.10.3] - YYYY-MM-DD
16+
17+
### Fixed
18+
19+
- Add "RECURSIVE" on build() for "WITH RECURSIVE" on the WithStatement class (#605)
20+
1521
## [5.10.2] - 2024-12-05
1622

1723
### Added

‎phpstan-baseline.neon‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -716,22 +716,22 @@ parameters:
716716
path: src/Parsers/OptionsArrays.php
717717

718718
-
719-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\:\\:\\$options \\(array\\<int, array\\{name\\: string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|string\\>\\) does not accept non\\-empty\\-array\\<int\\|string, array\\{name\\: bool\\|float\\|int\\|string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|string\\>\\.$#"
719+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\:\\:\\$options \\(array\\<int, array\\{name\\: string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|string\\>\\) does not accept non\\-empty\\-array\\<array\\{name\\: bool\\|float\\|int\\|string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|string\\>\\.$#"
720720
count: 2
721721
path: src/Parsers/OptionsArrays.php
722722

723723
-
724-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\:\\:\\$options \\(array\\<int, array\\{name\\: string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|string\\>\\) does not accept non\\-empty\\-array\\<int\\|string, array\\{name\\: string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|bool\\|float\\|int\\|string\\>\\.$#"
724+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\:\\:\\$options \\(array\\<int, array\\{name\\: string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|string\\>\\) does not accept non\\-empty\\-array\\<array\\{name\\: string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|bool\\|float\\|int\\|string\\>\\.$#"
725725
count: 1
726726
path: src/Parsers/OptionsArrays.php
727727

728728
-
729-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\:\\:\\$options \\(array\\<int, array\\{name\\: string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|string\\>\\) does not accept non\\-empty\\-array\\<int\\|string, array\\{name\\: string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|string\\>\\.$#"
729+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\:\\:\\$options \\(array\\<int, array\\{name\\: string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|string\\>\\) does not accept non\\-empty\\-array\\<array\\{name\\: string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|string\\>\\.$#"
730730
count: 3
731731
path: src/Parsers/OptionsArrays.php
732732

733733
-
734-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\:\\:\\$options \\(array\\<int, array\\{name\\: string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|string\\>\\) does not accept non\\-empty\\-array\\<int\\|string, mixed\\>\\.$#"
734+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\:\\:\\$options \\(array\\<int, array\\{name\\: string, equals\\: bool, expr\\: PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string, value\\: string\\|null\\}\\|string\\>\\) does not accept non\\-empty\\-array\\<mixed\\>\\.$#"
735735
count: 3
736736
path: src/Parsers/OptionsArrays.php
737737

@@ -1722,7 +1722,7 @@ parameters:
17221722

17231723
-
17241724
message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertEquals\\(\\)\\.$#"
1725-
count: 33
1725+
count: 34
17261726
path: tests/Builder/CreateStatementTest.php
17271727

17281728
-
@@ -1977,7 +1977,7 @@ parameters:
19771977

19781978
-
19791979
message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertEquals\\(\\)\\.$#"
1980-
count: 8
1980+
count: 9
19811981
path: tests/Components/OptionsArrayTest.php
19821982

19831983
-
@@ -2212,12 +2212,12 @@ parameters:
22122212

22132213
-
22142214
message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertCount\\(\\)\\.$#"
2215-
count: 8
2215+
count: 14
22162216
path: tests/Parser/WithStatementTest.php
22172217

22182218
-
22192219
message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertEquals\\(\\)\\.$#"
2220-
count: 3
2220+
count: 5
22212221
path: tests/Parser/WithStatementTest.php
22222222

22232223
-

‎src/Statements/WithStatement.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,11 +269,17 @@ public function parse(Parser $parser, TokensList $list): void
269269

270270
public function build(): string
271271
{
272-
$str = 'WITH ';
272+
$initial = true;
273+
$str = 'WITH';
274+
275+
if ($this->options !== null && $this->options->options !== []) {
276+
$str .= ' ' . $this->options->build();
277+
}
273278

274279
foreach ($this->withers as $wither) {
275-
$str .= $str === 'WITH ' ? '' : ', ';
280+
$str .= $initial ? ' ' : ', ';
276281
$str .= $wither->build();
282+
$initial = false;
277283
}
278284

279285
$str .= ' ';

‎tests/Builder/CreateStatementTest.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
use PhpMyAdmin\SqlParser\TokenType;
2020
use PHPUnit\Framework\Attributes\DataProvider;
2121

22+
use function implode;
23+
2224
class CreateStatementTest extends TestCase
2325
{
2426
public function testBuilder(): void
@@ -401,6 +403,33 @@ public function testBuilderView(): void
401403
. ' AS (SELECT 1 UNION ALL SELECT 2) SELECT col1 FROM cte AS `d` ',
402404
$stmt->build(),
403405
);
406+
407+
$parser = new Parser(
408+
implode("\n", [
409+
'CREATE VIEW number_sequence_view AS',
410+
'WITH RECURSIVE number_sequence AS (',
411+
' SELECT 1 AS `number`',
412+
' UNION ALL',
413+
' SELECT `number` + 1',
414+
' FROM number_sequence',
415+
' WHERE `number` < 5',
416+
')',
417+
'SELECT * FROM number_sequence;',
418+
]),
419+
);
420+
$stmt = $parser->statements[0];
421+
$this->assertEquals(
422+
'CREATE VIEW number_sequence_view AS'
423+
. ' WITH RECURSIVE number_sequence AS ('
424+
. 'SELECT 1 AS `number`'
425+
. ' UNION ALL'
426+
. ' SELECT `number`+ 1'
427+
. ' FROM number_sequence'
428+
. ' WHERE `number` < 5'
429+
. ')'
430+
. ' SELECT * FROM number_sequence ',
431+
$stmt->build(),
432+
);
404433
}
405434

406435
public function testBuilderViewComplex(): void

‎tests/Components/OptionsArrayTest.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,17 @@ public function testBuild(): void
136136
$component->build(),
137137
);
138138
}
139+
140+
public function testBuildWithRecursive(): void
141+
{
142+
$component = OptionsArrays::parse(
143+
new Parser(),
144+
$this->getTokensList('RECURSIVE'),
145+
['RECURSIVE' => 1],
146+
);
147+
$this->assertEquals(
148+
'RECURSIVE',
149+
$component->build(),
150+
);
151+
}
139152
}

‎tests/Parser/WithStatementTest.php‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,70 @@ public function testWith(): void
7070
$this->assertEquals($expected, $parser->statements[0]->build());
7171
}
7272

73+
public function testWithRecursive(): void
74+
{
75+
$sql = <<<'SQL'
76+
WITH RECURSIVE number_sequence AS (
77+
SELECT 1 AS `number`
78+
UNION ALL
79+
SELECT `number` + 1
80+
FROM number_sequence
81+
WHERE `number` < 5
82+
)
83+
SELECT * FROM number_sequence;
84+
SQL;
85+
86+
$lexer = new Lexer($sql);
87+
88+
$lexerErrors = $this->getErrorsAsArray($lexer);
89+
$this->assertCount(0, $lexerErrors);
90+
$parser = new Parser($lexer->list);
91+
$parserErrors = $this->getErrorsAsArray($parser);
92+
$this->assertCount(0, $parserErrors);
93+
$this->assertCount(1, $parser->statements);
94+
95+
// phpcs:disable Generic.Files.LineLength.TooLong
96+
$expected = <<<'SQL'
97+
WITH RECURSIVE number_sequence AS (SELECT 1 AS `number` UNION ALL SELECT `number`+ 1 FROM number_sequence WHERE `number` < 5) SELECT * FROM number_sequence
98+
SQL;
99+
// phpcs:enable
100+
$this->assertEquals($expected, $parser->statements[0]->build());
101+
}
102+
103+
public function testWithRecursiveWithers(): void
104+
{
105+
$sql = <<<'SQL'
106+
WITH RECURSIVE cte AS
107+
(
108+
SELECT 1 AS n, CAST('abc' AS CHAR(20)) AS str
109+
UNION ALL
110+
SELECT n + 1, CONCAT(str, str) FROM cte WHERE n < 3
111+
), cte2 AS
112+
(
113+
SELECT 1 AS n, CAST('def' AS CHAR(20)) AS str
114+
UNION ALL
115+
SELECT n + 1, CONCAT(str, str) FROM cte WHERE n < 3
116+
)
117+
SELECT * FROM cte UNION SELECT * FROM cte2;
118+
SQL;
119+
120+
$lexer = new Lexer($sql);
121+
122+
$lexerErrors = $this->getErrorsAsArray($lexer);
123+
$this->assertCount(0, $lexerErrors);
124+
$parser = new Parser($lexer->list);
125+
$parserErrors = $this->getErrorsAsArray($parser);
126+
$this->assertCount(0, $parserErrors);
127+
$this->assertCount(1, $parser->statements);
128+
129+
// phpcs:disable Generic.Files.LineLength.TooLong
130+
$expected = <<<'SQL'
131+
WITH RECURSIVE cte AS (SELECT 1 AS `n`, CAST('abc' AS CHAR(20)) AS `str` UNION ALL SELECT n+ 1, CONCAT(str, str) FROM cte WHERE n < 3), cte2 AS (SELECT 1 AS `n`, CAST('def' AS CHAR(20)) AS `str` UNION ALL SELECT n+ 1, CONCAT(str, str) FROM cte WHERE n < 3) SELECT * FROM cte UNION SELECT * FROM cte2
132+
SQL;
133+
// phpcs:enable
134+
$this->assertEquals($expected, $parser->statements[0]->build());
135+
}
136+
73137
public function testWithHasErrors(): void
74138
{
75139
$sql = <<<'SQL'

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL