diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDefault.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDefault.java index b52db28eb4..88680876f3 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDefault.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDefault.java @@ -24,6 +24,7 @@ public class SQLDefault extends SQLConstraintImpl implements SQLTableElement, SQ private SQLExpr expr; private SQLExpr column; + private boolean withValues = false; public SQLDefault(){ @@ -71,8 +72,14 @@ public class SQLDefault extends SQLConstraintImpl implements SQLTableElement, SQ super.cloneTo(x); if (expr != null) { - expr = expr.clone(); + x.setExpr(expr.clone()); } + + if (column != null) { + x.setColumn(column.clone()); + } + + x.setWithValues(x.isWithValues()); } public SQLDefault clone() { @@ -99,4 +106,12 @@ public class SQLDefault extends SQLConstraintImpl implements SQLTableElement, SQ } return false; } + + public boolean isWithValues() { + return withValues; + } + + public void setWithValues(boolean withValues) { + this.withValues = withValues; + } } 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 d5d19c652f..a1ffc7c82c 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -4814,6 +4814,12 @@ public class SQLExprParser extends SQLParser { accept(Token.FOR); sqlDefault.setColumn(this.expr()); + if (lexer.token == Token.WITH) { + lexer.nextToken(); + accept(Token.VALUES); + sqlDefault.setWithValues(true); + } + return sqlDefault; } 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 129031ec54..951642723c 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -1838,6 +1838,10 @@ public class SQLStatementParser extends SQLParser { break; } + } else if (lexer.token == DEFAULT) { + SQLConstraint constraint = this.exprParser.parseConstaint(); + SQLAlterTableAddConstraint item = new SQLAlterTableAddConstraint(constraint); + stmt.addItem(item); } else { throw new ParserException("TODO " + lexer.info()); } 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 6d9d4ddea5..d2241f6c4f 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -5290,6 +5290,11 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet this.indentCount++; x.getColumn().accept(this); this.indentCount--; + + if (x.isWithValues()) { + print0(ucase ? " WITH VALUES" : " with values"); + } + return false; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_13_default.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_13_default.java new file mode 100644 index 0000000000..a52c856475 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_13_default.java @@ -0,0 +1,78 @@ +/* + * Copyright 1999-2017 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.DbType; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; + +public class SQLServerAlterTableTest_13_default extends TestCase { + + public void test_alter_first() throws Exception { + String sql = "ALTER TABLE N_MerchantBase ADD CONSTRAINT DF_N_MerchantBase_UnUsedCouponMoney DEFAULT ((0)) FOR [UnUsedCouponMoney]"; + List sqlStatements = SQLUtils.parseStatements(sql, DbType.sqlserver); + SQLStatement stmt = sqlStatements.get(0); + + SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); + stmt.accept(visitor); + + { + String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); + Assert.assertEquals("ALTER TABLE N_MerchantBase\n" + + "\tADD CONSTRAINT DF_N_MerchantBase_UnUsedCouponMoney DEFAULT 0 FOR [UnUsedCouponMoney]", output); + } + { + String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + Assert.assertEquals("alter table N_MerchantBase\n" + + "\tadd constraint DF_N_MerchantBase_UnUsedCouponMoney default 0 for [UnUsedCouponMoney]", output); + } + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(1, visitor.getColumns().size()); + } + + @Test + public void test_alter_table_constraint_default() { + + String sql = "ALTER TABLE N_MerchantBase ADD CONSTRAINT DF_N_MerchantBase_UnUsedCouponMoney DEFAULT 0 FOR UnUsedCouponMoney;"; + + List sqlStatements = SQLUtils.parseStatements(sql, com.alibaba.druid.DbType.sqlserver); + + Assert.assertEquals("ALTER TABLE N_MerchantBase\n" + + "\tADD CONSTRAINT DF_N_MerchantBase_UnUsedCouponMoney DEFAULT 0 FOR UnUsedCouponMoney;", sqlStatements.get(0).toString()); + } + + @Test + public void test_alter_table_add_default() { + + String sql = "alter table GoingHomeMain add default(0) for MilesTotal with values;"; + + List sqlStatements = SQLUtils.parseStatements(sql, com.alibaba.druid.DbType.sqlserver); + + // System.out.println(sqlStatements.get(0).toString()); + Assert.assertEquals("ALTER TABLE GoingHomeMain\n" + + "\tADD DEFAULT 0 FOR MilesTotal WITH VALUES;", sqlStatements.get(0).toString()); + + } + + +}