diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java index 8241b3abbc..e0ff8a9eaa 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java @@ -25,6 +25,7 @@ public class SQLDeleteStatement extends SQLStatementImpl { protected SQLTableSource tableSource; protected SQLExpr where; + protected SQLTableSource from; public SQLDeleteStatement(){ @@ -110,4 +111,14 @@ public class SQLDeleteStatement extends SQLStatementImpl { visitor.endVisit(this); } + public SQLTableSource getFrom() { + return from; + } + + public void setFrom(SQLTableSource from) { + if (from != null) { + from.setParent(this); + } + this.from = from; + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDeleteStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDeleteStatement.java index a4ae9d7df6..e4fe34bee7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDeleteStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDeleteStatement.java @@ -34,7 +34,6 @@ public class MySqlDeleteStatement extends SQLDeleteStatement { private boolean quick = false; private boolean ignore = false; - private SQLTableSource from; private SQLTableSource using; private SQLOrderBy orderBy; private Limit limit; @@ -84,10 +83,6 @@ public class MySqlDeleteStatement extends SQLDeleteStatement { this.ignore = ignore; } - public SQLTableSource getFrom() { - return from; - } - public SQLTableSource getUsing() { return using; } @@ -96,10 +91,6 @@ public class MySqlDeleteStatement extends SQLDeleteStatement { this.using = using; } - public void setFrom(SQLTableSource from) { - this.from = from; - } - public SQLOrderBy getOrderBy() { return orderBy; } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java index fce98f8cb9..44352da2ef 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java @@ -330,7 +330,8 @@ public class SQLSelectParser extends SQLParser { groupBy.setWithRollUp(true); } - if(JdbcConstants.MYSQL.equals(getDbType()) && lexer.token() == Token.DESC) { + if(JdbcConstants.MYSQL.equals(getDbType()) + && lexer.token() == Token.DESC) { lexer.nextToken(); // skip } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java index 5795cfae0d..8d53cd3217 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -1934,6 +1934,12 @@ public class SQLStatementParser extends SQLParser { SQLName tableName = exprParser.name(); deleteStatement.setTableName(tableName); + + if (lexer.token() == Token.FROM) { + lexer.nextToken(); + SQLTableSource tableSource = createSQLSelectParser().parseTableSource(); + deleteStatement.setFrom(tableSource); + } } if (lexer.token() == (Token.WHERE)) { 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 c84abbc354..9c0714e933 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -1035,9 +1035,17 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab } public boolean visit(SQLDeleteStatement x) { - print0(ucase ? "DELETE FROM " : "delete from "); + SQLTableSource from = x.getFrom(); - x.getTableName().accept(this); + if (from == null) { + print0(ucase ? "DELETE FROM " : "delete from "); + x.getTableName().accept(this); + } else { + print0(ucase ? "DELETE " : "delete "); + x.getTableName().accept(this); + print0(ucase ? " FROM " : " from "); + from.accept(this); + } if (x.getWhere() != null) { println(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest22.java new file mode 100644 index 0000000000..9a67fbab17 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest22.java @@ -0,0 +1,43 @@ +/* + * 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.sqlserver; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser; +import junit.framework.TestCase; +import org.junit.Assert; + +public class SQLServerSelectTest22 extends TestCase { + + public void test_simple() throws Exception { + String sql = "DELETE T FROM abc T"; // + + SQLServerStatementParser parser = new SQLServerStatementParser(sql); + SQLStatement stmt = parser.parseStatementList().get(0); + + { + String text = SQLUtils.toSQLServerString(stmt); + + Assert.assertEquals("DELETE T FROM abc T", text); + } + { + String text = SQLUtils.toSQLServerString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + + Assert.assertEquals("delete T from abc T", text); + } + } +}