MONDRIAN: Fix bug 1784617, "Using StrToTuple() in schema errors out".

[git-p4: depot-paths = "//open/mondrian/": change = 9898]
pentaho · Sep 21, 2007 · ecfe757 · ecfe757
1 parent 234bc7d
commit ecfe757
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 3 deletions.
diff --git a/src/main/mondrian/olap/fun/StrToTupleFunDef.java b/src/main/mondrian/olap/fun/StrToTupleFunDef.java
@@ -112,7 +112,7 @@ public Exp createCall(Validator validator, Exp[] args) {
                 DimensionExpr dimensionExpr = (DimensionExpr) arg;
                 Dimension dimension = dimensionExpr.getDimension();
                 args[i] = new HierarchyExpr(dimension.getHierarchy());
-            } else if (arg instanceof Hierarchy) {
+            } else if (arg instanceof HierarchyExpr) {
                 // nothing
             } else {
                 throw MondrianResource.instance().MdxFuncNotHier.ex(
@@ -175,7 +175,8 @@ public FunDef resolve(
             }
             for (int i = 1; i < args.length; i++) {
                 Exp exp = args[i];
-                if (!(exp instanceof DimensionExpr)) {
+                if (!(exp instanceof DimensionExpr
+                    || exp instanceof HierarchyExpr)) {
                     return null;
                 }
             }

diff --git a/testsrc/main/mondrian/test/TestCalculatedMembers.java b/testsrc/main/mondrian/test/TestCalculatedMembers.java
@@ -958,6 +958,40 @@ public void testCalcMemberCustomFormatterInSchemaNegative() {
                 + "from [Sales]",
             "Failed to load formatter class 'mondrian.test.NonExistentCellFormatter' for member '[Measures].[Profit Formatted]'.");
     }
+
+    /**
+     * Testcase for bug 1784617, "Using StrToTuple() in schema errors out".
+     */
+    public void testStrToSetInCubeCalcMember() {
+
+        // calc member defined in schema
+        String cubeName = "Sales";
+        TestContext testContext =
+            TestContext.createSubstitutingCube(
+            cubeName,
+            null,
+            "<CalculatedMember\n" +
+                "    name=\"My Tuple\"\n" +
+                "    dimension=\"Measures\"\n" +
+                "    visible=\"false\"\n" +
+                "    formula=\"StrToTuple('([Gender].[M], [Marital Status].[S])', [Gender], [Marital Status])\"/>\n");
+        String desiredResult =
+            fold("Axis #0:\n" +
+                "{}\n" +
+                "Axis #1:\n" +
+                "{[Measures].[My Tuple]}\n" +
+                "Row #0: 68,755\n");
+        testContext.assertQueryReturns(
+            "select {[Measures].[My Tuple]} on 0 from [Sales]",
+            desiredResult);
+
+        // same result if calc member is defined in query
+        TestContext.instance().assertQueryReturns(
+            "with member [Measures].[My Tuple] as\n"
+                + " 'StrToTuple(\"([Gender].[M], [Marital Status].[S])\", [Gender], [Marital Status])'\n"
+                + "select {[Measures].[My Tuple]} on 0 from [Sales]",
+            desiredResult);
+    }
 }
 
-// End CalculatedMembersTestCase.java
+// End TestCalculatedMembers.java