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 odps sql parser.

Browse Source
This commit is contained in:
wenshao
2017-07-17 16:47:03 +08:00
parent 5032b3e21a
commit b52d70d40d
4 changed files with 142 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java
+2
View File
@@ -179,6 +179,8 @@ public class SQLJoinTableSource extends SQLTableSourceImpl implements SQLReplace
NATURAL_JOIN("NATURAL JOIN"), //
NATURAL_INNER_JOIN("NATURAL INNER JOIN"), //
LEFT_OUTER_JOIN("LEFT JOIN"), //
LEFT_SEMI_JOIN("LEFT SEMI JOIN"), //
LEFT_ANTI_JOIN("LEFT ANTI JOIN"), //
RIGHT_OUTER_JOIN("RIGHT JOIN"), //
FULL_OUTER_JOIN("FULL JOIN"),//
STRAIGHT_JOIN("STRAIGHT_JOIN"), //
src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java
+12 -2
View File
@@ -471,12 +471,22 @@ public class SQLSelectParser extends SQLParser {
if (lexer.token() == Token.LEFT) {
lexer.nextToken();
if (lexer.token() == Token.OUTER) {
if (identifierEquals("SEMI")) {
lexer.nextToken();
joinType = SQLJoinTableSource.JoinType.LEFT_SEMI_JOIN;
} else if (identifierEquals("ANTI")) {
lexer.nextToken();
joinType = SQLJoinTableSource.JoinType.LEFT_ANTI_JOIN;
} else if (lexer.token() == Token.OUTER) {
lexer.nextToken();
joinType = SQLJoinTableSource.JoinType.LEFT_OUTER_JOIN;
} else {
joinType = SQLJoinTableSource.JoinType.LEFT_OUTER_JOIN;
}
accept(Token.JOIN);
joinType = SQLJoinTableSource.JoinType.LEFT_OUTER_JOIN;
} else if (lexer.token() == Token.RIGHT) {
lexer.nextToken();
if (lexer.token() == Token.OUTER) {
src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest32.java
+64
View File
@@ -0,0 +1,64 @@
/*
* Copyright 1999-2017 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.druid.bvt.sql.odps;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
import com.alibaba.druid.util.JdbcConstants;
import junit.framework.TestCase;
import java.util.List;
public class OdpsSelectTest32 extends TestCase {
public void test_select() throws Exception {
// 1095288847322
String sql = "SELECT * from mytable1 a LEFT SEMI JOIN mytable2 b on a.id=b.id;";//
assertEquals("SELECT *\n" +
"FROM mytable1 a\n" +
"LEFT SEMI JOIN mytable2 b\n" +
"ON a.id = b.id;", SQLUtils.formatOdps(sql));
assertEquals("select *\n" +
"from mytable1 a\n" +
"left semi join mytable2 b\n" +
"on a.id = b.id;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION));
List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS);
SQLStatement stmt = statementList.get(0);
assertEquals(1, statementList.size());
SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS);
stmt.accept(visitor);
System.out.println("Tables : " + visitor.getTables());
System.out.println("fields : " + visitor.getColumns());
// System.out.println("coditions : " + visitor.getConditions());
// System.out.println("orderBy : " + visitor.getOrderByColumns());
assertEquals(2, visitor.getTables().size());
assertEquals(2, visitor.getColumns().size());
assertEquals(2, visitor.getConditions().size());
// System.out.println(SQLUtils.formatOdps(sql));
// assertTrue(visitor.getColumns().contains(new Column("abc", "name")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest33.java
+64
View File
@@ -0,0 +1,64 @@
/*
* Copyright 1999-2017 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.druid.bvt.sql.odps;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
import com.alibaba.druid.util.JdbcConstants;
import junit.framework.TestCase;
import java.util.List;
public class OdpsSelectTest33 extends TestCase {
public void test_select() throws Exception {
// 1095288847322
String sql = "SELECT * from mytable1 a LEFT ANTI JOIN mytable2 b on a.id=b.id;";//
assertEquals("SELECT *\n" +
"FROM mytable1 a\n" +
"LEFT ANTI JOIN mytable2 b\n" +
"ON a.id = b.id;", SQLUtils.formatOdps(sql));
assertEquals("select *\n" +
"from mytable1 a\n" +
"left anti join mytable2 b\n" +
"on a.id = b.id;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION));
List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS);
SQLStatement stmt = statementList.get(0);
assertEquals(1, statementList.size());
SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS);
stmt.accept(visitor);
System.out.println("Tables : " + visitor.getTables());
System.out.println("fields : " + visitor.getColumns());
// System.out.println("coditions : " + visitor.getConditions());
// System.out.println("orderBy : " + visitor.getOrderByColumns());
assertEquals(2, visitor.getTables().size());
assertEquals(2, visitor.getColumns().size());
assertEquals(2, visitor.getConditions().size());
// System.out.println(SQLUtils.formatOdps(sql));
// assertTrue(visitor.getColumns().contains(new Column("abc", "name")));
}
}