Skip to content

Commit 94e550e

Browse files
devenbansoddevenbansod
committed
2 parents c70914a + dccefe4 commit 94e550e

34 files changed

+338
-63
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
## [Unreleased]
44

5+
## [3.4.11] - 2016-10-25
6+
57
* Fixed parsing of ON UPDATE option in field definition of TIMESTAMP type with precision
8+
* Fixed parsing of NATURAL JOIN, CROSS JOIN and related joins.
9+
* Fixed parsing of BEGIN/END labels.
610

711
## [3.4.10] - 2016-10-03
812

‎src/Components/JoinKeyword.php‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class JoinKeyword extends Component
3030
* @var array
3131
*/
3232
public static $JOINS = array(
33+
'CROSS JOIN' => 'CROSS',
3334
'FULL JOIN' => 'FULL',
3435
'FULL OUTER JOIN' => 'FULL',
3536
'INNER JOIN' => 'INNER',
@@ -38,6 +39,12 @@ class JoinKeyword extends Component
3839
'LEFT OUTER JOIN' => 'LEFT',
3940
'RIGHT JOIN' => 'RIGHT',
4041
'RIGHT OUTER JOIN' => 'RIGHT',
42+
'NATURAL JOIN' => 'NATURAL',
43+
'NATURAL LEFT JOIN' => 'NATURAL LEFT',
44+
'NATURAL LEFT JOIN' => 'NATURAL LEFT',
45+
'NATURAL RIGHT JOIN' => 'NATURAL RIGHT',
46+
'NATURAL LEFT OUTER JOIN' => 'NATURAL LEFT OUTER',
47+
'NATURAL RIGHT OUTER JOIN' => 'NATURAL RIGHT OUTER',
4148
'STRAIGHT_JOIN' => 'STRAIGHT',
4249
);
4350

