diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableConstraint.java new file mode 100644 index 0000000000..ecf8e214b8 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableConstraint.java @@ -0,0 +1,47 @@ +/* + * Copyright 1999-2011 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.sql.ast.statement; + +import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.ast.SQLObjectImpl; +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + +public class SQLAlterTableDisableConstraint extends SQLObjectImpl implements SQLAlterTableItem { + + private static final long serialVersionUID = 1L; + + private SQLName constraintName; + + @Override + protected void accept0(SQLASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, this.constraintName); + } + visitor.endVisit(this); + } + + + public SQLName getConstraintName() { + return constraintName; + } + + + public void setConstraintName(SQLName constraintName) { + this.constraintName = constraintName; + } + + +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index 20272a1b53..4337f430f8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -32,6 +32,7 @@ import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddForeignKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddPrimaryKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAlterColumn; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableKeys; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey; @@ -639,7 +640,7 @@ public class MySqlStatementParser extends SQLStatementParser { public SQLStatement parseShow() { accept(Token.SHOW); - + if (lexer.token() == Token.COMMENT) { lexer.nextToken(); } @@ -1511,7 +1512,7 @@ public class MySqlStatementParser extends SQLStatementParser { MySqlReplaceStatement stmt = new MySqlReplaceStatement(); accept(Token.REPLACE); - + if (lexer.token() == Token.COMMENT) { lexer.nextToken(); } @@ -2268,7 +2269,7 @@ public class MySqlStatementParser extends SQLStatementParser { } else if (lexer.token() == Token.FOREIGN) { MySqlForeignKey fk = this.getExprParser().parseForeignKey(); fk.setName(constraintName); - + SQLAlterTableAddForeignKey item = new SQLAlterTableAddForeignKey(fk); stmt.getItems().add(item); } else { @@ -2368,9 +2369,17 @@ public class MySqlStatementParser extends SQLStatementParser { } } else if (identifierEquals("DISABLE")) { lexer.nextToken(); - acceptIdentifier("KEYS"); - SQLAlterTableDisableKeys item = new SQLAlterTableDisableKeys(); - stmt.getItems().add(item); + + if (lexer.token() == Token.CONSTRAINT) { + lexer.nextToken(); + SQLAlterTableDisableConstraint item = new SQLAlterTableDisableConstraint(); + item.setConstraintName(this.exprParser.name()); + stmt.getItems().add(item); + } else { + acceptIdentifier("KEYS"); + SQLAlterTableDisableKeys item = new SQLAlterTableDisableKeys(); + stmt.getItems().add(item); + } } else if (identifierEquals("ENABLE")) { lexer.nextToken(); acceptIdentifier("KEYS"); @@ -2553,7 +2562,7 @@ public class MySqlStatementParser extends SQLStatementParser { lexer.nextToken(); } } - + public MySqlExprParser getExprParser() { return (MySqlExprParser) exprParser; } 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 64ff6967f6..e47d683c00 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -69,6 +69,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddForeignKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddPrimaryKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAlterColumn; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableKeys; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey; @@ -1423,4 +1424,10 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter { x.getForeignKey().accept(this); return false; } + + public boolean visit(SQLAlterTableDisableConstraint x) { + print("DISABLE CONSTRAINT "); + x.getConstraintName().accept(this); + return false; + } } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java index 2c45501a97..da46c57b6c 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java @@ -57,6 +57,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddForeignKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddPrimaryKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAlterColumn; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableKeys; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey; @@ -459,4 +460,8 @@ public interface SQLASTVisitor { boolean visit(SQLAlterTableAddForeignKey x); void endVisit(SQLAlterTableAddForeignKey x); + + boolean visit(SQLAlterTableDisableConstraint x); + + void endVisit(SQLAlterTableDisableConstraint x); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java index 7c0bdbccf9..a64bd8ff0a 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java @@ -57,6 +57,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddForeignKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddPrimaryKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAlterColumn; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableKeys; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey; @@ -853,4 +854,14 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor { public void endVisit(SQLAlterTableAddForeignKey x) { } + + @Override + public boolean visit(SQLAlterTableDisableConstraint x) { + return true; + } + + @Override + public void endVisit(SQLAlterTableDisableConstraint x) { + + } } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java index 27b1c75426..f739bd53c5 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -39,6 +39,7 @@ import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddColumn; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement; import com.alibaba.druid.sql.ast.statement.SQLCallStatement; @@ -1046,4 +1047,9 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { public boolean visit(SQLUseStatement x) { return false; } + + @Override + public boolean visit(SQLAlterTableDisableConstraint x) { + return false; + } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest_sqlmap.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest_sqlmap.java new file mode 100644 index 0000000000..917721cc42 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest_sqlmap.java @@ -0,0 +1,47 @@ +/* + * Copyright 1999-2011 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.filter.wall; + +import junit.framework.TestCase; + +import org.junit.Assert; + +import com.alibaba.druid.wall.WallProvider; +import com.alibaba.druid.wall.spi.MySqlWallProvider; + +/** + * SQLServerWallTest + * + * @author RaymondXiu + * @version 1.0, 2012-3-18 + * @see + */ +public class MySqlWallTest_sqlmap extends TestCase { + + public void test_false() throws Exception { + WallProvider provider = new MySqlWallProvider(); + provider.getConfig().setSchemaCheck(true); + + Assert.assertFalse(provider.checkValid(// + "SELECT email, passwd, login_id, full_name" + + " FROM members" + + " 'W'=UPPER(MID(@@version_compile_os,1,1))")); + + Assert.assertEquals(1, provider.getTableStats().size()); + } + + +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest15.java new file mode 100644 index 0000000000..108b248788 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest15.java @@ -0,0 +1,52 @@ +/* + * Copyright 1999-2011 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.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import com.alibaba.druid.sql.parser.Token; + +public class MySqlAlterTableTest15 extends TestCase { + + public void test_alter_first() throws Exception { + String sql = "alter table st_jklsxxb disable constraint FK_ST_xxx_REFERENCE_ST_xxx"; + MySqlStatementParser parser = new MySqlStatementParser(sql); + SQLStatement stmt = parser.parseStatementList().get(0); + parser.match(Token.EOF); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + 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()); + + String output = SQLUtils.toMySqlString(stmt); + Assert.assertEquals("ALTER TABLE st_jklsxxb" + // + "\n\tDISABLE CONSTRAINT FK_ST_xxx_REFERENCE_ST_xxx", output); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(0, visitor.getColumns().size()); + } + +}