MONDRIAN: Integrate change 14063 - PSW-99 - The validator was casting…

… the fact table as a Table object which caused problems with fact tables based on a view. [git-p4: depot-paths = "//open/mondrian/": change = 14064]
pentaho · Feb 2, 2011 · 19987ab · 19987ab
1 parent d51380e
commit 19987ab
Showing 1 changed file with 43 additions and 41 deletions.
diff --git a/src/main/mondrian/gui/validate/ValidationUtils.java b/src/main/mondrian/gui/validate/ValidationUtils.java
@@ -407,48 +407,50 @@ && isEmpty(((MondrianGuiDef.View) cubeVal.fact).alias)))
                 } else if (cube != null && cube.fact != null) {
                     // Database validity check, if database connection is
                     // successful
-                    final MondrianGuiDef.Table factTable =
-                        (MondrianGuiDef.Table) cube.fact;
-                    if (jdbcValidator.isInitialized()) {
-                        String column = measure.column;
-                        if (jdbcValidator.isColExists(
-                            factTable.schema,
-                            factTable.name,
-                            column))
-                        {
-                            // Check for aggregator type only if column exists
-                            // in table.
-
-                            // Check if aggregator selected is valid on the data
-                            // type of the column selected.
-                            int colType =
-                                jdbcValidator.getColumnDataType(
-                                    factTable.schema,
-                                    factTable.name,
-                                    measure.column);
-                            // Coltype of 2, 4,5, 7, 8, -5 is numeric types
-                            // whereas 1, 12 are char varchar string
-                            // and 91 is date type.
-                            // Types are enumerated in java.sql.Types.
-                            int agIndex = -1;
-                            if ("sum".equals(
-                                measure.aggregator)
-                                || "avg".equals(
-                                    measure.aggregator))
-                            {
-                                // aggregator = sum or avg, column should be
-                                // numeric
-                                agIndex = 0;
-                            }
-                            if (!(agIndex == -1
-                                  || (colType >= 2 && colType <= 8)
-                                  || colType == -5))
+                    if (cube.fact instanceof MondrianGuiDef.Table) {
+                        final MondrianGuiDef.Table factTable =
+                            (MondrianGuiDef.Table) cube.fact;
+                        if (jdbcValidator.isInitialized()) {
+                            String column = measure.column;
+                            if (jdbcValidator.isColExists(
+                                factTable.schema,
+                                factTable.name,
+                                column))
                             {
-                                return messages.getFormattedString(
-                                    "schemaTreeCellRenderer.aggregatorNotValidForColumn.alert",
-                                    "Aggregator {0} is not valid for the data type of the column {1}",
-                                    measure.aggregator,
-                                    measure.column);
+                                // Check for aggregator type only if column
+                                // exists in table.
+
+                                // Check if aggregator selected is valid on
+                                // the data type of the column selected.
+                                int colType =
+                                    jdbcValidator.getColumnDataType(
+                                        factTable.schema,
+                                        factTable.name,
+                                        measure.column);
+                                // Coltype of 2, 4,5, 7, 8, -5 is numeric types
+                                // whereas 1, 12 are char varchar string
+                                // and 91 is date type.
+                                // Types are enumerated in java.sql.Types.
+                                int agIndex = -1;
+                                if ("sum".equals(
+                                    measure.aggregator)
+                                    || "avg".equals(
+                                        measure.aggregator))
+                                {
+                                    // aggregator = sum or avg, column should
+                                    // be numeric
+                                    agIndex = 0;
+                                }
+                                if (!(agIndex == -1
+                                    || (colType >= 2 && colType <= 8)
+                                    || colType == -5))
+                                {
+                                    return messages.getFormattedString(
+                                        "schemaTreeCellRenderer.aggregatorNotValidForColumn.alert",
+                                        "Aggregator {0} is not valid for the data type of the column {1}",
+                                        measure.aggregator,
+                                        measure.column);
+                                }
                             }
                         }
                     }