Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

improved PageUtils & support natural join. issue #1711

Browse Source
This commit is contained in:
wenshao
2017-05-08 03:27:32 +08:00
parent 2dbe1da578
commit 306f956273
8 changed files with 221 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java
+14
View File
@@ -458,6 +458,12 @@ public class SQLSelectParser extends SQLParser {
SQLJoinTableSource.JoinType joinType = null;
boolean natural = false;
if (JdbcConstants.MYSQL.equals(dbType) && identifierEquals("NATURAL")) {
lexer.nextToken();
natural = true;
}
if (lexer.token() == Token.LEFT) {
lexer.nextToken();
if (lexer.token() == Token.OUTER) {
@@ -516,6 +522,14 @@ public class SQLSelectParser extends SQLParser {
join.setJoinType(joinType);
join.setRight(parseTableSource());
if (!natural) {
if (JdbcConstants.MYSQL.equals(dbType) && "NATURAL".equalsIgnoreCase(tableSource.getAlias())) {
tableSource.setAlias(null);
natural = true;
}
}
join.setNatural(natural);
if (lexer.token() == Token.ON) {
lexer.nextToken();
join.setCondition(expr());