Skip to content

Commit 2142141

Browse files
williamdeswilliamdes
committed
Merge branch '5.10.x' into 5.11.x
2 parents d3c1f11 + 439b54d commit 2142141

File tree

6 files changed

+125
-12
lines changed

6 files changed

+125
-12
lines changed

‎CHANGELOG.md‎

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

77
- Add Translator::setLocale() method (#599)
88

9+
# [5.10.3] - YYYY-MM-DD
10+
11+
### Fixed
12+
13+
- Add "RECURSIVE" on build() for "WITH RECURSIVE" on the WithStatement class (#605)
14+
915
## [5.10.2] - 2024-12-05
1016

1117
### Added

‎phpstan-baseline.neon‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -722,12 +722,7 @@ parameters:
722722

723723
-
724724
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\:\\:\\$options \\(array\\<int, mixed\\>\\) does not accept array\\.$#"
725-
count: 2
726-
path: src/Components/OptionsArray.php
727-
728-
-
729-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\:\\:\\$options \\(array\\<int, mixed\\>\\) does not accept array\\<int\\|string, mixed\\>\\.$#"
730-
count: 8
725+
count: 10
731726
path: src/Components/OptionsArray.php
732727

733728
-
@@ -2117,7 +2112,7 @@ parameters:
21172112

21182113
-
21192114
message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertEquals\\(\\)\\.$#"
2120-
count: 33
2115+
count: 34
21212116
path: tests/Builder/CreateStatementTest.php
21222117

21232118
-
@@ -2407,7 +2402,7 @@ parameters:
24072402

24082403
-
24092404
message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertEquals\\(\\)\\.$#"
2410-
count: 8
2405+
count: 9
24112406
path: tests/Components/OptionsArrayTest.php
24122407

24132408
-
@@ -2642,12 +2637,12 @@ parameters:
26422637

26432638
-
26442639
message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertCount\\(\\)\\.$#"
2645-
count: 8
2640+
count: 14
26462641
path: tests/Parser/WithStatementTest.php
26472642

26482643
-
26492644
message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertEquals\\(\\)\\.$#"
2650-
count: 3
2645+
count: 5
26512646
path: tests/Parser/WithStatementTest.php
26522647

26532648
-

‎src/Statements/WithStatement.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,17 @@ public function parse(Parser $parser, TokensList $list)
280280
*/
281281
public function build()
282282
{
283-
$str = 'WITH ';
283+
$initial = true;
284+
$str = 'WITH';
285+
286+
if ($this->options !== null && $this->options->options !== []) {
287+
$str .= ' ' . OptionsArray::build($this->options);
288+
}
284289

285290
foreach ($this->withers as $wither) {
286-
$str .= $str === 'WITH ' ? '' : ', ';
291+
$str .= $initial ? ' ' : ', ';
287292
$str .= WithKeyword::build($wither);
293+
$initial = false;
288294
}
289295

290296
$str .= ' ';

‎tests/Builder/CreateStatementTest.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
use PhpMyAdmin\SqlParser\Tests\TestCase;
1616
use PhpMyAdmin\SqlParser\TokensList;
1717

18+
use function implode;
19+
1820
class CreateStatementTest extends TestCase
1921
{
2022
public function testBuilder(): void
@@ -399,6 +401,33 @@ public function testBuilderView(): void
399401
. ' AS (SELECT 1 UNION ALL SELECT 2) SELECT col1 FROM cte AS `d` ',
400402
$stmt->build()
401403
);
404+
405+
$parser = new Parser(
406+
implode("\n", [
407+
'CREATE VIEW number_sequence_view AS',
408+
'WITH RECURSIVE number_sequence AS (',
409+
' SELECT 1 AS `number`',
410+
' UNION ALL',
411+
' SELECT `number` + 1',
412+
' FROM number_sequence',
413+
' WHERE `number` < 5',
414+
')',
415+
'SELECT * FROM number_sequence;',
416+
])
417+
);
418+
$stmt = $parser->statements[0];
419+
$this->assertEquals(
420+
'CREATE VIEW number_sequence_view AS'
421+
. ' WITH RECURSIVE number_sequence AS ('
422+
. 'SELECT 1 AS `number`'
423+
. ' UNION ALL'
424+
. ' SELECT `number`+ 1'
425+
. ' FROM number_sequence'
426+
. ' WHERE `number` < 5'
427+
. ')'
428+
. ' SELECT * FROM number_sequence ',
429+
$stmt->build()
430+
);
402431
}
403432

404433
public function testBuilderViewComplex(): void

‎tests/Components/OptionsArrayTest.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,4 +131,17 @@ public function testBuild(): void
131131
'ALL SQL_CALC_FOUND_ROWS MAX_STATEMENT_TIME=42'
132132
);
133133
}
134+
135+
public function testBuildWithRecursive(): void
136+
{
137+
$component = OptionsArray::parse(
138+
new Parser(),
139+
$this->getTokensList('RECURSIVE'),
140+
['RECURSIVE' => 1]
141+
);
142+
$this->assertEquals(
143+
OptionsArray::build($component),
144+
'RECURSIVE'
145+
);
146+
}
134147
}

‎tests/Parser/WithStatementTest.php‎

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

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

0 commit comments

Comments
 (0)