Merge pull request #930 from 52Jolynn/master

修复若干bug及增加若干特性
This commit is contained in:
高铁
2015-08-22 00:53:52 +08:00
7 changed files with 78 additions and 5 deletions
@@ -21,6 +21,7 @@ import org.junit.Assert;
import com.alibaba.druid.sql.PGTest;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGDeleteStatement;
import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser;
import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor;
import com.alibaba.druid.stat.TableStat;
@@ -50,5 +51,17 @@ public class PGDeleteTest extends PGTest {
//Assert.assertTrue(visitor.getFields().size() == 0);
}
public void test_1() {
String sql = "delete from test01 as a where a.id = 2";
PGSQLStatementParser parser = new PGSQLStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement statemen = statementList.get(0);
print(statementList);
assertTrue(statementList.size() == 1);
assertTrue(statemen instanceof PGDeleteStatement);
PGDeleteStatement delete = (PGDeleteStatement) statemen;
assertTrue(delete.getAlias().equalsIgnoreCase("a"));
assertTrue(delete.getTableName().getSimpleName().equals("test01"));
}
}
@@ -21,6 +21,7 @@ import org.junit.Assert;
import com.alibaba.druid.sql.PGTest;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGInsertStatement;
import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser;
import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor;
import com.alibaba.druid.stat.TableStat;
@@ -51,5 +52,15 @@ public class PGInsertTest0 extends PGTest {
// Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "producer_id")));
}
public void test_1() {
String sql = "insert into test01 DEFAULT VALUES";
PGSQLStatementParser parser = new PGSQLStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement statemen = statementList.get(0);
print(statementList);
assertTrue(statemen instanceof PGInsertStatement);
PGInsertStatement insert = (PGInsertStatement) statemen;
assertTrue(insert.getTableName().getSimpleName()
.equalsIgnoreCase("test01"));
}
}
@@ -21,6 +21,7 @@ import org.junit.Assert;
import com.alibaba.druid.sql.PGTest;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectStatement;
import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser;
import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor;
@@ -48,4 +49,20 @@ public class PGSelectTest21 extends PGTest {
Assert.assertEquals(1, visitor.getColumns().size());
Assert.assertEquals(1, visitor.getTables().size());
}
public void test_1() throws Exception {
String sql = "with a(a1,b1) as (select * from b) select * from a";
PGSQLStatementParser parser = new PGSQLStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement statemen = statementList.get(0);
print(statementList);
assertTrue(statemen instanceof PGSelectStatement);
assertTrue(((PGSelectStatement)statemen).getWith().getWithQuery().size()==1);
StringBuffer sb = new StringBuffer();
((PGSelectStatement)statemen).getWith().getWithQuery().get(0).getName().output(sb);
assertTrue("a".equals(sb.toString()));
assertTrue(((PGSelectStatement)statemen).getWith().getWithQuery().get(0).getColumns().size()==2);
}
}