diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMergeStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMergeStatement.java index b79be4d5e0..c77b505e7c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMergeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMergeStatement.java @@ -21,6 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLHint; import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl; @@ -31,7 +32,7 @@ public class OracleMergeStatement extends OracleStatementImpl { private final List hints = new ArrayList(); - private SQLName into; + private SQLTableSource into; private String alias; private SQLTableSource using; private SQLExpr on; @@ -59,11 +60,18 @@ public class OracleMergeStatement extends OracleStatementImpl { this.alias = alias; } - public SQLName getInto() { + public SQLTableSource getInto() { return into; } - + public void setInto(SQLName into) { + this.setInto(new SQLExprTableSource(into)); + } + + public void setInto(SQLTableSource into) { + if (into != null) { + into.setParent(this); + } this.into = into; } 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 e9262eeca8..9af35491dd 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 @@ -51,6 +51,7 @@ import com.alibaba.druid.sql.ast.statement.SQLSelect; import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.ast.statement.SQLSetStatement; +import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource; import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem; import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; @@ -94,6 +95,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleMergeStatement; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleMultiInsertStatement; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OraclePLSQLCommitStatement; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSavePointStatement; +import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelect; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSetTransactionStatement; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleStatement; import com.alibaba.druid.sql.parser.Lexer; @@ -1106,8 +1108,17 @@ public class OracleStatementParser extends SQLStatementParser { parseHints(stmt.getHints()); accept(Token.INTO); - stmt.setInto(exprParser.name()); - + + if (lexer.token() == Token.LPAREN) { + lexer.nextToken(); + OracleSelect select = this.createSQLSelectParser().select(); + SQLSubqueryTableSource tableSource = new SQLSubqueryTableSource(select); + stmt.setInto(tableSource); + accept(Token.RPAREN); + } else { + stmt.setInto(exprParser.name()); + } + stmt.setAlias(as()); accept(Token.USING); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest22.java new file mode 100644 index 0000000000..225657b558 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest22.java @@ -0,0 +1,38 @@ +/* + * Copyright 1999-2101 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.mysql; + +import junit.framework.TestCase; + +import org.junit.Assert; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.parser.Token; + +public class MySqlAlterTableTest22 extends TestCase { + + public void test_alter_add_key() throws Exception { + String sql = "alter table pj_usr_auth add constraint FK_Reference_8 foreign key (usr) references usr (usr) on delete restrict on update restrict;"; + MySqlStatementParser parser = new MySqlStatementParser(sql); + SQLStatement stmt = parser.parseStatementList().get(0); + parser.match(Token.EOF); + String output = SQLUtils.toMySqlString(stmt); + Assert.assertEquals("ALTER TABLE pj_usr_auth" // + + "\n\tADD CONSTRAINT FK_Reference_8 FOREIGN KEY (usr) REFERENCES usr (usr) ON DELETE RESTRICT ON UPDATE RESTRICT", output); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest8.java new file mode 100644 index 0000000000..ac6a6603c2 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest8.java @@ -0,0 +1,69 @@ +/* + * Copyright 1999-2101 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; + +import java.util.List; + +import org.junit.Assert; + +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.ast.stmt.OracleMergeStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.parser.SQLStatementParser; + +public class OracleMergeTest8 extends OracleTest { + + public void test_0() throws Exception { + String sql = "merge into (select * from T09_RULE_CAL_COUNT where data_dt = '20160328' and rule_type = '2') t " // + + "using (" + + " select cust_no,organ_key " // + + " from (select t1.cust_no, t1.organ_key from t08_cust_result_c_mid t1 " + + " union " + + " (select t2.cust_no, t2.organ_key from t08_cust_result_i_mid t2)" + + " )" + + ") t3 on(t3.cust_no =t.cust_no) when matched then update set t.organ_key=t3.organ_key"; + + SQLStatementParser parser = new OracleStatementParser(sql); + List stmtList = parser.parseStatementList(); + OracleMergeStatement mergeStatement = (OracleMergeStatement) stmtList.get(0); + String result = SQLUtils.toOracleString(mergeStatement); + Assert.assertEquals("MERGE INTO (SELECT *" + + "\n\tFROM T09_RULE_CAL_COUNT" + + "\n\tWHERE data_dt = '20160328'" + + "\n\t\tAND rule_type = '2'" + + "\n\t) t" + + "\nUSING (" + + "\n\tSELECT cust_no, organ_key" + + "\n\tFROM (" + + "\n\t\tSELECT t1.cust_no, t1.organ_key" + + "\n\t\tFROM t08_cust_result_c_mid t1" + + "\n\t\tUNION" + + "\n\t\tSELECT t2.cust_no, t2.organ_key" + + "\n\t\tFROM t08_cust_result_i_mid t2" + + "\n\t)" + + "\n) t3 ON (t3.cust_no = t.cust_no) " + + "\nWHEN MATCHED THEN UPDATE SET t.organ_key = t3.organ_key", + result); + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id"))); + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "bonus"))); + } + +}