diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java index 032147e66e..2625551c39 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java @@ -633,4 +633,12 @@ public class SQLServerOutputVisitor extends SQLASTOutputVisitor implements SQLSe printExpr(x.getSequence()); return false; } + + @Override + public boolean visit(SQLAlterTableAddColumn x) { + boolean odps = isOdps(); + print0(ucase ? "ADD " : "add "); + printAndAccept(x.getColumns(), ", "); + return false; + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_10.java index 3074391478..4ca24e69a7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_10.java @@ -45,7 +45,7 @@ public class SQLServerAlterTableTest_10 extends TestCase { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE dbo.doc_exc" - + "\n\tADD (column_b VARCHAR(20) NULL CONSTRAINT exb_unique UNIQUE);", output); + + "\n\tADD column_b VARCHAR(20) NULL CONSTRAINT exb_unique UNIQUE;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_12.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_12.java new file mode 100644 index 0000000000..687aee7703 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_12.java @@ -0,0 +1,57 @@ +/* + * 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.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser; +import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor; +import com.alibaba.druid.sql.parser.Token; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; +import org.junit.Assert; + +public class SQLServerAlterTableTest_12 extends TestCase { + + public void test_alter_first() throws Exception { + String sql = "ALTER TABLE kpiTarget ADD deleted tinyint DEFAULT 0"; + SQLServerStatementParser parser = new SQLServerStatementParser(sql); + SQLStatement stmt = parser.parseStatementList().get(0); + parser.match(Token.EOF); + + SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); + 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.toSQLString(stmt, JdbcConstants.SQL_SERVER); + Assert.assertEquals("ALTER TABLE kpiTarget\n" + + "\tADD deleted tinyint DEFAULT 0", output); + } + { + String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + Assert.assertEquals("alter table kpiTarget\n" + + "\tadd deleted tinyint default 0", output); + } + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(1, visitor.getColumns().size()); + } + +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_3.java index 2d24cd7e26..41579c804a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_3.java @@ -44,7 +44,7 @@ public class SQLServerAlterTableTest_3 extends TestCase { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE extensions" // - + "\n\tADD ([core] bit)", output); + + "\n\tADD [core] bit", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_7.java index ceb3a2cdff..d66f2882a6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_7.java @@ -44,7 +44,7 @@ public class SQLServerAlterTableTest_7 extends TestCase { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE dbo.doc_exa"// - + "\n\tADD (column_b VARCHAR(20) NULL);", output); + + "\n\tADD column_b VARCHAR(20) NULL;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size());