@@ -505,7 +505,7 @@ |
||
505 | 505 | * @param Statement $statement The parsed query that has to be modified. |
506 | 506 | * @param TokensList $list The list of tokens. |
507 | 507 | * @param string $clause The clause to be returned. |
508 | - * @param int|string $type The type of the search. |
|
508 | + * @param integer $type The type of the search. |
|
509 | 509 | * If int, |
510 | 510 | * -1 for everything that was before |
511 | 511 | * 0 only for the clause |
@@ -77,7 +77,7 @@ |
||
77 | 77 | * @param Parser $parser The parser that serves as context. |
78 | 78 | * @param TokensList $list The list of tokens that are being parsed. |
79 | 79 | * |
80 | - * @return Expression |
|
80 | + * @return CaseExpression |
|
81 | 81 | */ |
82 | 82 | public static function parse(Parser $parser, TokensList $list) |
83 | 83 | { |
@@ -194,7 +194,7 @@ |
||
194 | 194 | } |
195 | 195 | |
196 | 196 | /** |
197 | - * @param PartitionDefinition|PartitionDefinition[] $component the component to be built |
|
197 | + * @param PartitionDefinition[] $component the component to be built |
|
198 | 198 | * @param array $options parameters for building |
199 | 199 | * |
200 | 200 | * @return string |
@@ -52,15 +52,15 @@ |
||
52 | 52 | * @var array |
53 | 53 | */ |
54 | 54 | public static $CLAUSES = array( |
55 | - 'UPDATE' => array('UPDATE', 2), |
|
55 | + 'UPDATE' => array('UPDATE', 2), |
|
56 | 56 | // Used for options. |
57 | - '_OPTIONS' => array('_OPTIONS', 1), |
|
57 | + '_OPTIONS' => array('_OPTIONS', 1), |
|
58 | 58 | // Used for updated tables. |
59 | - '_UPDATE' => array('UPDATE', 1), |
|
60 | - 'SET' => array('SET', 3), |
|
61 | - 'WHERE' => array('WHERE', 3), |
|
62 | - 'ORDER BY' => array('ORDER BY', 3), |
|
63 | - 'LIMIT' => array('LIMIT', 3), |
|
59 | + '_UPDATE' => array('UPDATE', 1), |
|
60 | + 'SET' => array('SET', 3), |
|
61 | + 'WHERE' => array('WHERE', 3), |
|
62 | + 'ORDER BY' => array('ORDER BY', 3), |
|
63 | + 'LIMIT' => array('LIMIT', 3), |
|
64 | 64 | ); |
65 | 65 | |
66 | 66 | /** |
@@ -49,12 +49,12 @@ |
||
49 | 49 | * @var array |
50 | 50 | */ |
51 | 51 | public static $CLAUSES = array( |
52 | - 'DROP' => array('DROP', 2), |
|
52 | + 'DROP' => array('DROP', 2), |
|
53 | 53 | // Used for options. |
54 | - '_OPTIONS' => array('_OPTIONS', 1), |
|
54 | + '_OPTIONS' => array('_OPTIONS', 1), |
|
55 | 55 | // Used for select expressions. |
56 | - 'DROP_' => array('DROP', 1), |
|
57 | - 'ON' => array('ON', 3), |
|
56 | + 'DROP_' => array('DROP', 1), |
|
57 | + 'ON' => array('ON', 3), |
|
58 | 58 | ); |
59 | 59 | |
60 | 60 | /** |
@@ -83,36 +83,36 @@ |
||
83 | 83 | * @var array |
84 | 84 | */ |
85 | 85 | public static $CLAUSES = array( |
86 | - 'SELECT' => array('SELECT', 2), |
|
86 | + 'SELECT' => array('SELECT', 2), |
|
87 | 87 | // Used for options. |
88 | - '_OPTIONS' => array('_OPTIONS', 1), |
|
88 | + '_OPTIONS' => array('_OPTIONS', 1), |
|
89 | 89 | // Used for selected expressions. |
90 | - '_SELECT' => array('SELECT', 1), |
|
91 | - 'INTO' => array('INTO', 3), |
|
92 | - 'FROM' => array('FROM', 3), |
|
93 | - 'PARTITION' => array('PARTITION', 3), |
|
94 | - |
|
95 | - 'JOIN' => array('JOIN', 1), |
|
96 | - 'FULL JOIN' => array('FULL JOIN', 1), |
|
97 | - 'INNER JOIN' => array('INNER JOIN', 1), |
|
98 | - 'LEFT JOIN' => array('LEFT JOIN', 1), |
|
99 | - 'LEFT OUTER JOIN' => array('LEFT OUTER JOIN', 1), |
|
100 | - 'RIGHT JOIN' => array('RIGHT JOIN', 1), |
|
101 | - 'RIGHT OUTER JOIN' => array('RIGHT OUTER JOIN', 1), |
|
102 | - 'NATURAL JOIN' => array('NATURAL JOIN', 1), |
|
103 | - 'NATURAL LEFT JOIN' => array('NATURAL LEFT JOIN', 1), |
|
104 | - 'NATURAL RIGHT JOIN' => array('NATURAL RIGHT JOIN', 1), |
|
90 | + '_SELECT' => array('SELECT', 1), |
|
91 | + 'INTO' => array('INTO', 3), |
|
92 | + 'FROM' => array('FROM', 3), |
|
93 | + 'PARTITION' => array('PARTITION', 3), |
|
94 | + |
|
95 | + 'JOIN' => array('JOIN', 1), |
|
96 | + 'FULL JOIN' => array('FULL JOIN', 1), |
|
97 | + 'INNER JOIN' => array('INNER JOIN', 1), |
|
98 | + 'LEFT JOIN' => array('LEFT JOIN', 1), |
|
99 | + 'LEFT OUTER JOIN' => array('LEFT OUTER JOIN', 1), |
|
100 | + 'RIGHT JOIN' => array('RIGHT JOIN', 1), |
|
101 | + 'RIGHT OUTER JOIN' => array('RIGHT OUTER JOIN', 1), |
|
102 | + 'NATURAL JOIN' => array('NATURAL JOIN', 1), |
|
103 | + 'NATURAL LEFT JOIN' => array('NATURAL LEFT JOIN', 1), |
|
104 | + 'NATURAL RIGHT JOIN' => array('NATURAL RIGHT JOIN', 1), |
|
105 | 105 | 'NATURAL LEFT OUTER JOIN' => array('NATURAL LEFT OUTER JOIN', 1), |
106 | - 'NATURAL RIGHT OUTER JOIN' => array('NATURAL RIGHT JOIN', 1), |
|
107 | - |
|
108 | - 'WHERE' => array('WHERE', 3), |
|
109 | - 'GROUP BY' => array('GROUP BY', 3), |
|
110 | - 'HAVING' => array('HAVING', 3), |
|
111 | - 'ORDER BY' => array('ORDER BY', 3), |
|
112 | - 'LIMIT' => array('LIMIT', 3), |
|
113 | - 'PROCEDURE' => array('PROCEDURE', 3), |
|
114 | - 'UNION' => array('UNION', 1), |
|
115 | - '_END_OPTIONS' => array('_END_OPTIONS', 1), |
|
106 | + 'NATURAL RIGHT OUTER JOIN' => array('NATURAL RIGHT JOIN', 1), |
|
107 | + |
|
108 | + 'WHERE' => array('WHERE', 3), |
|
109 | + 'GROUP BY' => array('GROUP BY', 3), |
|
110 | + 'HAVING' => array('HAVING', 3), |
|
111 | + 'ORDER BY' => array('ORDER BY', 3), |
|
112 | + 'LIMIT' => array('LIMIT', 3), |
|
113 | + 'PROCEDURE' => array('PROCEDURE', 3), |
|
114 | + 'UNION' => array('UNION', 1), |
|
115 | + '_END_OPTIONS' => array('_END_OPTIONS', 1), |
|
116 | 116 | // These are available only when `UNION` is present. |
117 | 117 | // 'ORDER BY' => array('ORDER BY', 3), |
118 | 118 | // 'LIMIT' => array('LIMIT', 3), |
@@ -282,8 +282,8 @@ |
||
282 | 282 | * @var string |
283 | 283 | */ |
284 | 284 | $formattedName = str_replace( |
285 | - array('Context', 'MySql', '00', '0'), |
|
286 | - array('', 'MySQL ', '', '.'), |
|
285 | + array('Context', 'MySql', '00', '0'), |
|
286 | + array('', 'MySQL ', '', '.'), |
|
287 | 287 | $class |
288 | 288 | ); |
289 | 289 |
@@ -113,7 +113,7 @@ |
||
113 | 113 | ':=' => 8, |
114 | 114 | |
115 | 115 | // @see Token::FLAG_OPERATOR_SQL |
116 | - '(' => 16, ')' => 16, '.' => 16, ',' => 16, ';' => 16, |
|
116 | + '(' => 16, ')' => 16, '.' => 16, ',' => 16, ';' => 16, |
|
117 | 117 | ); |
118 | 118 | |
119 | 119 | /** |
@@ -67,15 +67,15 @@ |
||
67 | 67 | * @var array |
68 | 68 | */ |
69 | 69 | public static $CLAUSES = array( |
70 | - 'DELETE' => array('DELETE', 2), |
|
70 | + 'DELETE' => array('DELETE', 2), |
|
71 | 71 | // Used for options. |
72 | - '_OPTIONS' => array('_OPTIONS', 1), |
|
73 | - 'FROM' => array('FROM', 3), |
|
74 | - 'PARTITION' => array('PARTITION', 3), |
|
75 | - 'USING' => array('USING', 3), |
|
76 | - 'WHERE' => array('WHERE', 3), |
|
77 | - 'ORDER BY' => array('ORDER BY', 3), |
|
78 | - 'LIMIT' => array('LIMIT', 3), |
|
72 | + '_OPTIONS' => array('_OPTIONS', 1), |
|
73 | + 'FROM' => array('FROM', 3), |
|
74 | + 'PARTITION' => array('PARTITION', 3), |
|
75 | + 'USING' => array('USING', 3), |
|
76 | + 'WHERE' => array('WHERE', 3), |
|
77 | + 'ORDER BY' => array('ORDER BY', 3), |
|
78 | + 'LIMIT' => array('LIMIT', 3), |
|
79 | 79 | ); |
80 | 80 | |
81 | 81 | /** |