MONDRIAN

   Added additional accessors for inner class (for debugging) and
   extended column lookup to include columnName.

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

src/main/mondrian/rolap/RolapStar.java

@@ -1378,6 +1378,8 @@ public Column lookupColumn(String columnName) {
                     if (columnExpr.name.equals(columnName)) {
                         return column;
                     }
+                } else if (column.getName().equals(columnName)) {
+                    return column;
                 }
             }
             return null;
@@ -1938,9 +1940,15 @@ public static class Condition {
         public MondrianDef.Expression getLeft() {
             return left;
         }
+        public String getLeft(final SqlQuery query) {
+            return this.left.getExpression(query);
+        }
         public MondrianDef.Expression getRight() {
             return right;
         }
+        public String getRight(final SqlQuery query) {
+            return this.right.getExpression(query);
+        }
         public String toString(SqlQuery query) {
             return left.getExpression(query) + " = " + right.getExpression(query);
         }