Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv32011
Modified Files:
BasicQuery.java
Log Message:
MMB-1732
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation
See also: http://www.mmbase.org/jira/browse/MMB-1732
Index: BasicQuery.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/BasicQuery.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- BasicQuery.java 6 Nov 2008 13:46:19 -0000 1.74
+++ BasicQuery.java 25 Nov 2008 13:22:02 -0000 1.75
@@ -28,7 +28,7 @@
* [EMAIL PROTECTED] #BasicQuery(Cloud, BasicSearchQuery)}.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicQuery.java,v 1.74 2008/11/06 13:46:19 michiel Exp $
+ * @version $Id: BasicQuery.java,v 1.75 2008/11/25 13:22:02 michiel Exp $
* @since MMBase-1.7
* @see org.mmbase.storage.search.implementation.BasicSearchQuery
*/
@@ -467,11 +467,10 @@
}
-
- public Query setDistinct(boolean distinct) {
- if (used) throw new BridgeException("Query was used already");
- query.setDistinct(distinct);
- if (distinct) { // in that case, make sure only the 'explicitely'
added fields remain.
+ /**
+ * @since MMBase-1.9.1
+ */
+ public void removeImplicitFields() {
query.removeFields();
implicitFields.clear();
Iterator<StepField> i = explicitFields.iterator();
@@ -480,6 +479,13 @@
query.addField(sf.getStep(), sf.getField());
}
}
+
+ public Query setDistinct(boolean distinct) {
+ if (used) throw new BridgeException("Query was used already");
+ query.setDistinct(distinct);
+ if (distinct) { // in that case, make sure only the 'explicitely'
added fields remain.
+ removeImplicitFields();
+ }
return this;
}
@@ -546,6 +552,10 @@
}
}
+ public FieldValueInQueryConstraint createConstraint(StepField f, Query q) {
+ return new BasicFieldValueInQueryConstraint(f, q);
+ }
+
public Constraint setInverse(Constraint c, boolean i) {
((BasicConstraint) c).setInverse(i);
return c;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
