Skip to content

Commit dc23935

Browse files
MoonEMoonE
committed
Build insert statement with context's quote style
1 parent 4652d80 commit dc23935

File tree

4 files changed

+57
-67
lines changed

4 files changed

+57
-67
lines changed

‎phpstan-baseline.neon‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ parameters:
2020
count: 1
2121
path: src/Components/AlterOperation.php
2222

23-
-
24-
message: "#^array\\<PhpMyAdmin\\\\SqlParser\\\\Token\\>\\|string does not accept PhpMyAdmin\\\\SqlParser\\\\Token\\.$#"
25-
count: 3
26-
path: src/Components/AlterOperation.php
27-
2823
-
2924
message: "#^Cannot access property \\$values on array\\<PhpMyAdmin\\\\SqlParser\\\\Component\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
3025
count: 1
@@ -190,6 +185,11 @@ parameters:
190185
count: 1
191186
path: src/Components/IntoKeyword.php
192187

188+
-
189+
message: "#^Parameter \\#2 \\$pieces of function implode expects array, array\\<string\\>\\|string given\\.$#"
190+
count: 1
191+
path: src/Components/IntoKeyword.php
192+
193193
-
194194
message: "#^Parameter \\#1 \\$component of static method PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\:\\:build\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray, PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null given\\.$#"
195195
count: 2
@@ -330,11 +330,6 @@ parameters:
330330
count: 1
331331
path: src/Components/OptionsArray.php
332332

333-
-
334-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\:\\:\\$options \\(array\\<int, mixed\\>\\) does not accept array\\<int\\|string, mixed\\>\\.$#"
335-
count: 8
336-
path: src/Components/OptionsArray.php
337-
338333
-
339334
message: "#^Right side of && is always true\\.$#"
340335
count: 1
@@ -635,11 +630,6 @@ parameters:
635630
count: 1
636631
path: src/Statements/CreateStatement.php
637632

638-
-
639-
message: "#^array\\<PhpMyAdmin\\\\SqlParser\\\\Token\\>\\|string does not accept PhpMyAdmin\\\\SqlParser\\\\Token\\.$#"
640-
count: 4
641-
path: src/Statements/CreateStatement.php
642-
643633
-
644634
message: "#^Argument of an invalid type array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\>\\|null supplied for foreach, only iterables are supported\\.$#"
645635
count: 1

‎psalm-baseline.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,9 @@
247247
<MoreSpecificImplementedParamType occurrences="1">
248248
<code>$component</code>
249249
</MoreSpecificImplementedParamType>
250+
<PossiblyInvalidArgument occurrences="1">
251+
<code>Context::escape($component-&gt;columns)</code>
252+
</PossiblyInvalidArgument>
250253
<PossiblyInvalidPropertyFetch occurrences="1">
251254
<code>ArrayObj::parse($parser, $list)-&gt;values</code>
252255
</PossiblyInvalidPropertyFetch>

‎src/Components/IntoKeyword.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace PhpMyAdmin\SqlParser\Components;
66

