MONDRIAN: Integrate from //open/mondrian/release/2 to //open/mondrian…

… up to change 5418. [git-p4: depot-paths = "//open/mondrian/": change = 5419]
pentaho · Feb 13, 2006 · 14a4f66 · 14a4f66
1 parent 9a688e5
commit 14a4f66
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/src/main/mondrian/rolap/RolapEvaluator.java b/src/main/mondrian/rolap/RolapEvaluator.java
@@ -453,6 +453,9 @@ String getFormatString() {
         }
         Calc formatCalc = root.getCompiled(formatExp, true);
         Object o = formatCalc.evaluate(this);
+        if (o == null) {
+            return "Standard";
+        }
         return o.toString();
     }
 

diff --git a/testsrc/main/mondrian/test/TestCalculatedMembers.java b/testsrc/main/mondrian/test/TestCalculatedMembers.java
@@ -388,6 +388,41 @@ public void testBracketInCalcMemberName() {
                 "Row #0: Unit Sales" + nl);
     }
 
+    /**
+     * Tests that IIf works OK even if its argument returns the NULL
+     * value. (Bug 1418689.)
+     */
+    public void testNpeInIif() {
+        assertQueryReturns(
+                fold(new String[] {
+                    "WITH MEMBER [Measures].[Foo] AS ' 1 / [Measures].[Unit Sales] ',",
+                    "  FORMAT_STRING=IIf([Measures].[Foo] < .3, \"|0.0|style=red\",\"0.0\")",
+                    "SELECT {[Store].[USA].[WA].children} on columns",
+                    "FROM Sales",
+                    "WHERE ( [Time].[1997].[Q4].[12],",
+                    " [Product].[All Products].[Drink].[Alcoholic Beverages].[Beer and Wine].[Beer].[Portsmouth].[Portsmouth Imported Beer],",
+                    " [Measures].[Foo])"}),
+                fold(new String[] {
+                    "Axis #0:",
+                    "{[Time].[1997].[Q4].[12], [Product].[All Products].[Drink].[Alcoholic Beverages].[Beer and Wine].[Beer].[Portsmouth].[Portsmouth Imported Beer], [Measures].[Foo]}",
+                    "Axis #1:",
+                    "{[Store].[All Stores].[USA].[WA].[Bellingham]}",
+                    "{[Store].[All Stores].[USA].[WA].[Bremerton]}",
+                    "{[Store].[All Stores].[USA].[WA].[Seattle]}",
+                    "{[Store].[All Stores].[USA].[WA].[Spokane]}",
+                    "{[Store].[All Stores].[USA].[WA].[Tacoma]}",
+                    "{[Store].[All Stores].[USA].[WA].[Walla Walla]}",
+                    "{[Store].[All Stores].[USA].[WA].[Yakima]}",
+                    "Row #0: (null)",
+                    "Row #0: (null)",
+                    "Row #0: 0.5",
+                    "Row #0: (null)",
+                    "Row #0: |0.1|style=red",
+                    "Row #0: (null)",
+                    "Row #0: |0.2|style=red",
+                    ""}));
+    }
+
     /**
      * Tests that calculated members defined in the schema can have brackets in
      * their names. (Bug 1251683.)