modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 15a53e58c10ba129ce0dd5b569aea1944de6836a
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Apr 27 16:06:30 2011 -0400
[BZ 699842 - ORA-00907: missing right parenthesis]
This is actually a fix to workaround HHH-3096 where hibernate generates
invalid SQL for "Select Count(entity)" if entity has a composite key.
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
index 9b8c2ec..4bf2bae 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
@@ -306,13 +306,13 @@ public final class CriteriaQueryGenerator {
return EnumType.STRING; // catch-all
}
- // for testing purposes only, should use getQuery(EntityManager) or
getCountQuery(EntityManager) instead
public String getQueryString(boolean countQuery) {
StringBuilder results = new StringBuilder();
results.append("SELECT ");
if (countQuery) {
if (groupByClause == null) { // non-grouped method
-
results.append("COUNT(").append(alias).append(")").append(NL);
+ // use count(*) instead of count(alias) due to
https://bugzilla.redhat.com/show_bug.cgi?id=699842
+ results.append("COUNT(*)").append(NL);
} else {
// gets the count of the number of aggregate/grouped rows
// NOTE: this only works when the groupBy is a single element, as opposed
to a list of elements