diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerExprParser.java index 11e34336aa..d71c1631d6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerExprParser.java @@ -198,16 +198,19 @@ public class SQLServerExprParser extends SQLExprParser { public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { if (lexer.token() == Token.IDENTITY) { lexer.nextToken(); - accept(Token.LPAREN); - - SQLIntegerExpr seed = (SQLIntegerExpr) this.primary(); - accept(Token.COMMA); - SQLIntegerExpr increment = (SQLIntegerExpr) this.primary(); - accept(Token.RPAREN); SQLColumnDefinition.Identity identity = new SQLColumnDefinition.Identity(); - identity.setSeed((Integer) seed.getNumber()); - identity.setIncrement((Integer) increment.getNumber()); + if (lexer.token() == Token.LPAREN) { + lexer.nextToken(); + + SQLIntegerExpr seed = (SQLIntegerExpr) this.primary(); + accept(Token.COMMA); + SQLIntegerExpr increment = (SQLIntegerExpr) this.primary(); + accept(Token.RPAREN); + + identity.setSeed((Integer) seed.getNumber()); + identity.setIncrement((Integer) increment.getNumber()); + } if (lexer.token() == Token.NOT) { lexer.nextToken(); 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 0294536142..c7cfb02591 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -1014,11 +1014,14 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab @Override public boolean visit(SQLColumnDefinition.Identity x) { - print0(ucase ? "IDENTITY (" : "identity ("); - print(x.getSeed()); - print0(", "); - print(x.getIncrement()); - print(')'); + print0(ucase ? "IDENTITY" : "identity"); + if (x.getSeed() != null) { + print0(" ("); + print(x.getSeed()); + print0(", "); + print(x.getIncrement()); + print(')'); + } return false; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateTableTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateTableTest_7.java new file mode 100644 index 0000000000..6de6a54cdf --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateTableTest_7.java @@ -0,0 +1,72 @@ +/* + * Copyright 1999-2101 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 java.util.List; + +import junit.framework.TestCase; + +import org.junit.Assert; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; +import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser; +import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.stat.TableStat.Column; +import com.alibaba.druid.util.JdbcConstants; + +public class SQLServerCreateTableTest_7 extends TestCase { + + public void test_0() throws Exception { + String sql = "create table leave_jpa (" + + " id bigint identity not null, " + + " user_id varchar(255), " + + " primary key (id)" + + ")"; + + SQLServerStatementParser parser = new SQLServerStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLCreateTableStatement stmt = (SQLCreateTableStatement) statementList.get(0); + + Assert.assertEquals(1, statementList.size()); + + String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); + Assert.assertEquals("CREATE TABLE leave_jpa (" + + "\n\tid bigint DEFAULT NULL IDENTITY," + + "\n\tuser_id varchar(255)," + + "\n\tPRIMARY KEY (id)" + + "\n)", output); + + 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()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("leave_jpa"))); + + Assert.assertTrue(visitor.getColumns().contains(new Column("leave_jpa", "id"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("leave_jpa", "user_id"))); + } +}