MONDRIAN: Fixes some issues with the Greenplum dialect and the test s…

…uite when running it over Greenplum. [git-p4: depot-paths = "//open/mondrian/": change = 14667]
pentaho · Oct 5, 2011 · d8b2cbd · d8b2cbd
1 parent bc58c52
commit d8b2cbd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/main/mondrian/rolap/SqlMemberSource.java b/src/main/mondrian/rolap/SqlMemberSource.java
@@ -638,7 +638,7 @@ Pair<String, List<SqlStatement.Type>> makeChildMemberSql(
                 hierarchy.addToFrom(sqlQuery, exp);
             }
             final String s = exp.getExpression(sqlQuery);
-            String alias = sqlQuery.addSelect(s, null, null);
+            String alias = sqlQuery.addSelect(s, null);
             // Some dialects allow us to eliminate properties from the
             // group by that are functionally dependent on the level value
             if (!sqlQuery.getDialect().allowsSelectNotInGroupBy()

diff --git a/src/main/mondrian/spi/impl/GreenplumDialect.java b/src/main/mondrian/spi/impl/GreenplumDialect.java
@@ -54,14 +54,22 @@ public boolean supportsGroupingSets() {
         return true;
     }
 
-    public boolean allowsCountDistinct() {
+    public boolean requiresGroupByAlias() {
+        return true;
+    }
+
+    public boolean requiresAliasForFromQuery() {
         return false;
     }
 
-    public boolean allowsFromQuery() {
+    public boolean allowsCountDistinct() {
         return true;
     }
 
+    public boolean allowsFromQuery() {
+        return false;
+    }
+
     public DatabaseProduct getDatabaseProduct() {
         return DatabaseProduct.GREENPLUM;
     }

diff --git a/testsrc/main/mondrian/rolap/BatchTestCase.java b/testsrc/main/mondrian/rolap/BatchTestCase.java
@@ -498,6 +498,8 @@ protected String dialectize(Dialect.DatabaseProduct d, String sql) {
         switch (d) {
         case ORACLE:
             return sql.replaceAll(" =as= ", " ");
+        case GREENPLUM:
+        case POSTGRESQL:
         case TERADATA:
             return sql.replaceAll(" =as= ", " as ");
         case DERBY:

diff --git a/testsrc/main/mondrian/rolap/FastBatchingCellReaderTest.java b/testsrc/main/mondrian/rolap/FastBatchingCellReaderTest.java
@@ -167,6 +167,7 @@ Dialect getDialect() {
         case DB2:
         case DB2_AS400:
         case DB2_OLD_AS400:
+        case GREENPLUM:
             assertTrue(fbcr.doesDBSupportGroupingSets());
             break;
         default:
@@ -1206,6 +1207,8 @@ public void testLoadDistinctSqlMeasure() {
         case NETEZZA:
             // Netezza gives an "ERROR:  Correlated Subplan expressions not
             // supported"
+        case GREENPLUM:
+            // Greenplum says 'Does not support yet that query'
             return;
         }