From 348961f89c77fcdb9722f88fd8860f308d9383ad Mon Sep 17 00:00:00 2001 From: "simiao.zw" Date: Tue, 5 May 2015 12:33:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3ddl=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E7=BC=96=E7=A0=81=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../mysql/visitor/MySqlOutputVisitor.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 328a02d5a3..1684c72cf9 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,7 @@ maven-javadoc-plugin - 2.9 + 2.9.1 attach-javadoc 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 356b2ee15c..48ea9f148a 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 @@ -15,9 +15,6 @@ */ package com.alibaba.druid.sql.dialect.mysql.visitor; -import java.util.List; -import java.util.Map; - import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.ast.SQLExpr; @@ -152,6 +149,9 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatem import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; +import java.util.List; +import java.util.Map; + public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTVisitor { public MySqlOutputVisitor(Appendable appender){ @@ -290,6 +290,11 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV print(' '); x.getDataType().accept(this); + for (SQLColumnConstraint item : x.getConstraints()) { + print(' '); + item.accept(this); + } + if (x.getDefaultExpr() != null) { if (x.getDefaultExpr() instanceof SQLNullExpr) { print(" NULL"); @@ -314,11 +319,6 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV print(" AUTO_INCREMENT"); } - for (SQLColumnConstraint item : x.getConstraints()) { - print(' '); - item.accept(this); - } - if (x.getComment() != null) { print(" COMMENT "); x.getComment().accept(this); From 2640301de55e8fb238fa0e8308f6556aebc085c2 Mon Sep 17 00:00:00 2001 From: "simiao.zw" Date: Tue, 5 May 2015 13:17:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89doc=E7=9A=842.9.1?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1684c72cf9..328a02d5a3 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,7 @@ maven-javadoc-plugin - 2.9.1 + 2.9 attach-javadoc