diff options
| -rw-r--r-- | src/Components/CreateDefinition.php | 17 | ||||
| -rw-r--r-- | src/Components/IntoKeyword.php | 2 | ||||
| -rw-r--r-- | tests/Builder/InsertStatementTest.php | 26 | ||||
| -rw-r--r-- | tests/Components/IntoKeywordTest.php | 4 | ||||
| -rw-r--r-- | tests/Parser/CreateStatementTest.php | 2 | ||||
| -rw-r--r-- | tests/data/parser/parseCreateTable5.in | 1 | ||||
| -rw-r--r-- | tests/data/parser/parseCreateTable5.out | 1 | ||||
| -rw-r--r-- | tests/data/parser/parseCreateTableErr4.in | 1 | ||||
| -rw-r--r-- | tests/data/parser/parseCreateTableErr4.out | 1 |
9 files changed, 50 insertions, 5 deletions
diff --git a/src/Components/CreateDefinition.php b/src/Components/CreateDefinition.php index c6f0bb0..6e302d0 100644 --- a/src/Components/CreateDefinition.php +++ b/src/Components/CreateDefinition.php @@ -220,6 +220,23 @@ class CreateDefinition extends Component if (!$expr->isConstraint) { $state = 2; } + } else if ($token->type === Token::TYPE_KEYWORD) { + if ($token->flags & Token::FLAG_KEYWORD_RESERVED) { + // Reserved keywords can't be used + // as field names without backquotes + $parser->error( + __('A symbol name was expected! ' + . 'A reserved keyword can not be used ' + . 'as a field name without backquotes.' + ), + $token + ); + return $ret; + } else { + // Non-reserved keywords are allowed without backquotes + $expr->name = $token->value; + $state = 2; + } } else { $parser->error( __('A symbol name was expected!'), diff --git a/src/Components/IntoKeyword.php b/src/Components/IntoKeyword.php index 56f349f..783ac3c 100644 --- a/src/Components/IntoKeyword.php +++ b/src/Components/IntoKeyword.php @@ -139,7 +139,7 @@ class IntoKeyword extends Component { if ($component->dest instanceof Expression) { $columns = !empty($component->columns) ? - '(' . implode(', ', $component->columns) . ')' : ''; + '(`' . implode('`, `', $component->columns) . '`)' : ''; return $component->dest . $columns; } else { return 'OUTFILE "' . $component->dest . '"'; diff --git a/tests/Builder/InsertStatementTest.php b/tests/Builder/InsertStatementTest.php index 55e7ffa..c1d6b95 100644 --- a/tests/Builder/InsertStatementTest.php +++ b/tests/Builder/InsertStatementTest.php @@ -11,12 +11,34 @@ class InsertStatementTest extends TestCase public function testBuilder() { + /* Assertion 1 */ $parser = new Parser( - 'INSERT INTO tbl(col1, col2, col3) VALUES (1, "str", 3.14)' + '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)', + 'INSERT INTO tbl(`col1`, `col2`, `col3`) VALUES (1, "str", 3.14)', + $stmt->build() + ); + + /* Assertion 2 */ + /* Reserved keywords (with backqoutes 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 */ + $parser = new Parser( + 'INSERT INTO tbl VALUES (1)' + ); + $stmt = $parser->statements[0]; + $this->assertEquals( + 'INSERT INTO tbl VALUES (1)', $stmt->build() ); } diff --git a/tests/Components/IntoKeywordTest.php b/tests/Components/IntoKeywordTest.php index dad7077..c18938a 100644 --- a/tests/Components/IntoKeywordTest.php +++ b/tests/Components/IntoKeywordTest.php @@ -19,8 +19,8 @@ class IntoKeywordTest extends TestCase public function testBuild() { - $component = IntoKeyword::parse(new Parser(), $this->getTokensList('tbl(col1, col2)')); - $this->assertEquals('tbl(col1, col2)', IntoKeyword::build($component)); + $component = IntoKeyword::parse(new Parser(), $this->getTokensList('tbl(`col1`, `col2`)')); + $this->assertEquals('tbl(`col1`, `col2`)', IntoKeyword::build($component)); } public function testBuildOutfile() diff --git a/tests/Parser/CreateStatementTest.php b/tests/Parser/CreateStatementTest.php index deeb6aa..7918029 100644 --- a/tests/Parser/CreateStatementTest.php +++ b/tests/Parser/CreateStatementTest.php @@ -27,9 +27,11 @@ class CreateStatementTest extends TestCase array('parser/parseCreateTable2'), array('parser/parseCreateTable3'), array('parser/parseCreateTable4'), + array('parser/parseCreateTable5'), array('parser/parseCreateTableErr1'), array('parser/parseCreateTableErr2'), array('parser/parseCreateTableErr3'), + array('parser/parseCreateTableErr4'), array('parser/parseCreateTableSelect'), array('parser/parseCreateTableAsSelect'), array('parser/parseCreateTableLike'), diff --git a/tests/data/parser/parseCreateTable5.in b/tests/data/parser/parseCreateTable5.in new file mode 100644 index 0000000..5dfef1a --- /dev/null +++ b/tests/data/parser/parseCreateTable5.in @@ -0,0 +1 @@ +CREATE TABLE new_table (`INT` VARCHAR(50) DEFAULT NULL);
\ No newline at end of file diff --git a/tests/data/parser/parseCreateTable5.out b/tests/data/parser/parseCreateTable5.out new file mode 100644 index 0000000..08a2933 --- /dev/null +++ b/tests/data/parser/parseCreateTable5.out @@ -0,0 +1 @@ +a:4:{s:5:"query";s:56:"CREATE TABLE new_table (`INT` VARCHAR(50) DEFAULT NULL);";s:5:"lexer";O:15:"SqlParser\Lexer":8:{s:6:"strict";b:0;s:3:"str";s:56:"CREATE TABLE new_table (`INT` VARCHAR(50) DEFAULT NULL);";s:3:"len";i:56;s:4:"last";i:56;s:4:"list";O:20:"SqlParser\TokensList":3:{s:6:"tokens";a:20:{i:0;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"CREATE";s:5:"value";s:6:"CREATE";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:0;}i:1;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:6;}i:2;O:15:"SqlParser\Token":5:{s:5:"token";s:5:"TABLE";s:5:"value";s:5:"TABLE";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:7;}i:3;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:12;}i:4;O:15:"SqlParser\Token":5:{s:5:"token";s:9:"new_table";s:5:"value";s:9:"new_table";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:13;}i:5;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:22;}i:6;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"(";s:5:"value";s:1:"(";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:23;}i:7;O:15:"SqlParser\Token":5:{s:5:"token";s:5:"`INT`";s:5:"value";s:3:"INT";s:4:"type";i:8;s:5:"flags";i:2;s:8:"position";i:24;}i:8;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:29;}i:9;O:15:"SqlParser\Token":5:{s:5:"token";s:7:"VARCHAR";s:5:"value";s:7:"VARCHAR";s:4:"type";i:1;s:5:"flags";i:11;s:8:"position";i:30;}i:10;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"(";s:5:"value";s:1:"(";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:37;}i:11;O:15:"SqlParser\Token":5:{s:5:"token";s:2:"50";s:5:"value";i:50;s:4:"type";i:6;s:5:"flags";i:0;s:8:"position";i:38;}i:12;O:15:"SqlParser\Token":5:{s:5:"token";s:1:")";s:5:"value";s:1:")";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:40;}i:13;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:41;}i:14;O:15:"SqlParser\Token":5:{s:5:"token";s:7:"DEFAULT";s:5:"value";s:7:"DEFAULT";s:4:"type";i:1;s:5:"flags";i:35;s:8:"position";i:42;}i:15;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:49;}i:16;O:15:"SqlParser\Token":5:{s:5:"token";s:4:"NULL";s:5:"value";s:4:"NULL";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:50;}i:17;O:15:"SqlParser\Token":5:{s:5:"token";s:1:")";s:5:"value";s:1:")";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:54;}i:18;O:15:"SqlParser\Token":5:{s:5:"token";s:1:";";s:5:"value";s:1:";";s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";i:55;}i:19;O:15:"SqlParser\Token":5:{s:5:"token";N;s:5:"value";N;s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";N;}}s:5:"count";i:20;s:3:"idx";i:20;}s:9:"delimiter";s:1:";";s:12:"delimiterLen";i:1;s:6:"errors";a:0:{}}s:6:"parser";O:16:"SqlParser\Parser":5:{s:4:"list";r:8;s:6:"strict";b:0;s:6:"errors";a:0:{}s:10:"statements";a:1:{i:0;O:36:"SqlParser\Statements\CreateStatement":17:{s:4:"name";O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:9:"new_table";s:6:"column";N;s:4:"expr";s:9:"new_table";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}s:13:"entityOptions";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:6:"fields";a:1:{i:0;O:37:"SqlParser\Components\CreateDefinition":6:{s:4:"name";s:3:"INT";s:12:"isConstraint";N;s:4:"type";O:29:"SqlParser\Components\DataType":3:{s:4:"name";s:7:"VARCHAR";s:10:"parameters";a:1:{i:0;s:2:"50";}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}}s:3:"key";N;s:10:"references";N;s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:1:{i:2;a:3:{s:4:"name";s:7:"DEFAULT";s:4:"expr";O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";N;s:6:"column";N;s:4:"expr";s:4:"NULL";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}s:5:"value";s:4:"NULL";}}}}}s:6:"select";N;s:4:"like";N;s:11:"partitionBy";N;s:13:"partitionsNum";N;s:14:"subpartitionBy";N;s:16:"subpartitionsNum";N;s:10:"partitions";N;s:5:"table";N;s:6:"return";N;s:10:"parameters";N;s:4:"body";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:1:{i:6;s:5:"TABLE";}}s:5:"first";i:0;s:4:"last";i:18;}}s:8:"brackets";i:0;}s:6:"errors";a:2:{s:5:"lexer";a:0:{}s:6:"parser";a:0:{}}}
\ No newline at end of file diff --git a/tests/data/parser/parseCreateTableErr4.in b/tests/data/parser/parseCreateTableErr4.in new file mode 100644 index 0000000..19bb013 --- /dev/null +++ b/tests/data/parser/parseCreateTableErr4.in @@ -0,0 +1 @@ +CREATE TABLE new_table (INT VARCHAR(50) DEFAULT NULL);
\ No newline at end of file diff --git a/tests/data/parser/parseCreateTableErr4.out b/tests/data/parser/parseCreateTableErr4.out new file mode 100644 index 0000000..fc33a45 --- /dev/null +++ b/tests/data/parser/parseCreateTableErr4.out @@ -0,0 +1 @@ +a:4:{s:5:"query";s:54:"CREATE TABLE new_table (INT VARCHAR(50) DEFAULT NULL);";s:5:"lexer";O:15:"SqlParser\Lexer":8:{s:6:"strict";b:0;s:3:"str";s:54:"CREATE TABLE new_table (INT VARCHAR(50) DEFAULT NULL);";s:3:"len";i:54;s:4:"last";i:54;s:4:"list";O:20:"SqlParser\TokensList":3:{s:6:"tokens";a:20:{i:0;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"CREATE";s:5:"value";s:6:"CREATE";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:0;}i:1;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:6;}i:2;O:15:"SqlParser\Token":5:{s:5:"token";s:5:"TABLE";s:5:"value";s:5:"TABLE";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:7;}i:3;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:12;}i:4;O:15:"SqlParser\Token":5:{s:5:"token";s:9:"new_table";s:5:"value";s:9:"new_table";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:13;}i:5;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:22;}i:6;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"(";s:5:"value";s:1:"(";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:23;}i:7;O:15:"SqlParser\Token":5:{s:5:"token";s:3:"INT";s:5:"value";s:3:"INT";s:4:"type";i:1;s:5:"flags";i:11;s:8:"position";i:24;}i:8;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:27;}i:9;O:15:"SqlParser\Token":5:{s:5:"token";s:7:"VARCHAR";s:5:"value";s:7:"VARCHAR";s:4:"type";i:1;s:5:"flags";i:11;s:8:"position";i:28;}i:10;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"(";s:5:"value";s:1:"(";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:35;}i:11;O:15:"SqlParser\Token":5:{s:5:"token";s:2:"50";s:5:"value";i:50;s:4:"type";i:6;s:5:"flags";i:0;s:8:"position";i:36;}i:12;O:15:"SqlParser\Token":5:{s:5:"token";s:1:")";s:5:"value";s:1:")";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:38;}i:13;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:39;}i:14;O:15:"SqlParser\Token":5:{s:5:"token";s:7:"DEFAULT";s:5:"value";s:7:"DEFAULT";s:4:"type";i:1;s:5:"flags";i:35;s:8:"position";i:40;}i:15;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:47;}i:16;O:15:"SqlParser\Token":5:{s:5:"token";s:4:"NULL";s:5:"value";s:4:"NULL";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:48;}i:17;O:15:"SqlParser\Token":5:{s:5:"token";s:1:")";s:5:"value";s:1:")";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:52;}i:18;O:15:"SqlParser\Token":5:{s:5:"token";s:1:";";s:5:"value";s:1:";";s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";i:53;}i:19;O:15:"SqlParser\Token":5:{s:5:"token";N;s:5:"value";N;s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";N;}}s:5:"count";i:20;s:3:"idx";i:20;}s:9:"delimiter";s:1:";";s:12:"delimiterLen";i:1;s:6:"errors";a:0:{}}s:6:"parser";O:16:"SqlParser\Parser":5:{s:4:"list";r:8;s:6:"strict";b:0;s:6:"errors";a:0:{}s:10:"statements";a:1:{i:0;O:36:"SqlParser\Statements\CreateStatement":17:{s:4:"name";O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:9:"new_table";s:6:"column";N;s:4:"expr";s:9:"new_table";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}s:13:"entityOptions";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:6:"fields";a:0:{}s:6:"select";N;s:4:"like";N;s:11:"partitionBy";N;s:13:"partitionsNum";N;s:14:"subpartitionBy";N;s:16:"subpartitionsNum";N;s:10:"partitions";N;s:5:"table";N;s:6:"return";N;s:10:"parameters";N;s:4:"body";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:1:{i:6;s:5:"TABLE";}}s:5:"first";i:0;s:4:"last";i:10;}}s:8:"brackets";i:0;}s:6:"errors";a:2:{s:5:"lexer";a:0:{}s:6:"parser";a:4:{i:0;a:3:{i:0;s:98:"A symbol name was expected! A reserved keyword can not be used as a field name without backquotes.";i:1;r:52;i:2;i:0;}i:1;a:3:{i:0;s:44:"At least one column definition was expected.";i:1;r:52;i:2;i:0;}i:2;a:3:{i:0;s:34:"Unexpected beginning of statement.";i:1;r:76;i:2;i:0;}i:3;a:3:{i:0;s:28:"Unrecognized statement type.";i:1;r:94;i:2;i:0;}}}}
\ No newline at end of file |