MONDRIAN: Observe internalType when accessing parent-child hierarchies.

[git-p4: depot-paths = "//open/mondrian/": change = 14575]
pentaho · Aug 30, 2011 · da23f73 · da23f73
1 parent 9d51a44
commit da23f73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/mondrian/rolap/SqlMemberSource.java b/src/main/mondrian/rolap/SqlMemberSource.java
@@ -1121,7 +1121,7 @@ private Pair<String, List<SqlStatement.Type>> makeChildMemberSql_PCRoot(
         sqlQuery.addWhere(condition.toString());
         hierarchy.addToFrom(sqlQuery, level.getKeyExp());
         String childId = level.getKeyExp().getExpression(sqlQuery);
-        sqlQuery.addSelectGroupBy(childId, null);
+        sqlQuery.addSelectGroupBy(childId, level.getInternalType());
         hierarchy.addToFrom(sqlQuery, level.getOrdinalExp());
         String orderBy = level.getOrdinalExp().getExpression(sqlQuery);
         sqlQuery.addOrderBy(orderBy, true, false, true);
@@ -1183,7 +1183,7 @@ private Pair<String, List<SqlStatement.Type>> makeChildMemberSqlPC(
 
         hierarchy.addToFrom(sqlQuery, level.getKeyExp());
         String childId = level.getKeyExp().getExpression(sqlQuery);
-        sqlQuery.addSelectGroupBy(childId, null);
+        sqlQuery.addSelectGroupBy(childId, level.getInternalType());
         hierarchy.addToFrom(sqlQuery, level.getOrdinalExp());
         String orderBy = level.getOrdinalExp().getExpression(sqlQuery);
         sqlQuery.addOrderBy(orderBy, true, false, true);

diff --git a/src/main/mondrian/rolap/SqlTupleReader.java b/src/main/mondrian/rolap/SqlTupleReader.java
@@ -991,7 +991,8 @@ protected void addLevelMemberSql(
                     hierarchy.addToFrom(sqlQuery, parentExp);
                 }
                 String parentSql = parentExp.getExpression(sqlQuery);
-                sqlQuery.addSelectGroupBy(parentSql, null);
+                sqlQuery.addSelectGroupBy(
+                    parentSql, currLevel.getInternalType());
                 if (whichSelect == WhichSelect.LAST
                     || whichSelect == WhichSelect.ONLY)
                 {