@@ -147,8 +154,17 @@ public static function parse(Parser $parser, TokensList $list, array $options =
147154
} elseif ($token->value === 'USING') {
148155
$state = 4;
149156
} else {
150-
/* Next clause is starting */
151-
break;
157+
if (($token->type === Token::TYPE_KEYWORD)
158+
&& (!empty(static::$JOINS[$token->value]))
159+
) {
160+
$ret[] = $expr;
161+
$expr = new JoinKeyword();
162+
$expr->type = static::$JOINS[$token->value];
163+
$state = 1;
164+
} else {
165+
/* Next clause is starting */
166+
break;
167+
}
152168
}
153169
}
154170
} elseif ($state === 3) {

‎src/Context.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@ abstract class Context
2929
*/
3030
const KEYWORD_MAX_LENGTH = 30;
3131

32+
/**
33+
* The maximum length of a label.
34+
*
35+
* @see static::$TOKEN_LABEL
36+
* Ref: https://dev.mysql.com/doc/refman/5.7/en/statement-labels.html
37+
*
38+
* @var int
39+
*/
40+
const LABEL_MAX_LENGTH = 16;
41+
3242
/**
3343
* The maximum length of an operator.
3444
*

‎src/Contexts/ContextMySql50000.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,20 +145,21 @@ class ContextMySql50000 extends Context
145145
'AND CHAIN' => 7, 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7,
146146
'LESS THAN' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7,
147147
'UNION ALL' => 7,
148-
'INNER JOIN' => 7, 'LINEAR KEY' => 7, 'NO RELEASE' => 7, 'OR REPLACE' => 7,
149-
'RIGHT JOIN' => 7,
148+
'CROSS JOIN' => 7, 'INNER JOIN' => 7, 'LINEAR KEY' => 7, 'NO RELEASE' => 7,
149+
'OR REPLACE' => 7, 'RIGHT JOIN' => 7,
150150
'LINEAR HASH' => 7,
151-
'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'PARTITION BY' => 7,
152-
'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
151+
'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'NATURAL JOIN' => 7,
152+
'PARTITION BY' => 7, 'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
153153
'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
154154
'DATA DIRECTORY' => 7, 'UNION DISTINCT' => 7,
155155
'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'FULL OUTER JOIN' => 7,
156156
'INDEX DIRECTORY' => 7, 'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
157157
'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
158-
'START TRANSACTION' => 7,
159-
'SELECT TRANSACTION' => 7,
158+
'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
159+
'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
160160
'DEFAULT CHARACTER SET' => 7,
161-
'WITH CONSISTENT SNAPSHOT' => 7,
161+
'NATURAL LEFT OUTER JOIN' => 7,
162+
'NATURAL RIGHT OUTER JOIN' => 7, 'WITH CONSISTENT SNAPSHOT' => 7,
162163

163164
'BIT' => 9, 'XML' => 9,
164165
'ENUM' => 9, 'JSON' => 9, 'TEXT' => 9,

‎src/Contexts/ContextMySql50100.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,20 +159,21 @@ class ContextMySql50100 extends Context
159159
'AND CHAIN' => 7, 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7,
160160
'LESS THAN' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7,
161161
'UNION ALL' => 7,
162-
'INNER JOIN' => 7, 'LINEAR KEY' => 7, 'NO RELEASE' => 7, 'OR REPLACE' => 7,
163-
'RIGHT JOIN' => 7,
162+
'CROSS JOIN' => 7, 'INNER JOIN' => 7, 'LINEAR KEY' => 7, 'NO RELEASE' => 7,
163+
'OR REPLACE' => 7, 'RIGHT JOIN' => 7,
164164
'LINEAR HASH' => 7,
165-
'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'PARTITION BY' => 7,
166-
'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
165+
'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'NATURAL JOIN' => 7,
166+
'PARTITION BY' => 7, 'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
167167
'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
168168
'DATA DIRECTORY' => 7, 'UNION DISTINCT' => 7,
169169
'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'FULL OUTER JOIN' => 7,
170170
'INDEX DIRECTORY' => 7, 'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
171171
'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
172-
'START TRANSACTION' => 7,
173-
'SELECT TRANSACTION' => 7,
172+
'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
173+
'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
174174
'DEFAULT CHARACTER SET' => 7,
175-
'WITH CONSISTENT SNAPSHOT' => 7,
175+
'NATURAL LEFT OUTER JOIN' => 7,
176+
'NATURAL RIGHT OUTER JOIN' => 7, 'WITH CONSISTENT SNAPSHOT' => 7,
176177

177178
'BIT' => 9, 'XML' => 9,
178179
'ENUM' => 9, 'JSON' => 9, 'TEXT' => 9,

‎src/Contexts/ContextMySql50500.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,20 +163,21 @@ class ContextMySql50500 extends Context
163163
'AND CHAIN' => 7, 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7,
164164
'LESS THAN' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7,
165165
'UNION ALL' => 7,
166-
'INNER JOIN' => 7, 'LINEAR KEY' => 7, 'NO RELEASE' => 7, 'OR REPLACE' => 7,
167-
'RIGHT JOIN' => 7,
166+
'CROSS JOIN' => 7, 'INNER JOIN' => 7, 'LINEAR KEY' => 7, 'NO RELEASE' => 7,
167+
'OR REPLACE' => 7, 'RIGHT JOIN' => 7,
168168
'LINEAR HASH' => 7,
169-
'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'PARTITION BY' => 7,
170-
'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
169+
'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'NATURAL JOIN' => 7,
170+
'PARTITION BY' => 7, 'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
171171
'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
172172
'DATA DIRECTORY' => 7, 'UNION DISTINCT' => 7,
173173
'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'FULL OUTER JOIN' => 7,
174174
'INDEX DIRECTORY' => 7, 'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
175175
'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
176-
'START TRANSACTION' => 7,
177-
'SELECT TRANSACTION' => 7,
176+
'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
177+
'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
178178
'DEFAULT CHARACTER SET' => 7,
179-
'WITH CONSISTENT SNAPSHOT' => 7,
179+
'NATURAL LEFT OUTER JOIN' => 7,
180+
'NATURAL RIGHT OUTER JOIN' => 7, 'WITH CONSISTENT SNAPSHOT' => 7,
180181

181182
'BIT' => 9, 'XML' => 9,
182183
'ENUM' => 9, 'JSON' => 9, 'TEXT' => 9,

‎src/Contexts/ContextMySql50600.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,20 +169,21 @@ class ContextMySql50600 extends Context
169169
'AND CHAIN' => 7, 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7,
170170
'LESS THAN' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7,
171171
'UNION ALL' => 7,
172-
'INNER JOIN' => 7, 'LINEAR KEY' => 7, 'NO RELEASE' => 7, 'OR REPLACE' => 7,
173-
'RIGHT JOIN' => 7,
172+
'CROSS JOIN' => 7, 'INNER JOIN' => 7, 'LINEAR KEY' => 7, 'NO RELEASE' => 7,
173+
'OR REPLACE' => 7, 'RIGHT JOIN' => 7,
174174
'LINEAR HASH' => 7,
175-
'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'PARTITION BY' => 7,
176-
'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
175+
'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'NATURAL JOIN' => 7,
176+
'PARTITION BY' => 7, 'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
177177
'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
178178
'DATA DIRECTORY' => 7, 'UNION DISTINCT' => 7,
179179
'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'FULL OUTER JOIN' => 7,
180180
'INDEX DIRECTORY' => 7, 'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
181181
'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
182-
'START TRANSACTION' => 7,
183-
'SELECT TRANSACTION' => 7,
182+
'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
183+
'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
184184
'DEFAULT CHARACTER SET' => 7,
185-
'WITH CONSISTENT SNAPSHOT' => 7,
185+
'NATURAL LEFT OUTER JOIN' => 7,
186+
'NATURAL RIGHT OUTER JOIN' => 7, 'WITH CONSISTENT SNAPSHOT' => 7,
186187

187188
'BIT' => 9, 'XML' => 9,
188189
'ENUM' => 9, 'JSON' => 9, 'TEXT' => 9,

‎src/Contexts/ContextMySql50700.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,20 +175,21 @@ class ContextMySql50700 extends Context
175175
'AND CHAIN' => 7, 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7,
176176
'LESS THAN' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7,
177177
'UNION ALL' => 7,
178-
'INNER JOIN' => 7, 'LINEAR KEY' => 7, 'NO RELEASE' => 7, 'OR REPLACE' => 7,
179-
'RIGHT JOIN' => 7,
178+
'CROSS JOIN' => 7, 'INNER JOIN' => 7, 'LINEAR KEY' => 7, 'NO RELEASE' => 7,
179+
'OR REPLACE' => 7, 'RIGHT JOIN' => 7,
180180
'LINEAR HASH' => 7,
181-
'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'PARTITION BY' => 7,
182-
'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
181+
'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'NATURAL JOIN' => 7,
182+
'PARTITION BY' => 7, 'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
183183
'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
184184
'DATA DIRECTORY' => 7, 'UNION DISTINCT' => 7,
185185
'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'FULL OUTER JOIN' => 7,
186186
'INDEX DIRECTORY' => 7, 'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
187187
'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
188-
'START TRANSACTION' => 7,
189-
'SELECT TRANSACTION' => 7,
188+
'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
189+
'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
190190
'DEFAULT CHARACTER SET' => 7,
191-
'WITH CONSISTENT SNAPSHOT' => 7,
191+
'NATURAL LEFT OUTER JOIN' => 7,
192+
'NATURAL RIGHT OUTER JOIN' => 7, 'WITH CONSISTENT SNAPSHOT' => 7,
192193

193194
'BIT' => 9, 'XML' => 9,
194195
'ENUM' => 9, 'JSON' => 9, 'TEXT' => 9,

‎src/Lexer.php‎

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class Lexer
7676

7777
'parseDelimiter', 'parseWhitespace', 'parseNumber',
7878
'parseComment', 'parseOperator', 'parseBool', 'parseString',
79-
'parseSymbol', 'parseKeyword', 'parseUnknown'
79+
'parseSymbol', 'parseKeyword', 'parseLabel', 'parseUnknown'
8080
);
8181

8282
/**
@@ -441,6 +441,61 @@ public function parseKeyword()
441441
return $ret;
442442
}
443443

444+
/**
445+
* Parses a label.
446+
*
447+
* @return Token
448+
*/
449+
public function parseLabel()
450+
{
451+
$token = '';
452+
453+
/**
454+
* Value to be returned.
455+
*
456+
* @var Token $ret
457+
*/
458+
$ret = null;
459+
460+
/**
461+
* The value of `$this->last` where `$token` ends in `$this->str`.
462+
*
463+
* @var int $iEnd
464+
*/
465+
$iEnd = $this->last;
466+
467+
/**
468+
* Whether last parsed character is a whitespace.
469+
*
470+
* @var bool $lastSpace
471+
*/
472+
$lastSpace = false;
473+
474+
for ($j = 1; $j < Context::LABEL_MAX_LENGTH && $this->last < $this->len; ++$j, ++$this->last) {
475+
// Composed keywords shouldn't have more than one whitespace between
476+
// keywords.
477+
if (Context::isWhitespace($this->str[$this->last])) {
478+
if ($lastSpace) {
479+
--$j; // The size of the keyword didn't increase.
480+
continue;
481+
} else {
482+
$lastSpace = true;
483+
}
484+
} elseif ($this->str[$this->last] === ':') {
485+
$token .= $this->str[$this->last];
486+
$ret = new Token($token, Token::TYPE_LABEL);
487+
$iEnd = $this->last;
488+
break;
489+
} else {
490+
$lastSpace = false;
491+
}
492+
$token .= $this->str[$this->last];
493+
}
494+
495+
$this->last = $iEnd;
496+
return $ret;
497+
}
498+
444499
/**
445500
* Parses an operator.
446501
*

‎src/Parser.php‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ class Parser
154154
'field' => 'tables',
155155
'options' => array('parseField' => 'table'),
156156
),
157+
'CROSS JOIN' => array(
158+
'class' => 'SqlParser\\Components\\JoinKeyword',
159+
'field' => 'join',
160+
),
157161
'DROP' => array(
158162
'class' => 'SqlParser\\Components\\ExpressionArray',
159163
'field' => 'fields',
@@ -213,7 +217,23 @@ class Parser
213217
'class' => 'SqlParser\\Components\\JoinKeyword',
214218
'field' => 'join',
215219
),
216-
'STRAIGHT_JOIN' => array(
220+
'NATURAL JOIN' => array(
221+
'class' => 'SqlParser\\Components\\JoinKeyword',
222+
'field' => 'join',
223+
),
224+
'NATURAL LEFT JOIN' => array(
225+
'class' => 'SqlParser\\Components\\JoinKeyword',
226+
'field' => 'join',
227+
),
228+
'NATURAL RIGHT JOIN' => array(
229+
'class' => 'SqlParser\\Components\\JoinKeyword',
230+
'field' => 'join',
231+
),
232+
'NATURAL LEFT OUTER JOIN' => array(
233+
'class' => 'SqlParser\\Components\\JoinKeyword',
234+
'field' => 'join',
235+
),
236+
'NATURAL RIGHT OUTER JOIN' => array(
217237
'class' => 'SqlParser\\Components\\JoinKeyword',
218238
'field' => 'join',
219239
),

0 commit comments

Comments
 (0)