Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

bug fixed for SchemaStat for Hierarchical Query pseudocolumn.

Browse Source
This commit is contained in:
wenshao
2017-04-24 18:43:40 +08:00
parent 7f75fb3eb9
commit 30a79c41ab
5 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java
+13
View File
@@ -967,6 +967,19 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
return false;
}
if ("LEVEL".equalsIgnoreCase(ident)) {
SQLObject parent = x.getParent();
if (parent instanceof SQLSelectItem) {
SQLObject parent2 = parent.getParent();
if (parent2 instanceof SQLSelectQueryBlock) {
SQLSelectQueryBlock queryBlock = (SQLSelectQueryBlock) parent2;
if (queryBlock.getStartWith() != null || queryBlock.getConnectBy() != null) {
return false;
}
}
}
}
Column column = null;
if (currentTable != null) {
column = addColumn(currentTable, ident);
src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_hierarchical_1.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class DB2SelectTest_hierarchical_1 extends MysqlTest {
System.out.println("orderBy : " + visitor.getOrderByColumns());
assertEquals(1, visitor.getTables().size());
assertEquals(4, visitor.getColumns().size());
assertEquals(3, visitor.getColumns().size());
assertEquals(0, visitor.getConditions().size());
// assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store")));
src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class OceanbaseSelectTest extends MysqlTest {
System.out.println("orderBy : " + visitor.getOrderByColumns());
assertEquals(1, visitor.getTables().size());
assertEquals(4, visitor.getColumns().size());
assertEquals(3, visitor.getColumns().size());
assertEquals(0, visitor.getConditions().size());
// assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store")));
src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest_hierarchical_1.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class OceanbaseSelectTest_hierarchical_1 extends MysqlTest {
System.out.println("orderBy : " + visitor.getOrderByColumns());
assertEquals(1, visitor.getTables().size());
assertEquals(4, visitor.getColumns().size());
assertEquals(3, visitor.getColumns().size());
assertEquals(0, visitor.getConditions().size());
// assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store")));
src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest16.java
+9 -11
View File
@@ -17,27 +17,25 @@ package com.alibaba.druid.bvt.sql.oracle.select;
import java.util.List;
import org.junit.Assert;
import com.alibaba.druid.sql.OracleTest;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
import com.alibaba.druid.stat.TableStat;
import com.alibaba.druid.util.JdbcConstants;
public class OracleSelectTest16 extends OracleTest {
public void test_0() throws Exception {
String sql = "select privilege#,level from sysauth$ connect by grantee#=prior privilege# and privilege#>0 start with grantee#=:1 and privilege#>0"; //
OracleStatementParser parser = new OracleStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE);
SQLStatement statemen = statementList.get(0);
print(statementList);
Assert.assertEquals(1, statementList.size());
assertEquals(1, statementList.size());
OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor();
SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE);
statemen.accept(visitor);
System.out.println("Tables : " + visitor.getTables());
@@ -46,11 +44,11 @@ public class OracleSelectTest16 extends OracleTest {
System.out.println("relationships : " + visitor.getRelationships());
System.out.println("orderBy : " + visitor.getOrderByColumns());
Assert.assertEquals(1, visitor.getTables().size());
assertEquals(1, visitor.getTables().size());
Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("sysauth$")));
assertTrue(visitor.getTables().containsKey(new TableStat.Name("sysauth$")));
Assert.assertEquals(3, visitor.getColumns().size());
assertEquals(2, visitor.getColumns().size());
// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "*")));
// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "YEAR")));