modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java
| 4 ++--
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 84f48a740704b323b7e30b4b52f40221227f489a
Author: Joseph Marques <joseph(a)redhat.com>
Date: Tue Jan 4 13:57:26 2011 -0500
make sure CriteriaQueryGenerator and SearchTranslationFactory are using the same alias
generation scheme
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java
index c31f069..b8e086f 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java
@@ -62,11 +62,11 @@ public class SearchTranslationManager {
private Subject subject;
- public SearchTranslationManager(Subject subject, SearchSubsystem context) {
+ public SearchTranslationManager(String alias, Subject subject, SearchSubsystem
context) {
this.subject = subject;
this.context = context;
this.entity = this.context.getEntityClass().getSimpleName();
- this.alias = this.entity.toLowerCase();
+ this.alias = alias;
}
public void setExpression(String expression) {
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 27d9dcd..5547731 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
@@ -606,8 +606,8 @@ public final class CriteriaQueryGenerator {
try {
Class<?> entityClass = criteria.getPersistentClass();
- SearchTranslationManager searchManager = new
SearchTranslationManager(subject, SearchSubsystem
- .get(entityClass));
+ SearchTranslationManager searchManager = new
SearchTranslationManager(criteria.getAlias(), subject,
+ SearchSubsystem.get(entityClass));
searchManager.setExpression(searchExpression);
// translate first, if there was an error we won't add the dangling
'AND' to the where clause
Show replies by date