diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index dad26168..bca7ca29 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -486,7 +486,7 @@ parameters: path: src/Components/IntoKeyword.php - - message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#" + message: "#^Parameter \\#2 \\$pieces of function implode expects array, array\\\\|string given\\.$#" count: 1 path: src/Components/IntoKeyword.php @@ -2140,11 +2140,6 @@ parameters: count: 10 path: tests/Builder/ExplainStatementTest.php - - - message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertEquals\\(\\)\\.$#" - count: 6 - path: tests/Builder/InsertStatementTest.php - - message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertEquals\\(\\)\\.$#" count: 6 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index c87d9b3d..a619299c 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -247,6 +247,9 @@ $component + + Context::escape($component->columns) + ArrayObj::parse($parser, $list)->values diff --git a/src/Components/IntoKeyword.php b/src/Components/IntoKeyword.php index 8ff178c9..a10637e7 100644 --- a/src/Components/IntoKeyword.php +++ b/src/Components/IntoKeyword.php @@ -5,6 +5,7 @@ namespace PhpMyAdmin\SqlParser\Components; use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\TokensList; @@ -271,7 +272,9 @@ public function parseFileOptions(Parser $parser, TokensList $list, $keyword = 'F public static function build($component, array $options = []) { if ($component->dest instanceof Expression) { - $columns = ! empty($component->columns) ? '(`' . implode('`, `', $component->columns) . '`)' : ''; + $columns = $component->columns === null || $component->columns === [] + ? '' + : '(' . implode(', ', Context::escape($component->columns)) . ')'; return $component->dest . $columns; } diff --git a/tests/Builder/InsertStatementTest.php b/tests/Builder/InsertStatementTest.php index 471eea09..882548f2 100644 --- a/tests/Builder/InsertStatementTest.php +++ b/tests/Builder/InsertStatementTest.php @@ -4,64 +4,61 @@ namespace PhpMyAdmin\SqlParser\Tests\Builder; +use Generator; +use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class InsertStatementTest extends TestCase { - public function testBuilder(): void + /** @var int */ + private $sqlMode; + + public function setUp(): void { - /* Assertion 1 */ - $parser = new Parser('INSERT INTO tbl(`col1`, `col2`, `col3`) VALUES (1, "str", 3.14)'); - $stmt = $parser->statements[0]; - $this->assertEquals( - 'INSERT INTO tbl(`col1`, `col2`, `col3`) VALUES (1, "str", 3.14)', - $stmt->build() - ); - - /* Assertion 2 */ - /* Reserved keywords (with backquotes as field name) */ - $parser = new Parser('INSERT INTO tbl(`order`) VALUES (1)'); - $stmt = $parser->statements[0]; - $this->assertEquals( - 'INSERT INTO tbl(`order`) VALUES (1)', - $stmt->build() - ); - - /* Assertion 3 */ - /* INSERT ... SET ... */ - $parser = new Parser('INSERT INTO tbl SET FOO = 1'); - $stmt = $parser->statements[0]; - $this->assertEquals( - 'INSERT INTO tbl SET FOO = 1', - $stmt->build() - ); - - /* Assertion 4 */ - /* INSERT ... SELECT ... */ - $parser = new Parser('INSERT INTO tbl SELECT * FROM bar'); - $stmt = $parser->statements[0]; - $this->assertEquals( - 'INSERT INTO tbl SELECT * FROM bar', - $stmt->build() - ); - - /* Assertion 5 */ - /* INSERT ... ON DUPLICATE KEY UPDATE ... */ - $parser = new Parser('INSERT INTO tbl SELECT * FROM bar ON DUPLICATE KEY UPDATE baz = 1'); + parent::setUp(); + + $this->sqlMode = Context::getMode(); + } + + protected function tearDown(): void + { + Context::setMode($this->sqlMode); + + parent::tearDown(); + } + + /** @dataProvider providerForTestBuilder */ + public function testBuilder(string $sql): void + { + $parser = new Parser($sql); $stmt = $parser->statements[0]; - $this->assertEquals( - 'INSERT INTO tbl SELECT * FROM bar ON DUPLICATE KEY UPDATE baz = 1', - $stmt->build() - ); - - /* Assertion 6 */ - /* INSERT [OPTIONS] INTO ... */ - $parser = new Parser('INSERT DELAYED IGNORE INTO tbl SELECT * FROM bar'); + self::assertEquals($sql, $stmt->build()); + } + + /** @return Generator> */ + public function providerForTestBuilder(): Generator + { + yield 'INSERT ... VALUES ...' => ['INSERT INTO tbl(`col1`, `col2`, `col3`) VALUES (1, "str", 3.14)']; + + yield 'Reserved keywords (with backquotes as field name)' => ['INSERT INTO tbl(`order`) VALUES (1)']; + + yield 'INSERT ... SET ...' => ['INSERT INTO tbl SET FOO = 1']; + + yield 'INSERT ... SELECT ... ' => ['INSERT INTO tbl SELECT * FROM bar']; + + yield 'INSERT ... ON DUPLICATE KEY UPDATE ...' => + ['INSERT INTO tbl SELECT * FROM bar ON DUPLICATE KEY UPDATE baz = 1']; + + yield 'INSERT [OPTIONS] INTO ...' => ['INSERT DELAYED IGNORE INTO tbl SELECT * FROM bar']; + } + + public function testBuilderAnsi(): void + { + Context::setMode(Context::SQL_MODE_ANSI_QUOTES); + $sql = "INSERT INTO foo (bar, baz) VALUES ('bar', 'baz')"; + $parser = new Parser($sql); $stmt = $parser->statements[0]; - $this->assertEquals( - 'INSERT DELAYED IGNORE INTO tbl SELECT * FROM bar', - $stmt->build() - ); + self::assertEquals('INSERT INTO foo("bar", "baz") VALUES (\'bar\', \'baz\')', $stmt->build()); } }