MONDRIAN: Fix bug which occurred when a calculated member was defined…

… against a cube which has spaces in its name; and add testcase.

[git-p4: depot-paths = "//open/mondrian/": change = 2998]

src/main/mondrian/rolap/RolapCube.java

@@ -122,16 +122,19 @@ class RolapCube extends CubeBase
     private Formula parseFormula(String formulaString,
         String memberUniqueName, ArrayList propNames, ArrayList propExprs)
     {
+        assert memberUniqueName.startsWith("[");
         RolapConnection conn = schema.getInternalConnection();
-        StringBuffer buf = new StringBuffer(
-            "WITH MEMBER " + memberUniqueName + " AS " + formulaString);
+        StringBuffer buf = new StringBuffer(256);
+        buf.append("WITH MEMBER ").append(memberUniqueName).append(" AS ")
+            .append(formulaString);
         assert propNames.size() == propExprs.size();
         for (int i = 0; i < propNames.size(); i++) {
             String name = (String) propNames.get(i);
             String expr = (String) propExprs.get(i);
             buf.append(", ").append(name).append(" = ").append(expr);
         }
-        buf.append(" SELECT FROM " + getUniqueName());
+        buf.append(" SELECT FROM ")
+            .append(Util.quoteMdxIdentifier(getUniqueName()));
         final String queryString = buf.toString();
         final Query queryExp;
         try {

testsrc/main/mondrian/olap/fun/FunctionTest.java

@@ -231,12 +231,10 @@ public void testAncestorWithHiddenParent() throws Exception {
     }
 
     public void testOrdinal() throws Exception {
-        Cell cell = executeExprRaw("[Sales Ragged]", "[Store].[All Stores].[Vatican].ordinal");
-
+        Cell cell = executeExprRaw("Sales Ragged", "[Store].[All Stores].[Vatican].ordinal");
         assertEquals("Vatican is at level 1.", 1, ((Number)cell.getValue()).intValue());
 
-        cell = executeExprRaw("[Sales Ragged]", "[Store].[All Stores].[USA].[Washington].ordinal");
-
+        cell = executeExprRaw("Sales Ragged", "[Store].[All Stores].[USA].[Washington].ordinal");
         assertEquals("Washington is at level 3.", 3, ((Number) cell.getValue()).intValue());
     }
 

testsrc/main/mondrian/test/FoodMartTestCase.java

@@ -263,9 +263,13 @@ public String executeExpr(String expression) {
      * @return Returns a {@link Cell} which is the result of the expression.
      */
     public Cell executeExprRaw(String cubeName, String expression) {
-        Result result = TestContext.instance().executeFoodMart("with member [Measures].[Foo] as '" +
-                expression +
-                "' select {[Measures].[Foo]} on columns from " + cubeName);
+        if (cubeName.indexOf(' ') >= 0) {
+            cubeName = Util.quoteMdxIdentifier(cubeName);
+        }
+        final String queryString = "with member [Measures].[Foo] as '" +
+            expression +
+            "' select {[Measures].[Foo]} on columns from " + cubeName;
+        Result result = TestContext.instance().executeFoodMart(queryString);
 
         return result.getCell(new int[]{0});
     }

testsrc/main/mondrian/test/TestCalculatedMembers.java

@@ -59,6 +59,21 @@ public void testCalculatedMemberInCubeViaApi() {
         }
     }
 
+    /**
+     * Tests a calculated member with spaces in its name against a virtual
+     * cube with spaces in its name.
+     */
+    public void testCalculatedMemberInCubeWithSpace() {
+        Cube salesCube = getSalesCube("Warehouse and Sales");
+        salesCube.createCalculatedMember(
+            "<CalculatedMember name='Profit With Spaces'" +
+            "  dimension='Measures'" +
+            "  formula='[Measures].[Store Sales]-[Measures].[Store Cost]'/>");
+
+        String s = executeExpr("Warehouse and Sales", "[Measures].[Profit With Spaces]");
+        Assert.assertEquals("339,610.90", s);
+    }
+
     public void testCalculatedMemberInCubeWithProps() {
         Cube salesCube = getSalesCube("Sales");
 
@@ -108,7 +123,6 @@ public void testCalculatedMemberInCubeWithProps() {
             }
         }
 
-
         // should fail if member property's expression is invalid
         try {
             salesCube.createCalculatedMember(