Merge pull request #827 from yakolee/master

fix issue #818
This commit is contained in:
Yako
2015-05-10 22:04:32 +08:00
5 changed files with 53 additions and 6 deletions
@@ -22,9 +22,12 @@ public class MySqlDescribeStatement extends MySqlStatementImpl {
private SQLName object;
private SQLName colName;
public void accept0(MySqlASTVisitor visitor) {
if (visitor.visit(this)) {
acceptChild(visitor, object);
acceptChild(visitor, colName);
}
visitor.endVisit(this);
}
@@ -37,4 +40,12 @@ public class MySqlDescribeStatement extends MySqlStatementImpl {
this.object = object;
}
public SQLName getColName() {
return colName;
}
public void setColName(SQLName colName) {
this.colName = colName;
}
}
@@ -711,7 +711,9 @@ public class MySqlStatementParser extends SQLStatementParser {
MySqlDescribeStatement stmt = new MySqlDescribeStatement();
stmt.setObject(this.exprParser.name());
if (lexer.token() == Token.IDENTIFIER) {
stmt.setColName(this.exprParser.name());
}
return stmt;
}
@@ -1696,6 +1696,10 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
public boolean visit(MySqlDescribeStatement x) {
print("DESC ");
x.getObject().accept(this);
print(" ");
if (x.getColName() != null) {
x.getColName().accept(this);
}
return false;
}
@@ -546,7 +546,11 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS
@Override
public boolean visit(MySqlDescribeStatement x) {
getTableStat(x.getObject().toString());
String table = x.getObject().toString();
getTableStat(table);
if (x.getColName() != null) {
addColumn(table, x.getColName().toString());
}
return false;
}
@@ -24,6 +24,7 @@ import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
import com.alibaba.druid.stat.TableStat;
import com.alibaba.druid.stat.TableStat.Column;
public class MySqlDescribteTest extends MysqlTest {
@@ -44,14 +45,39 @@ public class MySqlDescribteTest extends MysqlTest {
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(0, visitor.getColumns().size());
Assert.assertEquals(0, visitor.getConditions().size());
Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City")));
// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2")));
// Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id")));
// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2")));
// Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id")));
}
public void test_1() throws Exception {
String sql = "desc student sname";
MySqlStatementParser parser = new MySqlStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement stmt = statementList.get(0);
print(statementList);
Assert.assertEquals(1, statementList.size());
MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
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("student", "sname")));
}
}