mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
bug fixed for odps sql parser. issue #1455
This commit is contained in:
@@ -29,6 +29,7 @@ import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
|
||||
import com.alibaba.druid.sql.ast.statement.*;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLCreateTriggerStatement.TriggerEvent;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLCreateTriggerStatement.TriggerType;
|
||||
import com.alibaba.druid.util.JdbcConstants;
|
||||
import org.apache.ibatis.jdbc.SQL;
|
||||
|
||||
public class SQLStatementParser extends SQLParser {
|
||||
@@ -1978,6 +1979,13 @@ public class SQLStatementParser extends SQLParser {
|
||||
}
|
||||
|
||||
protected SQLAlterTableAddColumn parseAlterTableAddColumn() {
|
||||
boolean odps = JdbcConstants.ODPS.equals(dbType);
|
||||
|
||||
if (odps) {
|
||||
acceptIdentifier("COLUMNS");
|
||||
accept(Token.LPAREN);
|
||||
}
|
||||
|
||||
SQLAlterTableAddColumn item = new SQLAlterTableAddColumn();
|
||||
|
||||
for (;;) {
|
||||
@@ -1992,6 +2000,10 @@ public class SQLStatementParser extends SQLParser {
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if (odps) {
|
||||
accept(Token.RPAREN);
|
||||
}
|
||||
return item;
|
||||
}
|
||||
|
||||
|
||||
@@ -1639,7 +1639,12 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
|
||||
|
||||
@Override
|
||||
public boolean visit(SQLAlterTableAddColumn x) {
|
||||
print0(ucase ? "ADD (" : "add (");
|
||||
boolean odps = JdbcConstants.ODPS.equals(dbType);
|
||||
if (odps) {
|
||||
print0(ucase ? "ADD COLUMNS (" : "add columns (");
|
||||
} else {
|
||||
print0(ucase ? "ADD (" : "add (");
|
||||
}
|
||||
printAndAccept(x.getColumns(), ", ");
|
||||
print(')');
|
||||
return false;
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
/*
|
||||
* 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.odps;
|
||||
|
||||
import com.alibaba.druid.sql.SQLUtils;
|
||||
import com.alibaba.druid.sql.ast.SQLStatement;
|
||||
import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
|
||||
import com.alibaba.druid.util.JdbcConstants;
|
||||
import junit.framework.TestCase;
|
||||
import org.junit.Assert;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class OdpsSelectTest19 extends TestCase {
|
||||
|
||||
public void test_select() throws Exception {
|
||||
String sql = "alter table adl_smeta_column_indi_rule_relation_sdt add columns (rule_level string);";//
|
||||
Assert.assertEquals("ALTER TABLE adl_smeta_column_indi_rule_relation_sdt\n" +
|
||||
"\tADD COLUMNS (rule_level STRING);", SQLUtils.formatOdps(sql));
|
||||
Assert.assertEquals("alter table adl_smeta_column_indi_rule_relation_sdt\n" +
|
||||
"\tadd columns (rule_level string);", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION));
|
||||
|
||||
List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS);
|
||||
SQLStatement stmt = statementList.get(0);
|
||||
|
||||
Assert.assertEquals(1, statementList.size());
|
||||
|
||||
SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS);
|
||||
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(1, visitor.getColumns().size());
|
||||
Assert.assertEquals(0, visitor.getConditions().size());
|
||||
|
||||
// Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name")));
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user