diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index a0e1421cee..a88b8e335f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -3449,7 +3449,9 @@ public class MySqlStatementParser extends SQLStatementParser { if (lexer.token() == Token.COLUMN) { lexer.nextToken(); parseAlterTableAddColumn(stmt); - } else if (lexer.token() == Token.INDEX || lexer.identifierEquals("FULLTEXT")) { + } else if (lexer.token() == Token.INDEX + || lexer.identifierEquals(FnvHash.Constants.FULLTEXT) + || lexer.identifierEquals(FnvHash.Constants.SPATIAL)) { SQLAlterTableAddIndex item = parseAlterTableAddIndex(); item.setParent(stmt); stmt.addItem(item); @@ -3539,10 +3541,6 @@ public class MySqlStatementParser extends SQLStatementParser { } stmt.addItem(item); - } else if (lexer.identifierEquals(FULLTEXT)) { - throw new ParserException("TODO " + lexer.info()); - } else if (lexer.identifierEquals(SPATIAL)) { - throw new ParserException("TODO " + lexer.info()); } else { parseAlterTableAddColumn(stmt); } 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 08d74551ca..0b73439449 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -2755,9 +2755,12 @@ public class SQLStatementParser extends SQLParser { protected SQLAlterTableAddIndex parseAlterTableAddIndex() { SQLAlterTableAddIndex item = new SQLAlterTableAddIndex(); - if (lexer.identifierEquals("FULLTEXT")) { + if (lexer.identifierEquals(FnvHash.Constants.FULLTEXT)) { lexer.nextToken(); item.setType("FULLTEXT"); + } else if (lexer.identifierEquals(FnvHash.Constants.SPATIAL)) { + lexer.nextToken(); + item.setType("SPATIAL"); } if (lexer.token == Token.UNIQUE) { 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 9d22da3fcd..eece84a8bb 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -3811,11 +3811,13 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet @Override public boolean visit(SQLUnique x) { - if (x.getName() != null) { + SQLName name = x.getName(); + if (name != null) { print0(ucase ? "CONSTRAINT " : "constraint "); - x.getName().accept(this); + name.accept(this); print(' '); } + print0(ucase ? "UNIQUE (" : "unique ("); printAndAccept(x.getColumns(), ", "); print(')'); @@ -3824,9 +3826,10 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet @Override public boolean visit(SQLPrimaryKeyImpl x) { - if (x.getName() != null) { + SQLName name = x.getName(); + if (name != null) { print0(ucase ? "CONSTRAINT " : "constraint "); - x.getName().accept(this); + name.accept(this); print(' '); } @@ -3839,7 +3842,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet print('('); printAndAccept(x.getColumns(), ", "); print(')'); - + return false; } @@ -3854,11 +3857,13 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet @Override public boolean visit(SQLColumnReference x) { - if (x.getName() != null) { + SQLName name = x.getName(); + if (name != null) { print0(ucase ? "CONSTRAINT " : "constraint "); - x.getName().accept(this); + name.accept(this); print(' '); } + print0(ucase ? "REFERENCES " : "references "); x.getTable().accept(this); print0(" ("); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlAlterTableAddIndex_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlAlterTableAddIndex_2.java new file mode 100644 index 0000000000..1d0fe9f9d1 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlAlterTableAddIndex_2.java @@ -0,0 +1,50 @@ +/* + * 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.mysql.create; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.parser.Token; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; +import org.junit.Assert; + +public class MySqlAlterTableAddIndex_2 extends TestCase { + + public void test_alter_first() throws Exception { + String sql = "ALTER TABLE geom ADD SPATIAL INDEX(g);"; + MySqlStatementParser parser = new MySqlStatementParser(sql); + SQLStatement stmt = parser.parseStatementList().get(0); + parser.match(Token.EOF); + + Assert.assertEquals("ALTER TABLE geom\n" + + "\tADD INDEX USING SPATIAL (g);", SQLUtils.toMySqlString(stmt)); + + Assert.assertEquals("alter table geom\n" + + "\tadd index using SPATIAL (g);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + SchemaStatVisitor visitor = new SQLUtils().createSchemaStatVisitor(JdbcConstants.MYSQL); + stmt.accept(visitor); + TableStat tableStat = visitor.getTableStat("geom"); + assertNotNull(tableStat); + assertEquals(1, tableStat.getAlterCount()); + assertEquals(1, tableStat.getCreateIndexCount()); + } + +}