Skip to content

ESB-1223 Fixed common search returning multiple values in case of join #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ffalqui wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

ESB-1223 Fixed common search returning multiple values in case of join #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c28afd0
Fixed common search returning multiple values in case of join
eliamezzano Jul 31, 2026
6129aca
Merge pull request #356 from ahew/RLT-0002-fix-count-search
ffalqui Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...va/com/agiletec/plugins/jacms/aps/system/services/content/AbstractContentSearcherDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,9 @@ protected String createQueryString(EntitySearchFilter[] filters, String[] groups
if (!isCount) {
boolean ordered = this.appendOrderQueryBlocks(filters, query, false);
this.appendLimitQueryBlock(filters, query);
}
} else {
this.closeMasterCountQueryBlock(query);
}
//System.out.println("********** " + query.toString());
return query.toString();
}
Expand Down
2 changes: 2 additions & 0 deletions ...in/src/main/java/com/agiletec/plugins/jacms/aps/system/services/resource/ResourceDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,8 @@ private String createQueryString(FieldSearchFilter[] filters, List<String> categ
if (!isCount) {
super.appendOrderQueryBlocks(filters, query, false);
this.appendLimitQueryBlock(filters, query);
} else {
this.closeMasterCountQueryBlock(query);
}
return query.toString();
}
Expand Down
4 changes: 3 additions & 1 deletion ...om/agiletec/plugins/jpcontentworkflow/aps/system/services/content/ContentSearcherDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,9 @@ private String createQueryString(List<WorkflowSearchFilter> workflowFilters,
if (!isCount) {
appendOrderQueryBlocks(filters, query, false);
this.appendLimitQueryBlock(filters, query);
}
} else {
this.closeMasterCountQueryBlock(query);
}
return query.toString();
}

Expand Down
9 changes: 8 additions & 1 deletion engine/src/main/java/com/agiletec/aps/system/common/AbstractSearcherDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ protected String createQueryString(FieldSearchFilter[] filters, boolean isCount,
if (!isCount) {
boolean ordered = appendOrderQueryBlocks(filters, query, false);
this.appendLimitQueryBlock(filters, query);
} else {
this.closeMasterCountQueryBlock(query);
}
return query.toString();
}
Expand All @@ -247,11 +249,16 @@ protected StringBuffer createBaseQueryBlock(FieldSearchFilter[] filters, boolean

protected StringBuffer createMasterCountQueryBlock() {
String masterTableName = this.getMasterTableName();
StringBuffer query = new StringBuffer("SELECT COUNT(*)");
StringBuffer query = new StringBuffer("SELECT COUNT(*) FROM ( SELECT DISTINCT ");
query.append(masterTableName).append(".").append(this.getMasterTableIdFieldName());
query.append(" FROM ").append(masterTableName).append(" ");
return query;
}

protected void closeMasterCountQueryBlock(StringBuffer query) {
query.append(") counter");
}

private StringBuffer createMasterSelectQueryBlock(FieldSearchFilter[] filters, boolean selectAll) {
String masterTableName = this.getMasterTableName();
StringBuffer query = new StringBuffer("SELECT ").append(masterTableName).append(".");
Expand Down
2 changes: 2 additions & 0 deletions engine/src/main/java/com/agiletec/aps/system/common/entity/AbstractEntitySearcherDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ protected String createQueryString(EntitySearchFilter[] filters, boolean isCount
if (!isCount) {
boolean ordered = this.appendOrderQueryBlocks(filters, query, false);
this.appendLimitQueryBlock(filters, query);
} else {
this.closeMasterCountQueryBlock(query);
}
return query.toString();
}
Expand Down
Loading