MONDRIAN

   Fix bug that using aggregate table with distinct count generated SQL
   with group-by clause.

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

src/main/mondrian/rolap/agg/AggQuerySpec.java

@@ -167,7 +167,10 @@ protected void distinctGenerateSQL(final SqlQuery outerSqlQuery) {
             final String alias = "d" + i;
             innerSqlQuery.addSelect(expr, alias);
             outerSqlQuery.addSelect(alias);
-            outerSqlQuery.addGroupBy(alias);
+
+            if (! hasDistinct()) {
+                outerSqlQuery.addGroupBy(alias);
+            }
         }
         // add measures
         // this can also add non-shared local dimension columns, which are 
@@ -202,7 +205,9 @@ protected void nonDistinctGenerateSQL(final SqlQuery sqlQuery) {
                 sqlQuery.addSelect(expr, getColumnAlias(i));
             }
 
-            if (isAggregate()) {
+            // only add a group-by clause if we are NOT doing
+            // a distinct count measure
+            if (! hasDistinct()) {
                 sqlQuery.addGroupBy(expr);
             }
         }