From b593bfeb7c00ec9c49adcefb925aa1966e6b7c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 13 Sep 2016 16:04:50 +0200 Subject: [PATCH] Update SQL parser to 3.4.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/sql-parser/src/Statement.php | 26 +++ .../src/Statements/ReplaceStatement.php | 162 ++++++++++++++++-- libraries/sql-parser/src/Utils/CLI.php | 12 +- libraries/sql-parser/src/Utils/Formatter.php | 18 +- 4 files changed, 188 insertions(+), 30 deletions(-) diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index 2b81a844df..9f3341ea25 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -254,6 +254,32 @@ 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 && $second && $third + && $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/libraries/sql-parser/src/Statements/ReplaceStatement.php b/libraries/sql-parser/src/Statements/ReplaceStatement.php index 10c5e6312a..df00272657 100644 --- a/libraries/sql-parser/src/Statements/ReplaceStatement.php +++ b/libraries/sql-parser/src/Statements/ReplaceStatement.php @@ -8,10 +8,15 @@ */ namespace SqlParser\Statements; +use SqlParser\Parser; +use SqlParser\Token; +use SqlParser\TokensList; use SqlParser\Statement; -use SqlParser\Components\IntoKeyword; -use SqlParser\Components\SetOperation; +use SqlParser\Statements\SelectStatement; use SqlParser\Components\Array2d; +use SqlParser\Components\IntoKeyword; +use SqlParser\Components\OptionsArray; +use SqlParser\Components\SetOperation; /** * `REPLACE` statement. @@ -26,6 +31,14 @@ use SqlParser\Components\Array2d; * [INTO] tbl_name * SET col_name={expr | DEFAULT}, ... * + * or + * + * REPLACE [LOW_PRIORITY | DELAYED] + * [INTO] tbl_name + * [PARTITION (partition_name,...)] + * [(col_name,...)] + * SELECT ... + * * @category Statements * @package SqlParser * @subpackage Statements @@ -45,22 +58,6 @@ class ReplaceStatement extends Statement 'DELAYED' => 1, ); - /** - * The clauses of this statement, in order. - * - * @see Statement::$CLAUSES - * - * @var array - */ - public static $CLAUSES = array( - 'REPLACE' => array('REPLACE', 2), - // Used for options. - '_OPTIONS' => array('_OPTIONS', 1), - 'INTO' => array('FROM', 3), - 'VALUES' => array('VALUES', 1), - 'SET' => array('PARTITION', 3), - ); - /** * Tables used as target for this statement. * @@ -76,9 +73,136 @@ class ReplaceStatement extends Statement public $values; /** - * The replaced values. + * If SET clause is present + * holds the SetOperation * * @var SetOperation[] */ public $set; + + /** + * If SELECT clause is present + * holds the SelectStatement + * + * @var SelectStatement + */ + public $select; + + /** + * @return string + */ + public function build() + { + $ret = 'REPLACE ' . $this->options + . ' INTO ' . $this->into; + + if ($this->values != NULL && count($this->values) > 0) { + $ret .= ' VALUES ' . Array2d::build($this->values); + } elseif ($this->set != NULL && count($this->set) > 0) { + $ret .= ' SET ' . SetOperation::build($this->set); + } elseif ($this->select != NULL && count($this->select) > 0) { + $ret .= ' ' . $this->select->build(); + } + + return $ret; + } + + + /** + * @param Parser $parser The instance that requests parsing. + * @param TokensList $list The list of tokens to be parsed. + * + * @return void + */ + public function parse(Parser $parser, TokensList $list) + { + ++$list->idx; // Skipping `REPLACE`. + + // parse any options if provided + $this->options = OptionsArray::parse( + $parser, + $list, + static::$OPTIONS + ); + ++$list->idx; + + $token = $list->tokens[$list->idx]; + + /** + * The state of the parser. + * + * Below are the states of the parser. + * + * 0 ---------------------------------[ INTO ]----------------------------------> 1 + * + * 1 -------------------------[ VALUES/VALUE/SET/SELECT ]-----------------------> 2 + * + * @var int $state + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** + * Token parsed at this moment. + * + * @var Token $token + */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($state === 0) { + if ($token->type === Token::TYPE_KEYWORD + && $token->value !== 'INTO' + ) { + $parser->error(__('Unexpected keyword.'), $token); + break; + } else { + ++$list->idx; + $this->into = IntoKeyword::parse($parser, $list); + } + + $state = 1; + } elseif ($state === 1) { + if ($token->type === Token::TYPE_KEYWORD) { + if ($token->value === 'VALUE' + || $token->value === 'VALUES' + ) { + ++$list->idx; // skip VALUES + + $this->values = Array2d::parse($parser, $list); + } elseif ($token->value === 'SET') { + ++$list->idx; // skip SET + + $this->set = SetOperation::parse($parser, $list); + } elseif ($token->value === 'SELECT') { + $this->select = new SelectStatement($parser, $list); + } else { + $parser->error( + __('Unexpected keyword.'), + $token + ); + break; + } + $state = 2; + } else { + $parser->error( + __('Unexpected token.'), + $token + ); + break; + } + } + } + + --$list->idx; + } } diff --git a/libraries/sql-parser/src/Utils/CLI.php b/libraries/sql-parser/src/Utils/CLI.php index 306de04f2b..b6ce35e687 100644 --- a/libraries/sql-parser/src/Utils/CLI.php +++ b/libraries/sql-parser/src/Utils/CLI.php @@ -37,12 +37,20 @@ class CLI echo "Usage: highlight-query --query SQL [--format html|cli|text]\n"; } + public function getopt($opt, $long) + { + return getopt($opt, $long); + } + public function parseHighlight() { $longopts = array('help', 'query:', 'format:'); - $params = getopt( + $params = $this->getopt( 'hq:f:', $longopts ); + if ($params === false) { + return false; + } $this->mergeLongOpts($params, $longopts); if (! isset($params['f'])) { $params['f'] = 'cli'; @@ -84,7 +92,7 @@ class CLI public function parseLint() { $longopts = array('help', 'query:'); - $params = getopt( + $params = $this->getopt( 'hq:', $longopts ); $this->mergeLongOpts($params, $longopts); diff --git a/libraries/sql-parser/src/Utils/Formatter.php b/libraries/sql-parser/src/Utils/Formatter.php index fd41f9e1ab..56691ebbfb 100644 --- a/libraries/sql-parser/src/Utils/Formatter.php +++ b/libraries/sql-parser/src/Utils/Formatter.php @@ -122,49 +122,49 @@ class Formatter 'type' => Token::TYPE_KEYWORD, 'flags' => Token::FLAG_KEYWORD_RESERVED, 'html' => 'class="sql-reserved"', - 'cli' => "\e[35m", + 'cli' => "\x1b[35m", 'function' => 'strtoupper', ), array( 'type' => Token::TYPE_KEYWORD, 'flags' => 0, 'html' => 'class="sql-keyword"', - 'cli' => "\e[95m", + 'cli' => "\x1b[95m", 'function' => 'strtoupper', ), array( 'type' => Token::TYPE_COMMENT, 'flags' => 0, 'html' => 'class="sql-comment"', - 'cli' => "\e[37m", + 'cli' => "\x1b[37m", 'function' => '', ), array( 'type' => Token::TYPE_BOOL, 'flags' => 0, 'html' => 'class="sql-atom"', - 'cli' => "\e[36m", + 'cli' => "\x1b[36m", 'function' => 'strtoupper', ), array( 'type' => Token::TYPE_NUMBER, 'flags' => 0, 'html' => 'class="sql-number"', - 'cli' => "\e[92m", + 'cli' => "\x1b[92m", 'function' => 'strtolower', ), array( 'type' => Token::TYPE_STRING, 'flags' => 0, 'html' => 'class="sql-string"', - 'cli' => "\e[91m", + 'cli' => "\x1b[91m", 'function' => '', ), array( 'type' => Token::TYPE_SYMBOL, 'flags' => 0, 'html' => 'class="sql-variable"', - 'cli' => "\e[36m", + 'cli' => "\x1b[36m", 'function' => '', ), ) @@ -420,7 +420,7 @@ class Formatter } if ($this->options['type'] === 'cli') { - return $ret . "\e[0m"; + return $ret . "\x1b[0m"; } return $ret; @@ -459,7 +459,7 @@ class Formatter } if ($this->options['type'] === 'cli') { - return "\e[39m" . $text; + return "\x1b[39m" . $text; } return $text; }