diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnCheck.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnCheck.java index c5c48e3347..1c692581e2 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnCheck.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnCheck.java @@ -23,6 +23,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLColumnCheck extends SQLConstraintImpl implements SQLColumnConstraint, SQLReplaceable { private SQLExpr expr; + protected Boolean enforced; public SQLColumnCheck(){ @@ -43,6 +44,14 @@ public class SQLColumnCheck extends SQLConstraintImpl implements SQLColumnConstr this.expr = expr; } + public Boolean getEnforced() { + return enforced; + } + + public void setEnforced(Boolean enforced) { + this.enforced = enforced; + } + @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java index 1c660d41c7..a209f0c922 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java @@ -701,11 +701,17 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV } print(')'); - if (x.getIndexDefinition().hasOptions()) { - x.getIndexDefinition().getOptions().accept(this); + SQLIndexDefinition indexDefinition = x.getIndexDefinition(); + if (indexDefinition.hasOptions()) { + indexDefinition.getOptions().accept(this); } SQLExpr comment = x.getComment(); + if (indexDefinition.hasOptions() + && indexDefinition.getOptions().getComment() == comment) { + comment = null; + } + if (comment != null) { print0(ucase ? " COMMENT " : " comment "); printExpr(comment); diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index 25881e565d..ebe5d34a66 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -4451,7 +4451,7 @@ public class SQLExprParser extends SQLParser { protected SQLColumnCheck parseColumnCheck() { lexer.nextToken(); - SQLExpr expr = this.expr(); + SQLExpr expr = this.primary(); SQLColumnCheck check = new SQLColumnCheck(expr); if (lexer.token == Token.DISABLE) { @@ -4472,7 +4472,20 @@ public class SQLExprParser extends SQLParser { } else if (lexer.identifierEquals(FnvHash.Constants.NORELY)) { lexer.nextToken(); check.setRely(Boolean.FALSE); + } else if (lexer.identifierEquals("ENFORCED")) { + lexer.nextToken(); + check.setEnforced(true); + } else if (lexer.token == Token.NOT) { + Lexer.SavePoint mark = lexer.mark(); + lexer.nextToken(); + if (lexer.identifierEquals("ENFORCED")) { + lexer.nextToken(); + check.setEnforced(false); + } else { + lexer.reset(mark); + } } + return check; } 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 bae9c05a52..ec39a24486 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -5196,13 +5196,23 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet x.getExpr().accept(this); print(')'); - if (x.getEnable() != null) { - if (x.getEnable().booleanValue()) { + Boolean enable = x.getEnable(); + if (enable != null) { + if (enable.booleanValue()) { print0(ucase ? " ENABLE" : " enable"); } else { print0(ucase ? " DISABLE" : " disable"); } } + + Boolean enforced = x.getEnforced(); + if (enforced != null) { + if (enforced.booleanValue()) { + print0(ucase ? " ENFORCED" : " enforced"); + } else { + print0(ucase ? " NOT ENFORCED" : " not enforced"); + } + } return false; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest156_ob.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest156_ob.java index 5e5eea39fc..b45f057e07 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest156_ob.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest156_ob.java @@ -33,7 +33,7 @@ public class MySqlCreateTableTest156_ob "\t`gmt_create` datetime NOT NULL COMMENT '创建时间',\n" + "\t`gmt_modified` datetime NOT NULL COMMENT '修改时间',\n" + "\tPRIMARY KEY (`id`),\n" + - "\tKEY `idx_ranking` (`user_id`, `scene_code`, `record_type`, `record_date`)\n" + + "\tKEY `idx_ranking` (`user_id`, `scene_code`, `record_type`, `record_date`) KEY_BLOCK_SIZE = 16384\n" + ") AUTO_INCREMENT = 1000001 CHARSET = utf8mb4 COMPRESSION = 'lz4_1.0' REPLICA_NUM = 3 BLOCK_SIZE = 16384 USE_BLOOM_FILTER = false TABLET_SIZE = 134217728 PCTFREE = 10 COMMENT 'ar平台数据排行榜';", stmt.toString()); } } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest157_shadow.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest157_shadow.java index d2108af9ee..ba5ef616ed 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest157_shadow.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest157_shadow.java @@ -38,7 +38,7 @@ public class MySqlCreateTableTest157_shadow extends MysqlTest { "\t`gmt_create` datetime NOT NULL COMMENT '创建时间',\n" + "\t`gmt_modified` datetime NOT NULL COMMENT '修改时间',\n" + "\tPRIMARY KEY (`id`),\n" + - "\tKEY `idx_ranking` (`user_id`, `scene_code`, `record_type`, `record_date`)\n" + + "\tKEY `idx_ranking` (`user_id`, `scene_code`, `record_type`, `record_date`) KEY_BLOCK_SIZE = 16384\n" + ") AUTO_INCREMENT = 1000001 CHARSET = utf8mb4;", stmt.toString()); } } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java index 7c85c2b0b4..fa975cd8d3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java @@ -119,6 +119,10 @@ public class MySqlResourceTest extends TestCase { exec_test("bvt/parser/mysql-31.txt"); } + public void test_32() throws Exception { + exec_test("bvt/parser/mysql-32.txt"); + } + public void exec_test(String resource) throws Exception { // System.out.println(resource); InputStream is = null; diff --git a/src/test/resources/bvt/parser/mysql-32.txt b/src/test/resources/bvt/parser/mysql-32.txt new file mode 100644 index 0000000000..4eb56475df --- /dev/null +++ b/src/test/resources/bvt/parser/mysql-32.txt @@ -0,0 +1,21 @@ +create table test( + id int, + fist_name varchar(20), + last_name varchar(20), + age int check (age < 200) not enforced, + sex char(1) check (sex='女' or sex='男') enforced, + constraint name_ck check (fist_name<>last_name) not enforced, + constraint age_ck check (age>=16 and age<65) + )engine=innodb default charset=utf8; +--------------------------- +CREATE TABLE test ( + id int, + fist_name varchar(20), + last_name varchar(20), + age int CHECK (age < 200) NOT ENFORCED, + sex char(1) CHECK (sex = '女' + OR sex = '男') ENFORCED, + CONSTRAINT name_ck CHECK (fist_name <> last_name) NOT ENFORCED, + CONSTRAINT age_ck CHECK (age >= 16 + AND age < 65) +) ENGINE = innodb CHARSET = utf8; \ No newline at end of file