From b89989fa205d67588dae25716712703142d70017 Mon Sep 17 00:00:00 2001 From: hns Date: Mon, 14 Sep 2009 19:56:51 +0000 Subject: [PATCH] Fix countNodes() for grouped collections. --- src/helma/objectmodel/db/Relation.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/helma/objectmodel/db/Relation.java b/src/helma/objectmodel/db/Relation.java index 329d2ca1..c1ef65a5 100644 --- a/src/helma/objectmodel/db/Relation.java +++ b/src/helma/objectmodel/db/Relation.java @@ -20,7 +20,6 @@ import helma.framework.core.Application; import helma.objectmodel.INode; import helma.objectmodel.IProperty; import helma.util.StringUtils; -import helma.util.ResourceProperties; import java.sql.SQLException; import java.util.HashMap; @@ -982,6 +981,11 @@ public final class Relation { } } } + + if (isCount && groupby != null) { + q.insert(0, "SELECT count(*) FROM ("); + q.append(") as NESTED_COUNT_QUERY"); + } } protected void appendAdditionalTables(StringBuffer q) {