77
use PhpMyAdmin\SqlParser\Component;
8+
use PhpMyAdmin\SqlParser\Context;
89
use PhpMyAdmin\SqlParser\Parser;
910
use PhpMyAdmin\SqlParser\Token;
1011
use PhpMyAdmin\SqlParser\TokensList;
@@ -271,7 +272,7 @@ public function parseFileOptions(Parser $parser, TokensList $list, $keyword = 'F
271272
public static function build($component, array $options = [])
272273
{
273274
if ($component->dest instanceof Expression) {
274-
$columns = ! empty($component->columns) ? '(`' . implode('`, `', $component->columns) . '`)' : '';
275+
$columns = $component->columns ? '(' . implode(', ', Context::escape($component->columns)) . ')' : '';
275276

276277
return $component->dest . $columns;
277278
}

‎tests/Builder/InsertStatementTest.php‎

Lines changed: 47 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -4,64 +4,60 @@
44

55
namespace PhpMyAdmin\SqlParser\Tests\Builder;
66

7+
use Generator;
8+
use PhpMyAdmin\SqlParser\Context;
79
use PhpMyAdmin\SqlParser\Parser;
810
use PhpMyAdmin\SqlParser\Tests\TestCase;
911

1012
class InsertStatementTest extends TestCase
1113
{
12-
public function testBuilder(): void
14+
/** @var int */
15+
private $sqlMode;
16+
17+
public function setUp(): void
1318
{
14-
/* Assertion 1 */
15-
$parser = new Parser('INSERT INTO tbl(`col1`, `col2`, `col3`) VALUES (1, "str", 3.14)');
16-
$stmt = $parser->statements[0];
17-
$this->assertEquals(
18-
'INSERT INTO tbl(`col1`, `col2`, `col3`) VALUES (1, "str", 3.14)',
19-
$stmt->build()
20-
);
21-
22-
/* Assertion 2 */
23-
/* Reserved keywords (with backquotes as field name) */
24-
$parser = new Parser('INSERT INTO tbl(`order`) VALUES (1)');
25-
$stmt = $parser->statements[0];
26-
$this->assertEquals(
27-
'INSERT INTO tbl(`order`) VALUES (1)',
28-
$stmt->build()
29-
);
30-
31-
/* Assertion 3 */
32-
/* INSERT ... SET ... */
33-
$parser = new Parser('INSERT INTO tbl SET FOO = 1');
34-
$stmt = $parser->statements[0];
35-
$this->assertEquals(
36-
'INSERT INTO tbl SET FOO = 1',
37-
$stmt->build()
38-
);
39-
40-
/* Assertion 4 */
41-
/* INSERT ... SELECT ... */
42-
$parser = new Parser('INSERT INTO tbl SELECT * FROM bar');
43-
$stmt = $parser->statements[0];
44-
$this->assertEquals(
45-
'INSERT INTO tbl SELECT * FROM bar',
46-
$stmt->build()
47-
);
48-
49-
/* Assertion 5 */
50-
/* INSERT ... ON DUPLICATE KEY UPDATE ... */
51-
$parser = new Parser('INSERT INTO tbl SELECT * FROM bar ON DUPLICATE KEY UPDATE baz = 1');
19+
parent::setUp();
20+
21+
$this->sqlMode = Context::getMode();
22+
}
23+
24+
protected function tearDown(): void
25+
{
26+
Context::setMode($this->sqlMode);
27+
28+
parent::tearDown();
29+
}
30+
31+
/** @dataProvider providerForTestBuilder */
32+
public function testBuilder(string $sql): void
33+
{
34+
$parser = new Parser($sql);
5235
$stmt = $parser->statements[0];
53-
$this->assertEquals(
54-
'INSERT INTO tbl SELECT * FROM bar ON DUPLICATE KEY UPDATE baz = 1',
55-
$stmt->build()
56-
);
57-
58-
/* Assertion 6 */
59-
/* INSERT [OPTIONS] INTO ... */
60-
$parser = new Parser('INSERT DELAYED IGNORE INTO tbl SELECT * FROM bar');
36+
$this->assertEquals($sql, $stmt->build());
37+
}
38+
39+
/** @return Generator<string, list<string>> */
40+
public function providerForTestBuilder(): Generator
41+
{
42+
yield 'INSERT ... VALUES ...' => ['INSERT INTO tbl(`col1`, `col2`, `col3`) VALUES (1, "str", 3.14)'];
43+
44+
yield 'Reserved keywords (with backquotes as field name)' => ['INSERT INTO tbl(`order`) VALUES (1)'];
45+
46+
yield 'INSERT ... SET ...' => ['INSERT INTO tbl SET FOO = 1'];
47+
48+
yield 'INSERT ... SELECT ... ' => ['INSERT INTO tbl SELECT * FROM bar'];
49+
50+
yield 'INSERT ... ON DUPLICATE KEY UPDATE ...' => ['INSERT INTO tbl SELECT * FROM bar ON DUPLICATE KEY UPDATE baz = 1'];
51+
52+
yield 'INSERT [OPTIONS] INTO ...' => ['INSERT DELAYED IGNORE INTO tbl SELECT * FROM bar'];
53+
}
54+
55+
public function testBuilderAnsi(): void
56+
{
57+
Context::setMode(Context::SQL_MODE_ANSI);
58+
$sql = "INSERT INTO foo (bar, baz) VALUES ('bar', 'baz')";
59+
$parser = new Parser($sql);
6160
$stmt = $parser->statements[0];
62-
$this->assertEquals(
63-
'INSERT DELAYED IGNORE INTO tbl SELECT * FROM bar',
64-
$stmt->build()
65-
);
61+
$this->assertEquals('INSERT INTO foo("bar", "baz") VALUES (\'bar\', \'baz\')', $stmt->build());
6662
}
6763
}

0 commit comments

Comments
 (0)