antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Rewrite group-by select statements using select distinct

Browse source
This commit is contained in:
hns 2009-09-15 11:00:30 +00:00
parent b637cf7333
commit ee203ea4ad
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/helma/objectmodel/db/Relation.java
View file

@ -880,7 +880,13 @@ public final class Relation {
} }
String table = otherType.getTableName(); String table = otherType.getTableName();
String idfield = (groupby == null) ? otherType.getIDField() : groupby; String idfield;
if (groupby == null) {
idfield = otherType.getIDField();
} else {
idfield = groupby;
buf.append("DISTINCT ");
}
if (idfield.indexOf('(') == -1 && idfield.indexOf('.') == -1) { if (idfield.indexOf('(') == -1 && idfield.indexOf('.') == -1) {
buf.append(table).append('.'); buf.append(table).append('.');
@ -892,11 +898,15 @@ public final class Relation {
} }
public StringBuffer getCountSelect() { public StringBuffer getCountSelect() {
StringBuffer buf = new StringBuffer(); StringBuffer buf = new StringBuffer("SELECT ");
if (otherType.isOracle() && maxSize > 0) { if (otherType.isOracle() && maxSize > 0) {
buf.append("SELECT * FROM "); buf.append("* FROM ");
} else { } else {
buf.append("SELECT count(*) FROM "); if (groupby == null) {
buf.append("count(*) FROM ");
} else {
buf.append("count(DISTINCT ").append(groupby).append(") FROM ");
}
} }
buf.append(otherType.getTableName()); buf.append(otherType.getTableName());
@ -954,8 +964,6 @@ public final class Relation {
// add group and order clauses // add group and order clauses
if (groupby != null) { if (groupby != null) {
q.append(" GROUP BY ").append(groupby);
if (useOrder && (groupbyOrder != null)) { if (useOrder && (groupbyOrder != null)) {
q.append(" ORDER BY ").append(groupbyOrder); q.append(" ORDER BY ").append(groupbyOrder);
} }
@ -982,10 +990,6 @@ 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) { protected void appendAdditionalTables(StringBuffer q) {