Skip to content

Commit 3e2e737

Browse files
nijelnijel
authored
Merge pull request #95 from devenbansod/fix_93
Fix #93 : Fix parsing of NATURAL JOIN, CROSS JOIN and related joins
2 parents 9c4d5f0 + 2a046e8 commit 3e2e737

25 files changed

+170
-62
lines changed

‎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/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/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
),

‎src/Statements/SelectStatement.php‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -82,30 +82,35 @@ class SelectStatement extends Statement
8282
* @var array
8383
*/
8484
public static $CLAUSES = array(
85-
'SELECT' => array('SELECT', 2),
85+
'SELECT' => array('SELECT', 2),
8686
// Used for options.
87-
'_OPTIONS' => array('_OPTIONS', 1),
87+
'_OPTIONS' => array('_OPTIONS', 1),
8888
// Used for selected expressions.
89-
'_SELECT' => array('SELECT', 1),
90-
'INTO' => array('INTO', 3),
91-
'FROM' => array('FROM', 3),
92-
'PARTITION' => array('PARTITION', 3),
93-
94-
'JOIN' => array('JOIN', 1),
95-
'FULL JOIN' => array('FULL JOIN', 1),
96-
'INNER JOIN' => array('INNER JOIN', 1),
97-
'LEFT JOIN' => array('LEFT JOIN', 1),
98-
'LEFT OUTER JOIN' => array('LEFT OUTER JOIN', 1),
99-
'RIGHT JOIN' => array('RIGHT JOIN', 1),
100-
'RIGHT OUTER JOIN' => array('RIGHT OUTER JOIN', 1),
101-
102-
'WHERE' => array('WHERE', 3),
103-
'GROUP BY' => array('GROUP BY', 3),
104-
'HAVING' => array('HAVING', 3),
105-
'ORDER BY' => array('ORDER BY', 3),
106-
'LIMIT' => array('LIMIT', 3),
107-
'PROCEDURE' => array('PROCEDURE', 3),
108-
'UNION' => array('UNION', 1),
89+
'_SELECT' => array('SELECT', 1),
90+
'INTO' => array('INTO', 3),
91+
'FROM' => array('FROM', 3),
92+
'PARTITION' => array('PARTITION', 3),
93+
94+
'JOIN' => array('JOIN', 1),
95+
'FULL JOIN' => array('FULL JOIN', 1),
96+
'INNER JOIN' => array('INNER JOIN', 1),
97+
'LEFT JOIN' => array('LEFT JOIN', 1),
98+
'LEFT OUTER JOIN' => array('LEFT OUTER JOIN', 1),
99+
'RIGHT JOIN' => array('RIGHT JOIN', 1),
100+
'RIGHT OUTER JOIN' => array('RIGHT OUTER JOIN', 1),
101+
'NATURAL JOIN' => array('NATURAL JOIN', 1),
102+
'NATURAL LEFT JOIN' => array('NATURAL LEFT JOIN', 1),
103+
'NATURAL RIGHT JOIN' => array('NATURAL RIGHT JOIN', 1),
104+
'NATURAL LEFT OUTER JOIN' => array('NATURAL LEFT OUTER JOIN', 1),
105+
'NATURAL RIGHT OUTER JOIN' => array('NATURAL RIGHT JOIN', 1),
106+
107+
'WHERE' => array('WHERE', 3),
108+
'GROUP BY' => array('GROUP BY', 3),
109+
'HAVING' => array('HAVING', 3),
110+
'ORDER BY' => array('ORDER BY', 3),
111+
'LIMIT' => array('LIMIT', 3),
112+
'PROCEDURE' => array('PROCEDURE', 3),
113+
'UNION' => array('UNION', 1),
109114
// These are available only when `UNION` is present.
110115
// 'ORDER BY' => array('ORDER BY', 3),
111116
// 'LIMIT' => array('LIMIT', 3),

‎tests/Parser/SelectStatementTest.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ public function testSelectProvider()
4747
array('parser/parseSelectCaseErr3'),
4848
array('parser/parseSelectCaseErr4'),
4949
array('parser/parseSelectCaseErr5'),
50+
array('parser/parseSelectJoinCross'),
51+
array('parser/parseSelectJoinNatural'),
52+
array('parser/parseSelectJoinNaturalLeft'),
53+
array('parser/parseSelectJoinNaturalRight'),
54+
array('parser/parseSelectJoinNaturalLeftOuter'),
55+
array('parser/parseSelectJoinNaturalRightOuter'),
56+
array('parser/parseSelectJoinMultiple'),
5057
);
5158
}
5259
}

0 commit comments

Comments
 (0)