diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateFunctionStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateFunctionStatement.java index a0d7e0309b..a301763958 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateFunctionStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateFunctionStatement.java @@ -44,13 +44,13 @@ public class SQLCreateFunctionStatement extends SQLStatementImpl implements SQLC // for mysql private String comment; - private boolean deterministic = false; private boolean parallelEnable; private boolean aggregate; private SQLName using; private boolean pipelined; private boolean resultCache; + private String wrappedSource; public SQLCreateFunctionStatement clone() { SQLCreateFunctionStatement x = new SQLCreateFunctionStatement(); @@ -257,4 +257,12 @@ public class SQLCreateFunctionStatement extends SQLStatementImpl implements SQLC public void setResultCache(boolean resultCache) { this.resultCache = resultCache; } + + public String getWrappedSource() { + return wrappedSource; + } + + public void setWrappedSource(String wrappedSource) { + this.wrappedSource = wrappedSource; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateProcedureStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateProcedureStatement.java index 9eaf5dd360..6d48f4ed6d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateProcedureStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateProcedureStatement.java @@ -46,6 +46,8 @@ public class SQLCreateProcedureStatement extends SQLStatementImpl implements SQL private boolean readSqlData; private boolean modifiesSqlData; + private String wrappedSource; + @Override public void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { @@ -176,4 +178,12 @@ public class SQLCreateProcedureStatement extends SQLStatementImpl implements SQL return null; } + + public String getWrappedSource() { + return wrappedSource; + } + + public void setWrappedSource(String wrappedSource) { + this.wrappedSource = wrappedSource; + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java index 0acbd6bfe3..02a65b4a65 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java @@ -904,6 +904,25 @@ public class OracleStatementParser extends SQLStatementParser { accept(Token.RPAREN); } + if (lexer.identifierEquals(FnvHash.Constants.WRAPPED)) { + lexer.nextToken(); + int pos = lexer.text.indexOf(';', lexer.pos()); + if (pos != -1) { + String wrappedString = lexer.subString(lexer.pos(), pos - lexer.pos()); + stmt.setWrappedSource(wrappedString); + lexer.reset(pos, ';', Token.LITERAL_CHARS); + lexer.nextToken(); + stmt.setAfterSemi(true); + } else { + String wrappedString = lexer.text.substring(lexer.pos()); + stmt.setWrappedSource(wrappedString); + lexer.reset(lexer.text.length(),(char) LayoutCharacters.EOI, Token.EOF); + return stmt; + } + + return stmt; + } + accept(Token.RETURN); SQLDataType returnDataType = this.exprParser.parseDataType(false); stmt.setReturnDataType(returnDataType); @@ -2588,6 +2607,23 @@ public class OracleStatementParser extends SQLStatementParser { stmt.setAuthid(authid); } + if (lexer.identifierEquals(FnvHash.Constants.WRAPPED)) { + lexer.nextToken(); + int pos = lexer.text.indexOf(';', lexer.pos()); + if (pos != -1) { + String wrappedString = lexer.subString(lexer.pos(), pos - lexer.pos()); + stmt.setWrappedSource(wrappedString); + lexer.reset(pos, ';', Token.LITERAL_CHARS); + lexer.nextToken(); + stmt.setAfterSemi(true); + } else { + String wrappedString = lexer.text.substring(lexer.pos()); + stmt.setWrappedSource(wrappedString); + lexer.reset(lexer.text.length(),(char) LayoutCharacters.EOI, Token.EOF); + } + return stmt; + } + if (lexer.token() == Token.SEMI) { lexer.nextToken(); return stmt; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java index 6f36218cd2..a7e76c3d56 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java @@ -2517,6 +2517,17 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS print(')'); } + String wrappedSource = x.getWrappedSource(); + if (wrappedSource != null) { + print0(ucase ? " WRAPPED " : " wrapped "); + print0(wrappedSource); + + if (x.isAfterSemi()) { + print(';'); + } + return false; + } + println(); print(ucase ? "RETURN " : "return "); x.getReturnDataType().accept(this); @@ -2580,11 +2591,6 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS return false; } - @Override - public void endVisit(SQLCreateProcedureStatement x) { - - } - @Override public boolean visit(OracleCreateDatabaseDbLinkStatement x) { print0(ucase ? "CREATE " : "create "); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java index d41a8beea3..df7956402f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java @@ -619,14 +619,20 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor SQLExpr target = item.getTarget(); target.accept(this); - if (target instanceof SQLIdentifierExpr && ((SQLIdentifierExpr) target).getName().equalsIgnoreCase("TIME ZONE")) { + SQLExpr value = item.getValue(); + + if (target instanceof SQLIdentifierExpr + && ((SQLIdentifierExpr) target).getName().equalsIgnoreCase("TIME ZONE")) { print(' '); } else { - print0(" TO "); + if (value instanceof SQLPropertyExpr + && ((SQLPropertyExpr) value).getOwner() instanceof SQLVariantRefExpr) { + print0(" := "); + } else { + print0(" TO "); + } } - SQLExpr value = item.getValue(); - if (value instanceof SQLListExpr) { SQLListExpr listExpr = (SQLListExpr) value; printAndAccept(listExpr.getItems(), ", "); @@ -2865,4 +2871,76 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor public void endVisit(OracleRunStatement x) { } + + @Override + public boolean visit(SQLIfStatement.Else x) { + print0(ucase ? "ELSE" : "else"); + this.indentCount++; + println(); + + for (int i = 0, size = x.getStatements().size(); i < size; ++i) { + if (i != 0) { + println(); + } + SQLStatement item = x.getStatements().get(i); + item.accept(this); + } + + this.indentCount--; + return false; + } + + @Override + public boolean visit(SQLIfStatement.ElseIf x) { + print0(ucase ? "ELSE IF " : "else if "); + x.getCondition().accept(this); + print0(ucase ? " THEN" : " then"); + this.indentCount++; + + for (int i = 0, size = x.getStatements().size(); i < size; ++i) { + println(); + SQLStatement item = x.getStatements().get(i); + item.accept(this); + } + + this.indentCount--; + return false; + } + + @Override + public boolean visit(SQLIfStatement x) { + print0(ucase ? "IF " : "if "); + int lines = this.lines; + this.indentCount++; + x.getCondition().accept(this); + this.indentCount--; + + if (lines != this.lines) { + println(); + } else { + print(' '); + } + print0(ucase ? "THEN" : "then"); + + this.indentCount++; + for (int i = 0, size = x.getStatements().size(); i < size; ++i) { + println(); + SQLStatement item = x.getStatements().get(i); + item.accept(this); + } + this.indentCount--; + + for (SQLIfStatement.ElseIf elseIf : x.getElseIfList()) { + println(); + elseIf.accept(this); + } + + if (x.getElseItem() != null) { + println(); + x.getElseItem().accept(this); + } + println(); + print0(ucase ? "END IF" : "end if"); + return false; + } } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index da3633ae8a..856d174226 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -5901,31 +5901,34 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet } SQLStatement block = x.getBlock(); - - if (block != null && !create) { - println(); - print("IS"); - println(); + String wrappedSource = x.getWrappedSource(); + if (wrappedSource != null) { + print0(ucase ? " WRAPPED " : " wrapped "); + print0(wrappedSource); } else { - println(); - if (block instanceof SQLBlockStatement) { - SQLBlockStatement blockStatement = (SQLBlockStatement) block; - if (blockStatement.getParameters().size() > 0 || authid != null) { - println(ucase ? "AS" : "as"); - } else { - println(ucase ? "IS" : "is"); - } + if (block != null && !create) { + println(); + print("IS"); + println(); } else { - println(ucase ? "IS" : "is"); + println(); + if (block instanceof SQLBlockStatement) { + SQLBlockStatement blockStatement = (SQLBlockStatement) block; + if (blockStatement.getParameters().size() > 0 || authid != null) { + println(ucase ? "AS" : "as"); + } else { + println(ucase ? "IS" : "is"); + } + } } - } - String javaCallSpec = x.getJavaCallSpec(); - if (javaCallSpec != null) { - print0(ucase ? "LANGUAGE JAVA NAME '" : "language java name '"); - print0(javaCallSpec); - print('\''); - return false; + String javaCallSpec = x.getJavaCallSpec(); + if (javaCallSpec != null) { + print0(ucase ? "LANGUAGE JAVA NAME '" : "language java name '"); + print0(javaCallSpec); + print('\''); + return false; + } } boolean afterSemi = false; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_5.java new file mode 100644 index 0000000000..e984bf4860 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_5.java @@ -0,0 +1,102 @@ +/* + * 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.util.JdbcConstants; + +import java.util.List; + +public class OracleCreateFunctionTest_5 extends OracleTest { + + public void test_types() throws Exception { + String sql = // + "CREATE OR REPLACE FUNCTION fibonacci wrapped \n" + + "a000000\n" + + "b2\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "8\n" + + "14a fb\n" + + "e1Yq3QQJoEoNKIeJlbgLoLdSgogwgxDcf8vWfHSKbuowFOXFKoj9MqYGqWyRxeeCUVqNVIO1\n" + + "ICqJa3yPr6e7z8GZpMH3J0Cx0uQ0B1JuysymdNDlzfTvb7QWsrLU4jGs3h8Mm49/L9nyO4Xh\n" + + "Ae06nawFpOJIAYpBf9wBVC+ZrjU/nuEtokBqCce6HWIoF6rYgz0V0W/47x5KpOnQ2i7X3kFe\n" + + "FR8K7jT7X58k8xK9uYlZv5LhV71a7A=="; + + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + print(statementList); + + assertEquals(1, statementList.size()); + + assertEquals("CREATE OR REPLACE FUNCTION fibonacci WRAPPED \n" + + "b2\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "8\n" + + "14a fb\n" + + "e1Yq3QQJoEoNKIeJlbgLoLdSgogwgxDcf8vWfHSKbuowFOXFKoj9MqYGqWyRxeeCUVqNVIO1\n" + + "ICqJa3yPr6e7z8GZpMH3J0Cx0uQ0B1JuysymdNDlzfTvb7QWsrLU4jGs3h8Mm49/L9nyO4Xh\n" + + "Ae06nawFpOJIAYpBf9wBVC+ZrjU/nuEtokBqCce6HWIoF6rYgz0V0W/47x5KpOnQ2i7X3kFe\n" + + "FR8K7jT7X58k8xK9uYlZv5LhV71a7A==",// + 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(0, visitor.getTables().size()); + assertEquals(0, visitor.getColumns().size()); + +// assertTrue(visitor.getColumns().contains(new TableStat.Column("orders", "order_total"))); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest6.java new file mode 100644 index 0000000000..22d3394221 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest6.java @@ -0,0 +1,132 @@ +/* + * 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 java.util.List; + +public class OracleCreateProcedureTest6 extends OracleTest { + + public void test_0() throws Exception { + String sql = "CREATE PROCEDURE wraptest wrapped \n" + + "a000000\n" + + "b2\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "7\n" + + "121 134\n" + + "Pf3/wD+9ncRZhp3XxTMUO3yIRvswg+nQ7UhqfHRG2vg+SD7x9XzsDUFWbdwCJVEOLKBBRuH6\n" + + "VMoRHfX6apzfyMkvWhzQLCYvAcq6Zu7++E7PrXNxUJzk/FZW8P9eRgyyyMFnDj53aP1cDje9\n" + + "ZdGr2VmJHIw0ZNHBYhDdR+du5U5Yy47a6dJHXFW9eNyxBHtXZDuiWYTUtlnueHQV9iYDwE+r\n" + + "jFn+eZm4jgDcTLTEzfmIVtPDRNhYCY3xhPo7vJeS8M1AvP+4xh9+uO35XsRIsRl1PTFVrGwg\n" + + "6iuxETwA5Pu2mwx3"; + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + print(statementList); + + assertEquals(1, statementList.size()); + + SQLStatement stmt = (SQLStatement) statementList.get(0); + + OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); + stmt.accept(visitor); + + assertEquals("CREATE PROCEDURE wraptest WRAPPED \n" + + "b2\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "7\n" + + "121 134\n" + + "Pf3/wD+9ncRZhp3XxTMUO3yIRvswg+nQ7UhqfHRG2vg+SD7x9XzsDUFWbdwCJVEOLKBBRuH6\n" + + "VMoRHfX6apzfyMkvWhzQLCYvAcq6Zu7++E7PrXNxUJzk/FZW8P9eRgyyyMFnDj53aP1cDje9\n" + + "ZdGr2VmJHIw0ZNHBYhDdR+du5U5Yy47a6dJHXFW9eNyxBHtXZDuiWYTUtlnueHQV9iYDwE+r\n" + + "jFn+eZm4jgDcTLTEzfmIVtPDRNhYCY3xhPo7vJeS8M1AvP+4xh9+uO35XsRIsRl1PTFVrGwg\n" + + "6iuxETwA5Pu2mwx3", stmt.toString()); + + assertEquals("CREATE PROCEDURE wraptest WRAPPED \n" + + "b2\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "7\n" + + "121 134\n" + + "Pf3/wD+9ncRZhp3XxTMUO3yIRvswg+nQ7UhqfHRG2vg+SD7x9XzsDUFWbdwCJVEOLKBBRuH6\n" + + "VMoRHfX6apzfyMkvWhzQLCYvAcq6Zu7++E7PrXNxUJzk/FZW8P9eRgyyyMFnDj53aP1cDje9\n" + + "ZdGr2VmJHIw0ZNHBYhDdR+du5U5Yy47a6dJHXFW9eNyxBHtXZDuiWYTUtlnueHQV9iYDwE+r\n" + + "jFn+eZm4jgDcTLTEzfmIVtPDRNhYCY3xhPo7vJeS8M1AvP+4xh9+uO35XsRIsRl1PTFVrGwg\n" + + "6iuxETwA5Pu2mwx3", SQLUtils.toPGString(stmt)); + + 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(0, visitor.getTables().size()); + +// assertTrue(visitor.getTables().containsKey(new TableStat.Name("fact_brand_provider"))); + + assertEquals(0, visitor.getColumns().size()); + assertEquals(0, visitor.getConditions().size()); + assertEquals(0, visitor.getRelationships().size()); + +// assertTrue(visitor.containsColumn("fact_brand_provider", "gyscode")); +// assertTrue(visitor.containsColumn("fact_brand_provider", "gysname")); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest5.java index e9754f2ba3..806f91bf33 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest5.java @@ -29,12 +29,12 @@ public class OracleCreateTriggerTest5 extends OracleTest { public void test_0() throws Exception { String sql = // - "CREATE OR REPLACE TRIGGER ECC.GAPM_PROJECT_INFO_SYNC_IOA_t\n" + + "CREATE OR REPLACE TRIGGER XONN.GAPM_PROJECT_INFO_SYNC_IOA_t\n" + "\tBEFORE INSERT\n" + - "\tON ECC.GAPM_PROJECT_INFO_SYNC_IOA\n" + + "\tON XONN.GAPM_PROJECT_INFO_SYNC_IOA\n" + "\tFOR EACH ROW\n" + "BEGIN\n" + - "\tSELECT ECC.GAPM_PROJECT_INFO_SYNC_IOA_S.Nextval\n" + + "\tSELECT XONN.GAPM_PROJECT_INFO_SYNC_IOA_S.Nextval\n" + "\tINTO :New.PROJECT_SYN_ID\n" + "\tFROM dual;\n" + "END;"; @@ -46,23 +46,23 @@ public class OracleCreateTriggerTest5 extends OracleTest { Assert.assertEquals(1, statementList.size()); - Assert.assertEquals("CREATE OR REPLACE TRIGGER ECC.GAPM_PROJECT_INFO_SYNC_IOA_t\n" + + Assert.assertEquals("CREATE OR REPLACE TRIGGER XONN.GAPM_PROJECT_INFO_SYNC_IOA_t\n" + "\tBEFORE INSERT\n" + - "\tON ECC.GAPM_PROJECT_INFO_SYNC_IOA\n" + + "\tON XONN.GAPM_PROJECT_INFO_SYNC_IOA\n" + "\tFOR EACH ROW\n" + "BEGIN\n" + - "\tSELECT ECC.GAPM_PROJECT_INFO_SYNC_IOA_S.Nextval\n" + + "\tSELECT XONN.GAPM_PROJECT_INFO_SYNC_IOA_S.Nextval\n" + "\tINTO :New.PROJECT_SYN_ID\n" + "\tFROM dual;\n" + "END;",// SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); - Assert.assertEquals("CREATE OR REPLACE TRIGGER ECC.GAPM_PROJECT_INFO_SYNC_IOA_t\n" + + Assert.assertEquals("CREATE OR REPLACE TRIGGER XONN.GAPM_PROJECT_INFO_SYNC_IOA_t\n" + "\tBEFORE INSERT\n" + - "\tON ECC.GAPM_PROJECT_INFO_SYNC_IOA\n" + + "\tON XONN.GAPM_PROJECT_INFO_SYNC_IOA\n" + "\tFOR EACH ROW\n" + "BEGIN\n" + - "\tSELECT ECC.GAPM_PROJECT_INFO_SYNC_IOA_S.Nextval\n" + + "\tSELECT XONN.GAPM_PROJECT_INFO_SYNC_IOA_S.Nextval\n" + "\tINTO :New.PROJECT_SYN_ID\n" + "\tFROM dual;\n" + "END;",// diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest6.java new file mode 100644 index 0000000000..90f7f48ff9 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest6.java @@ -0,0 +1,171 @@ +/* + * 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.util.JdbcConstants; +import org.junit.Assert; + +import java.util.List; + +public class OracleCreateTriggerTest6 extends OracleTest { + + public void test_0() throws Exception { + String sql = // + "CREATE OR REPLACE TRIGGER XON_EPM.EPM_TG_FIRSTCHECK\n" + + "\tAFTER INSERT OR UPDATE\n" + + "\tON XON_EPM.EPM_TBL_FIRST_CERTIFICATION_AP\n" + + "\tFOR EACH ROW\n" + + "DECLARE\n" + + "\tvar_nContractID number;\n" + + "\tvar_dFirstCheckTime date;\n" + + "\tvar_nRecordCount number;\n" + + "\tvar_sState varchar2(16);\n" + + "BEGIN\n" + + "\tvar_sState := :NEW.State;\n" + + "\tvar_dFirstCheckTime := :NEW.Commiteddate;\n" + + "\tIF var_sState = 'approved' THEN\n" + + "\t\t-- 鏌ヨ\uE1D7鍚堝悓 ID\n" + + "\t\tSELECT etfca_.contractid\n" + + "\t\tINTO var_nContractID\n" + + "\t\tFROM XON_EPM.EPM_TBL_FIRST_CERTIFICATION etfc_, XON_EPM.EPM_TBL_FIRST_CHECK_APPLICATIO etfca_\n" + + "\t\tWHERE etfca_.oid = etfc_.applicationid\n" + + "\t\t\tAND etfc_.oid = :NEW.CERTIFICATIONID;\n" + + "\t\tIF var_nContractID > 0 THEN\n" + + "\t\t\t-- 鏌ヨ\uE1D7 EPM_TB_CONTRACT_EX 鏄\uE21A惁鏈夎\uE187褰�\n" + + "\t\t\tSELECT COUNT(*)\n" + + "\t\t\tINTO var_nRecordCount\n" + + "\t\t\tFROM XON_EPM.EPM_TB_CONTRACT_EX etce_\n" + + "\t\t\tWHERE etce_.ncontractid = var_nContractID;\n" + + "\t\t\tIF var_nRecordCount <= 0 THEN\n" + + "\t\t\t\tUPDATE XON_EPM.EPM_TBL_CONTRACT\n" + + "\t\t\t\tSET oid = oid\n" + + "\t\t\t\tWHERE XON_EPM.EPM_TBL_CONTRACT.OID = var_nContractID;\n" + + "\t\t\tEND IF;\n" + + "\t\t\tUPDATE XON_EPM.EPM_TB_CONTRACT_EX\n" + + "\t\t\tSET dFirstCheckTime = var_dFirstCheckTime\n" + + "\t\t\tWHERE XON_EPM.EPM_TB_CONTRACT_EX.NCONTRACTID = var_nContractID;\n" + + "\t\tEND IF;\n" + + "\tEND IF;\n" + + "END;"; + + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + Assert.assertEquals("CREATE OR REPLACE TRIGGER XON_EPM.EPM_TG_FIRSTCHECK\n" + + "\tAFTER INSERT OR UPDATE\n" + + "\tON XON_EPM.EPM_TBL_FIRST_CERTIFICATION_AP\n" + + "\tFOR EACH ROW\n" + + "DECLARE\n" + + "\tvar_nContractID number;\n" + + "\tvar_dFirstCheckTime date;\n" + + "\tvar_nRecordCount number;\n" + + "\tvar_sState varchar2(16);\n" + + "BEGIN\n" + + "\tvar_sState := :NEW.State;\n" + + "\tvar_dFirstCheckTime := :NEW.Commiteddate;\n" + + "\tIF var_sState = 'approved' THEN\n" + + "\t\t-- 鏌ヨ\uE1D7鍚堝悓 ID\n" + + "\t\tSELECT etfca_.contractid\n" + + "\t\tINTO var_nContractID\n" + + "\t\tFROM XON_EPM.EPM_TBL_FIRST_CERTIFICATION etfc_, XON_EPM.EPM_TBL_FIRST_CHECK_APPLICATIO etfca_\n" + + "\t\tWHERE etfca_.oid = etfc_.applicationid\n" + + "\t\t\tAND etfc_.oid = :NEW.CERTIFICATIONID;\n" + + "\t\tIF var_nContractID > 0 THEN\n" + + "\t\t\t-- 鏌ヨ\uE1D7 EPM_TB_CONTRACT_EX 鏄\uE21A惁鏈夎\uE187褰�\n" + + "\t\t\tSELECT COUNT(*)\n" + + "\t\t\tINTO var_nRecordCount\n" + + "\t\t\tFROM XON_EPM.EPM_TB_CONTRACT_EX etce_\n" + + "\t\t\tWHERE etce_.ncontractid = var_nContractID;\n" + + "\t\t\tIF var_nRecordCount <= 0 THEN\n" + + "\t\t\t\tUPDATE XON_EPM.EPM_TBL_CONTRACT\n" + + "\t\t\t\tSET oid = oid\n" + + "\t\t\t\tWHERE XON_EPM.EPM_TBL_CONTRACT.OID = var_nContractID;\n" + + "\t\t\tEND IF;\n" + + "\t\t\tUPDATE XON_EPM.EPM_TB_CONTRACT_EX\n" + + "\t\t\tSET dFirstCheckTime = var_dFirstCheckTime\n" + + "\t\t\tWHERE XON_EPM.EPM_TB_CONTRACT_EX.NCONTRACTID = var_nContractID;\n" + + "\t\tEND IF;\n" + + "\tEND IF;\n" + + "END;",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + Assert.assertEquals("CREATE OR REPLACE TRIGGER XON_EPM.EPM_TG_FIRSTCHECK\n" + + "\tAFTER INSERT OR UPDATE\n" + + "\tON XON_EPM.EPM_TBL_FIRST_CERTIFICATION_AP\n" + + "\tFOR EACH ROW\n" + + "DECLARE\n" + + "\tvar_nContractID number;\n" + + "\tvar_dFirstCheckTime date;\n" + + "\tvar_nRecordCount number;\n" + + "\tvar_sState varchar2(16);\n" + + "BEGIN\n" + + "\tSET var_sState := :NEW.State;\n" + + "\tSET var_dFirstCheckTime := :NEW.Commiteddate;\n" + + "\tIF var_sState = 'approved' THEN\n" + + "\t\t-- 鏌ヨ\uE1D7鍚堝悓 ID\n" + + "\t\tSELECT etfca_.contractid\n" + + "\t\tINTO var_nContractID\n" + + "\t\tFROM XON_EPM.EPM_TBL_FIRST_CERTIFICATION etfc_, XON_EPM.EPM_TBL_FIRST_CHECK_APPLICATIO etfca_\n" + + "\t\tWHERE etfca_.oid = etfc_.applicationid\n" + + "\t\t\tAND etfc_.oid = :NEW.CERTIFICATIONID;\n" + + "\t\tIF var_nContractID > 0 THEN\n" + + "\t\t\t-- 鏌ヨ\uE1D7 EPM_TB_CONTRACT_EX 鏄\uE21A惁鏈夎\uE187褰�\n" + + "\t\t\tSELECT COUNT(*)\n" + + "\t\t\tINTO var_nRecordCount\n" + + "\t\t\tFROM XON_EPM.EPM_TB_CONTRACT_EX etce_\n" + + "\t\t\tWHERE etce_.ncontractid = var_nContractID;\n" + + "\t\t\tIF var_nRecordCount <= 0 THEN\n" + + "\t\t\t\tUPDATE XON_EPM.EPM_TBL_CONTRACT\n" + + "\t\t\t\tSET oid = oid\n" + + "\t\t\t\tWHERE XON_EPM.EPM_TBL_CONTRACT.OID = var_nContractID;\n" + + "\t\t\tEND IF;\n" + + "\t\t\tUPDATE XON_EPM.EPM_TB_CONTRACT_EX\n" + + "\t\t\tSET dFirstCheckTime = var_dFirstCheckTime\n" + + "\t\t\tWHERE XON_EPM.EPM_TB_CONTRACT_EX.NCONTRACTID = var_nContractID;\n" + + "\t\tEND IF;\n" + + "\tEND IF;\n" + + "END;",// + SQLUtils.toSQLString(stmt, JdbcConstants.POSTGRESQL)); + + 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()); + + Assert.assertEquals(1, visitor.getTables().size()); + + // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("cdc.en_complaint_ipr_stat_fdt0"))); + + Assert.assertEquals(0, visitor.getColumns().size()); + + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "*"))); + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "YEAR"))); + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "order_mode"))); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_param_inout_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_param_inout_0.java index 28f55872ac..973a2b9120 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_param_inout_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_param_inout_0.java @@ -67,6 +67,7 @@ public class Oracle_pl_param_inout_0 extends OracleTest { "\tp IN OUT NOCOPY hr.person_typ, \n" + "\tnew_job VARCHAR2\n" + ")\n" + + "IS\n" + "BEGIN\n" + "\tp.change_job(new_job);\n" + "END;", // @@ -78,6 +79,7 @@ public class Oracle_pl_param_inout_0 extends OracleTest { "\tp in out nocopy hr.person_typ, \n" + "\tnew_job VARCHAR2\n" + ")\n" + + "is\n" + "begin\n" + "\tp.change_job(new_job);\n" + "end;", //