diff options
author | Deven Bansod <devenbansod.bits@gmail.com> | 2016-09-13 15:25:04 +0530 |
---|---|---|
committer | Deven Bansod <devenbansod.bits@gmail.com> | 2016-09-13 15:25:04 +0530 |
commit | 0b6743bdee44f8e12d02c9122a2f7bb124cfa293 (patch) | |
tree | 766378a800bfc4246faee0bee1c0d020ec2f652f | |
parent | 98c2a72dd19542d80dcee63eb50c199e5f9a2935 (diff) | |
download | sql-parser-0b6743bdee44f8e12d02c9122a2f7bb124cfa293.zip sql-parser-0b6743bdee44f8e12d02c9122a2f7bb124cfa293.tar.gz sql-parser-0b6743bdee44f8e12d02c9122a2f7bb124cfa293.tar.bz2 |
Stop SelectStatement parsing and revert back in case of ON DUPLICATE KEY
Fix parsing of INSERT INTO ... SELECT .... ON DUPLICATE KEY
Fix #78
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
-rw-r--r-- | src/Statement.php | 25 | ||||
-rw-r--r-- | tests/Builder/InsertStatementTest.php | 11 | ||||
-rw-r--r-- | tests/Parser/InsertStatementTest.php | 1 | ||||
-rw-r--r-- | tests/data/parser/parseInsertSelectOnDuplicateKey.in | 1 | ||||
-rw-r--r-- | tests/data/parser/parseInsertSelectOnDuplicateKey.out | 1 |
5 files changed, 39 insertions, 0 deletions
diff --git a/src/Statement.php b/src/Statement.php index 2b81a84..5dfcf3a 100644 --- a/src/Statement.php +++ b/src/Statement.php @@ -254,6 +254,31 @@ abstract class Statement break; } + $lastIdx = $list->idx; + + // ON DUPLICATE KEY UPDATE ... + // has to be parsed in parent statement (INSERT or REPLACE) + // so look for it and break + if (get_class($this) === 'SqlParser\Statements\SelectStatement' + && $token->value === 'ON' + ) { + ++$list->idx; // Skip ON + + // look for ON DUPLICATE KEY UPDATE + $first = $list->getNextOfType(Token::TYPE_KEYWORD); + $second = $list->getNextOfType(Token::TYPE_KEYWORD); + $third = $list->getNextOfType(Token::TYPE_KEYWORD); + + if ($first->value === 'DUPLICATE' + && $second->value === 'KEY' + && $third->value === 'UPDATE' + ) { + $list->idx = $lastIdx; + break; + } + } + $list->idx = $lastIdx; + /** * The name of the class that is used for parsing. * diff --git a/tests/Builder/InsertStatementTest.php b/tests/Builder/InsertStatementTest.php index 3fe6dd5..d27726a 100644 --- a/tests/Builder/InsertStatementTest.php +++ b/tests/Builder/InsertStatementTest.php @@ -53,5 +53,16 @@ class InsertStatementTest extends TestCase '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' + ); + $stmt = $parser->statements[0]; + $this->assertEquals( + 'INSERT INTO tbl SELECT * FROM bar ON DUPLICATE KEY UPDATE baz = 1', + $stmt->build() + ); } } diff --git a/tests/Parser/InsertStatementTest.php b/tests/Parser/InsertStatementTest.php index b5722f7..88617c0 100644 --- a/tests/Parser/InsertStatementTest.php +++ b/tests/Parser/InsertStatementTest.php @@ -22,6 +22,7 @@ class InsertStatementTest extends TestCase array('parser/parseInsertSelect'), array('parser/parseInsertOnDuplicateKey'), array('parser/parseInsertSetOnDuplicateKey'), + array('parser/parseInsertSelectOnDuplicateKey'), array('parser/parseInsertOnDuplicateKeyErr'), ); } diff --git a/tests/data/parser/parseInsertSelectOnDuplicateKey.in b/tests/data/parser/parseInsertSelectOnDuplicateKey.in new file mode 100644 index 0000000..4ccd72c --- /dev/null +++ b/tests/data/parser/parseInsertSelectOnDuplicateKey.in @@ -0,0 +1 @@ +INSERT INTO tbl SELECT * FROM bar ON DUPLICATE KEY UPDATE baz = 1
\ No newline at end of file diff --git a/tests/data/parser/parseInsertSelectOnDuplicateKey.out b/tests/data/parser/parseInsertSelectOnDuplicateKey.out new file mode 100644 index 0000000..642383e --- /dev/null +++ b/tests/data/parser/parseInsertSelectOnDuplicateKey.out @@ -0,0 +1 @@ +a:4:{s:5:"query";s:65:"INSERT INTO tbl SELECT * FROM bar ON DUPLICATE KEY UPDATE baz = 1";s:5:"lexer";O:15:"SqlParser\Lexer":8:{s:6:"strict";b:0;s:3:"str";s:65:"INSERT INTO tbl SELECT * FROM bar ON DUPLICATE KEY UPDATE baz = 1";s:3:"len";i:65;s:4:"last";i:65;s:4:"list";O:20:"SqlParser\TokensList":3:{s:6:"tokens";a:28:{i:0;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"INSERT";s:5:"value";s:6:"INSERT";s:4:"type";i:1;s:5:"flags";i:35;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:4:"INTO";s:5:"value";s:4:"INTO";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:11;}i:4;O:15:"SqlParser\Token":5:{s:5:"token";s:3:"tbl";s:5:"value";s:3:"tbl";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:12;}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:15;}i:6;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"SELECT";s:5:"value";s:6:"SELECT";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:16;}i:7;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:8;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"*";s:5:"value";s:1:"*";s:4:"type";i:2;s:5:"flags";i:1;s:8:"position";i:23;}i:9;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:24;}i:10;O:15:"SqlParser\Token":5:{s:5:"token";s:4:"FROM";s:5:"value";s:4:"FROM";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:25;}i:11;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:12;O:15:"SqlParser\Token":5:{s:5:"token";s:3:"bar";s:5:"value";s:3:"bar";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:30;}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:33;}i:14;O:15:"SqlParser\Token":5:{s:5:"token";s:2:"ON";s:5:"value";s:2:"ON";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:34;}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:36;}i:16;O:15:"SqlParser\Token":5:{s:5:"token";s:9:"DUPLICATE";s:5:"value";s:9:"DUPLICATE";s:4:"type";i:1;s:5:"flags";i:1;s:8:"position";i:37;}i:17;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:46;}i:18;O:15:"SqlParser\Token":5:{s:5:"token";s:3:"KEY";s:5:"value";s:3:"KEY";s:4:"type";i:1;s:5:"flags";i:19;s:8:"position";i:47;}i:19;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:50;}i:20;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"UPDATE";s:5:"value";s:6:"UPDATE";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:51;}i:21;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:57;}i:22;O:15:"SqlParser\Token":5:{s:5:"token";s:3:"baz";s:5:"value";s:3:"baz";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:58;}i:23;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:61;}i:24;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"=";s:5:"value";s:1:"=";s:4:"type";i:2;s:5:"flags";i:2;s:8:"position";i:62;}i:25;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:63;}i:26;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"1";s:5:"value";i:1;s:4:"type";i:6;s:5:"flags";i:0;s:8:"position";i:64;}i:27;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:28;s:3:"idx";i:28;}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\InsertStatement":8:{s:4:"into";O:32:"SqlParser\Components\IntoKeyword":3:{s:4:"type";N;s:4:"dest";O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:3:"tbl";s:6:"column";N;s:4:"expr";s:3:"tbl";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}s:7:"columns";N;}s:6:"values";N;s:3:"set";N;s:6:"select";O:36:"SqlParser\Statements\SelectStatement":15:{s:4:"expr";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";N;s:6:"column";N;s:4:"expr";s:1:"*";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:4:"from";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:3:"bar";s:6:"column";N;s:4:"expr";s:3:"bar";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:9:"partition";N;s:5:"where";N;s:5:"group";N;s:6:"having";N;s:5:"order";N;s:5:"limit";N;s:9:"procedure";N;s:4:"into";N;s:4:"join";N;s:5:"union";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:5:"first";i:6;s:4:"last";i:13;}s:14:"onDuplicateSet";a:1:{i:0;O:33:"SqlParser\Components\SetOperation":2:{s:6:"column";s:3:"baz";s:5:"value";s:1:"1";}}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:5:"first";i:0;s:4:"last";i:26;}}s:8:"brackets";i:0;}s:6:"errors";a:2:{s:5:"lexer";a:0:{}s:6:"parser";a:0:{}}}d
\ No newline at end of file |