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

also groupby sub-relations inherit order from now on

Browse source
This commit is contained in:
hns 2001-01-09 21:36:02 +00:00
parent 01e4f2c9b3
commit 433fb5d580
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/helma/objectmodel/Relation.java
View file

@ -246,7 +246,9 @@ public class Relation {
throw new RuntimeException ("getGroupbyPropertyRelation called on non-group-by relation"); throw new RuntimeException ("getGroupbyPropertyRelation called on non-group-by relation");
if (filter != null) if (filter != null)
return filter; return filter;
return new Relation (other, localField, remoteField, direction, true); Relation vr = new Relation (other, localField, remoteField, direction, true);
vr.order = order;
return vr;
} }
/** /**
@ -255,7 +257,9 @@ public class Relation {
public Relation getGroupbyPropertyRelation () { public Relation getGroupbyPropertyRelation () {
if (groupby == null) if (groupby == null)
throw new RuntimeException ("getGroupbyPropertyRelation called on non-group-by relation"); throw new RuntimeException ("getGroupbyPropertyRelation called on non-group-by relation");
return new Relation (other, localField, remoteField, direction, true); Relation vr = new Relation (other, localField, remoteField, direction, true);
vr.order = order;
return vr;
} }