Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

bug fixed for 'null constraint' and 'default null'. issue #1349

Browse Source
This commit is contained in:
wenshao
2016-08-04 12:11:41 +08:00
parent 7fe5515c03
commit e75a304fe9
20 changed files with 77 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/ast/statement/NotNullConstraint.java → src/main/java/com/alibaba/druid/sql/ast/statement/SQLNotNullConstraint.java
+2 -2
View File
@@ -17,9 +17,9 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class NotNullConstraint extends SQLConstraintImpl implements SQLColumnConstraint {
public class SQLNotNullConstraint extends SQLConstraintImpl implements SQLColumnConstraint {
public NotNullConstraint(){
public SQLNotNullConstraint(){
}
src/main/java/com/alibaba/druid/sql/ast/statement/NullConstraint.java → src/main/java/com/alibaba/druid/sql/ast/statement/SQLNullConstraint.java
+2 -2
View File
@@ -17,9 +17,9 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class NullConstraint extends SQLConstraintImpl implements SQLColumnConstraint {
public class SQLNullConstraint extends SQLConstraintImpl implements SQLColumnConstraint {
public NullConstraint(){
public SQLNullConstraint(){
}
@Override
src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
+2 -6
View File
@@ -323,12 +323,8 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
}
if (x.getDefaultExpr() != null) {
if (x.getDefaultExpr() instanceof SQLNullExpr) {
print0(ucase ? " NULL" : " null");
} else {
print0(ucase ? " DEFAULT " : " default ");
x.getDefaultExpr().accept(this);
}
print0(ucase ? " DEFAULT " : " default ");
x.getDefaultExpr().accept(this);
}
if (x.getStorage() != null) {
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+5 -5
View File
@@ -64,8 +64,8 @@ import com.alibaba.druid.sql.ast.expr.SQLSomeExpr;
import com.alibaba.druid.sql.ast.expr.SQLUnaryExpr;
import com.alibaba.druid.sql.ast.expr.SQLUnaryOperator;
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
import com.alibaba.druid.sql.ast.statement.NotNullConstraint;
import com.alibaba.druid.sql.ast.statement.NullConstraint;
import com.alibaba.druid.sql.ast.statement.SQLNotNullConstraint;
import com.alibaba.druid.sql.ast.statement.SQLNullConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
import com.alibaba.druid.sql.ast.statement.SQLCheck;
@@ -1683,13 +1683,13 @@ public class SQLExprParser extends SQLParser {
if (lexer.token() == Token.NOT) {
lexer.nextToken();
accept(Token.NULL);
column.addConstraint(new NotNullConstraint());
column.addConstraint(new SQLNotNullConstraint());
return parseColumnRest(column);
}
if (lexer.token() == Token.NULL) {
lexer.nextToken();
column.getConstraints().add(new NullConstraint());
column.getConstraints().add(new SQLNullConstraint());
return parseColumnRest(column);
}
@@ -1746,7 +1746,7 @@ public class SQLExprParser extends SQLParser {
if (lexer.token() == Token.NOT) {
lexer.nextToken();
accept(Token.NULL);
NotNullConstraint notNull = new NotNullConstraint();
SQLNotNullConstraint notNull = new SQLNotNullConstraint();
notNull.setName(name);
column.addConstraint(notNull);
return parseColumnRest(column);
src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
+2 -2
View File
@@ -1182,7 +1182,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
return false;
}
public boolean visit(NotNullConstraint x) {
public boolean visit(SQLNotNullConstraint x) {
if (x.getName() != null) {
print0(ucase ? "CONSTRAINT " : "constraint ");
x.getName().accept(this);
@@ -1192,7 +1192,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
return false;
}
public boolean visit(NullConstraint x) {
public boolean visit(SQLNullConstraint x) {
if (x.getName() != null) {
print0(ucase ? "CONSTRAINT " : "constraint ");
x.getName().accept(this);
src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java
+4 -4
View File
@@ -245,9 +245,9 @@ public interface SQLASTVisitor {
void endVisit(SQLCreateViewStatement.Column x);
boolean visit(NotNullConstraint x);
boolean visit(SQLNotNullConstraint x);
void endVisit(NotNullConstraint x);
void endVisit(SQLNotNullConstraint x);
void endVisit(SQLMethodInvokeExpr x);
@@ -717,8 +717,8 @@ public interface SQLASTVisitor {
void endVisit(SQLErrorLoggingClause x);
boolean visit(NullConstraint x);
boolean visit(SQLNullConstraint x);
void endVisit(NullConstraint x);
void endVisit(SQLNullConstraint x);
}
src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java
+4 -4
View File
@@ -352,11 +352,11 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor {
public void endVisit(SQLCreateViewStatement.Column x) {
}
public boolean visit(NotNullConstraint x) {
public boolean visit(SQLNotNullConstraint x) {
return true;
}
public void endVisit(NotNullConstraint x) {
public void endVisit(SQLNotNullConstraint x) {
}
@Override
@@ -1567,11 +1567,11 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor {
}
@Override
public boolean visit(NullConstraint x) {
public boolean visit(SQLNullConstraint x) {
return true;
}
@Override
public void endVisit(NullConstraint x) {
public void endVisit(SQLNullConstraint x) {
}
}