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

bug fixed sql parser for db2. for issue #2332

Browse Source
This commit is contained in:
wenshao
2018-02-11 11:25:11 +08:00
parent 4aadb7313f
commit afea04f227
6 changed files with 147 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2ExprParser.java
+12
View File
@@ -23,6 +23,7 @@ import com.alibaba.druid.sql.parser.SQLExprParser;
import com.alibaba.druid.sql.parser.SQLParserFeature;
import com.alibaba.druid.sql.parser.Token;
import com.alibaba.druid.util.FnvHash;
import com.alibaba.druid.util.JdbcConstants;
import java.util.Arrays;
@@ -46,6 +47,7 @@ public class DB2ExprParser extends SQLExprParser {
public DB2ExprParser(String sql){
this(new DB2Lexer(sql));
this.lexer.nextToken();
this.dbType = JdbcConstants.DB2;
}
public DB2ExprParser(String sql, SQLParserFeature... features){
@@ -57,6 +59,7 @@ public class DB2ExprParser extends SQLExprParser {
super(lexer);
this.aggregateFunctions = AGGREGATE_FUNCTIONS;
this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES;
this.dbType = JdbcConstants.DB2;
}
public SQLExpr primaryRest(SQLExpr expr) {
@@ -116,6 +119,15 @@ public class DB2ExprParser extends SQLExprParser {
expr = new SQLIdentifierExpr("CURRENT SCHEMA");
}
}
} else if (lexer.identifierEquals(FnvHash.Constants.PATH)) {
if (expr instanceof SQLIdentifierExpr) {
SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
if (identExpr.hashCode64() == FnvHash.Constants.CURRENT) {
lexer.nextToken();
expr = new SQLIdentifierExpr("CURRENT PATH");
}
}
} else if (lexer.identifierEquals(FnvHash.Constants.MONTHS)) {
SQLIntervalExpr intervalExpr = new SQLIntervalExpr(expr, SQLIntervalUnit.MONTH);
lexer.nextToken();
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
+1 -1
View File
@@ -3679,7 +3679,7 @@ public class MySqlStatementParser extends SQLStatementParser {
renameStmt.addItem(item);
return renameStmt;
}
}
} else if (lexer.token() == Token.ORDER) {
throw new ParserException("TODO " + lexer.info());
} else if (lexer.identifierEquals("CONVERT")) {
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+7 -1
View File
@@ -2789,7 +2789,13 @@ public class SQLExprParser extends SQLParser {
item.setValue(new SQLIdentifierExpr("ON"));
return item;
} else {
accept(Token.EQ);
if (lexer.token == Token.EQ) {
lexer.nextToken();
} else if (JdbcConstants.DB2.equals(dbType)) {
// skip
} else {
accept(Token.EQ);
}
}
if (lexer.token == Token.ON) {
src/main/java/com/alibaba/druid/util/FnvHash.java
+1
View File
@@ -634,5 +634,6 @@ public final class FnvHash {
long TBLPROPERTIES = fnv1a_64_lower("TBLPROPERTIES");
long FULLTEXT = fnv1a_64_lower("FULLTEXT");
long NO = fnv1a_64_lower("NO");
long PATH = fnv1a_64_lower("PATH");
}
}
src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_1.java
+63
View File
@@ -0,0 +1,63 @@
/*
* 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.db2;
import com.alibaba.druid.sql.DB2Test;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser;
import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor;
import com.alibaba.druid.util.JdbcConstants;
import org.junit.Assert;
import java.util.List;
public class DB2SetTest_1 extends DB2Test {
public void test_0() throws Exception {
String sql = "SET :HVL = CURRENT PATH;";
DB2StatementParser parser = new DB2StatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement stmt = statementList.get(0);
// print(statementList);
Assert.assertEquals(1, statementList.size());
DB2SchemaStatVisitor visitor = new DB2SchemaStatVisitor();
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());
Assert.assertEquals(0, visitor.getTables().size());
Assert.assertEquals(0, visitor.getColumns().size());
Assert.assertEquals(0, visitor.getConditions().size());
// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("DSN81010.EMP")));
// Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "last_name")));
// Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name")));
// Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name")));
Assert.assertEquals("SET :HVL = CURRENT PATH;", //
SQLUtils.toSQLString(stmt, JdbcConstants.DB2));
Assert.assertEquals("set :HVL = CURRENT PATH;", //
SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION));
}
}
src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_2_schema.java
+63
View File
@@ -0,0 +1,63 @@
/*
* 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.db2;
import com.alibaba.druid.sql.DB2Test;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser;
import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor;
import com.alibaba.druid.util.JdbcConstants;
import org.junit.Assert;
import java.util.List;
public class DB2SetTest_2_schema extends DB2Test {
public void test_0() throws Exception {
String sql = "SET SCHEMA RICK";
DB2StatementParser parser = new DB2StatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement stmt = statementList.get(0);
// print(statementList);
Assert.assertEquals(1, statementList.size());
DB2SchemaStatVisitor visitor = new DB2SchemaStatVisitor();
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());
Assert.assertEquals(0, visitor.getTables().size());
Assert.assertEquals(0, visitor.getColumns().size());
Assert.assertEquals(0, visitor.getConditions().size());
// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("DSN81010.EMP")));
// Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "last_name")));
// Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name")));
// Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name")));
Assert.assertEquals("SET SCHEMA = RICK", //
SQLUtils.toSQLString(stmt, JdbcConstants.DB2));
Assert.assertEquals("set SCHEMA = RICK", //
SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION));
}
}