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 db2 & oracle parser.

Browse Source
This commit is contained in:
wenshao
2018-04-16 14:52:25 +08:00
parent b6cb168019
commit aff53dfb7c
5 changed files with 210 additions and 25 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
+24 -20
View File
@@ -203,6 +203,8 @@ public class DB2ExprParser extends SQLExprParser {
column.setGeneratedAlawsAs(expr);
}
parseColumnRest(column);
}
return column;
@@ -212,33 +214,35 @@ public class DB2ExprParser extends SQLExprParser {
SQLColumnDefinition.Identity identity = new SQLColumnDefinition.Identity();
accept(Token.IDENTITY);
accept(Token.LPAREN);
if (lexer.token() == Token.LPAREN) {
accept(Token.LPAREN);
if (lexer.identifierEquals(FnvHash.Constants.START)) {
lexer.nextToken();
accept(Token.WITH);
if (lexer.token() == Token.LITERAL_INT) {
identity.setSeed((Integer) lexer.integerValue());
if (lexer.identifierEquals(FnvHash.Constants.START)) {
lexer.nextToken();
} else {
throw new ParserException("TODO " + lexer.info());
accept(Token.WITH);
if (lexer.token() == Token.LITERAL_INT) {
identity.setSeed((Integer) lexer.integerValue());
lexer.nextToken();
} else {
throw new ParserException("TODO " + lexer.info());
}
accept(Token.COMMA);
}
accept(Token.COMMA);
}
if (lexer.identifierEquals(FnvHash.Constants.INCREMENT)) {
lexer.nextToken();
accept(Token.BY);
if (lexer.token() == Token.LITERAL_INT) {
identity.setIncrement((Integer) lexer.integerValue());
if (lexer.identifierEquals(FnvHash.Constants.INCREMENT)) {
lexer.nextToken();
} else {
throw new ParserException("TODO " + lexer.info());
accept(Token.BY);
if (lexer.token() == Token.LITERAL_INT) {
identity.setIncrement((Integer) lexer.integerValue());
lexer.nextToken();
} else {
throw new ParserException("TODO " + lexer.info());
}
}
}
accept(Token.RPAREN);
accept(Token.RPAREN);
}
return identity;
}
src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java
+15 -5
View File
@@ -170,18 +170,28 @@ public class DB2OutputVisitor extends SQLASTOutputVisitor implements DB2ASTVisit
}
public boolean visit(SQLColumnDefinition.Identity x) {
print0(ucase ? "GENERATED ALWAYS AS IDENTITY (" : "generated always as identity (");
print0(ucase ? "GENERATED ALWAYS AS IDENTITY" : "generated always as identity");
final Integer seed = x.getSeed();
final Integer increment = x.getIncrement();
if (seed != null || increment != null) {
print0(" (");
}
if (seed != null) {
print0(ucase ? "START WITH " : "start with ");
print(seed);
print0(", ");
if (increment != null) {
print0(", ");
}
}
print0(ucase ? "INCREMENT BY " : "increment by ");
print(x.getIncrement());
print(')');
if (increment != null) {
print0(ucase ? "INCREMENT BY " : "increment by ");
print(increment);
print(')');
}
return false;
}
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+5
View File
@@ -1203,6 +1203,11 @@ public class SQLExprParser extends SQLParser {
}
accept(Token.RPAREN);
}
if (lexer.token == Token.OVER) {
over(methodInvokeExpr);
}
expr = methodInvokeExpr;
} else {
SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr(name);
src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_07.java
+78
View File
@@ -0,0 +1,78 @@
/*
* Copyright 1999-2018 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 java.util.List;
public class DB2CreateTableTest_07 extends DB2Test {
public void test_0() throws Exception {
String sql = "CREATE TABLE EMPLOYEE\n" +
" (EMPNO INTEGER GENERATED ALWAYS AS IDENTITY\n" +
" PRIMARY KEY NOT NULL,\n" +
" NAME CHAR(30) NOT NULL,\n" +
" SALARY DECIMAL(7,2) NOT NULL,\n" +
" WORKDEPT SMALLINT);";
DB2StatementParser parser = new DB2StatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement stmt = statementList.get(0);
System.out.println(SQLUtils.toDB2String(stmt));
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());
assertEquals(1, visitor.getTables().size());
assertEquals(4, visitor.getColumns().size());
assertEquals(0, visitor.getConditions().size());
assertTrue(visitor.containsTable("EMPLOYEE"));
// assertTrue(visitor.getColumns().contains(new Column("DSN8B10.EMP", "WORKDEPT")));
// assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name")));
// assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name")));
assertEquals("CREATE TABLE EMPLOYEE (\n" +
"\tEMPNO INTEGER PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY,\n" +
"\tNAME CHAR(30) NOT NULL,\n" +
"\tSALARY DECIMAL(7, 2) NOT NULL,\n" +
"\tWORKDEPT SMALLINT\n" +
");", //
SQLUtils.toSQLString(stmt, JdbcConstants.DB2));
assertEquals("create table EMPLOYEE (\n" +
"\tEMPNO INTEGER primary key not null generated always as identity,\n" +
"\tNAME CHAR(30) not null,\n" +
"\tSALARY DECIMAL(7, 2) not null,\n" +
"\tWORKDEPT SMALLINT\n" +
");", //
SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION));
}
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest15.java
+88
View File
@@ -0,0 +1,88 @@
/*
* 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.oracle.create;
import com.alibaba.druid.sql.OracleTest;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
import com.alibaba.druid.stat.TableStat;
import com.alibaba.druid.util.JdbcConstants;
import java.util.List;
public class OracleCreateViewTest15 extends OracleTest {
public void test_types() throws Exception {
String sql = //
"CREATE OR REPLACE FORCE VIEW \"ZJGT_DKXY\".\"V_ZJ_DKXMXXEXP\" (\"PRJ_NO\", \"EXPLST\") AS \n" +
" select b.prj_no,explst\n" +
" from (with temp_exp as (select t.prj_no, t.explx,t.expname\n" +
" from v_zjk_xmlist t\n" +
" where t.expname is not null\n" +
" and t.explx not like '%组员%')\n" +
" select prj_no,\n" +
" dbms_lob.substr(wmsys.wm_concat(explx||': '||expname) over(partition by prj_no)，4000,1) as explst\n" +
" from temp_exp) b\n" +
" group by b.prj_no,explst"
;
System.out.println(sql);
OracleStatementParser parser = new OracleStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement stmt = statementList.get(0);
print(statementList);
assertEquals(1, statementList.size());
assertEquals("CREATE OR REPLACE VIEW \"ZJGT_DKXY\".\"V_ZJ_DKXMXXEXP\" (\n" +
"\t\"PRJ_NO\", \n" +
"\t\"EXPLST\"\n" +
")\n" +
"AS\n" +
"SELECT b.prj_no, explst\n" +
"FROM (\n" +
"\tWITH temp_exp AS (\n" +
"\t\t\tSELECT t.prj_no, t.explx, t.expname\n" +
"\t\t\tFROM v_zjk_xmlist t\n" +
"\t\t\tWHERE t.expname IS NOT NULL\n" +
"\t\t\t\tAND t.explx NOT LIKE '%组员%'\n" +
"\t\t)\n" +
"\tSELECT prj_no\n" +
"\t\t, dbms_lob.substr(wmsys.wm_concat(explx || ': ' || expname) OVER (PARTITION BY prj_no ), 4000, 1) AS explst\n" +
"\tFROM temp_exp\n" +
") b\n" +
"GROUP BY b.prj_no, explst",//
SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE));
OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor();
stmt.accept(visitor);
System.out.println("Tables : " + visitor.getTables());
System.out.println("fields : " + visitor.getColumns());
System.out.println("coditions : " + visitor.getConditions());
System.out.println("relationships : " + visitor.getRelationships());
System.out.println("orderBy : " + visitor.getOrderByColumns());
assertEquals(1, visitor.getTables().size());
assertEquals(3, visitor.getColumns().size());
assertTrue(visitor.getColumns().contains(new TableStat.Column("v_zjk_xmlist", "prj_no")));
}
}