Bug #162 - added methods to reset condition, including default

Author: yurybond

fflib/src/classes/fflib_QueryFactory.cls

@@ -338,6 +338,13 @@ public class fflib_QueryFactory { //No explicit sharing declaration - inherit fr
 		this.order.add(o);
 		return this;
 	}
+	/**
+	 * @param o an instance of {@link fflib_QueryFactory.Ordering} to remove all existing (for instance defaults) and be added to the query's ORDER BY clause.
+	**/
+	public fflib_QueryFactory setOrdering(Ordering o){
+		this.order = new List<Ordering>{ o };
+		return this;
+	}
 	/**
 	 * @returns the list of orderings that will be used as the query's ORDER BY clause. You may remove elements from the returned list, or otherwise mutate it, to remove previously added orderings.
 	**/
@@ -507,6 +514,23 @@ public class fflib_QueryFactory { //No explicit sharing declaration - inherit fr
 		);	
 		return this;
     }
+	/**
+	 * Remove existing ordering and set a field to be sorted on.  This may be a direct field or a field 
+	 * related through an object lookup or master-detail relationship.
+	 * Use the set to store unique field names, since we only want to sort
+	 * by the same field one time.  The sort expressions are stored in a list
+	 * so that they are applied to the SOQL in the same order that they
+	 * were added in. 
+	 * @param fieldName The string value of the field to be sorted on
+	 * @param SortOrder the direction to be sorted on (ASCENDING or DESCENDING)
+	 * @param nullsLast whether to sort null values last (NULLS LAST keyword included).
+	**/  
+    public fflib_QueryFactory setOrdering(String fieldName, SortOrder direction, Boolean nullsLast){
+		order = new List<Ordering> {
+			new Ordering(getFieldToken(fieldName), direction, nullsLast)
+		};	
+		return this;
+    }
 
      /**
 	 * Add a field to be sorted on.  This may be a direct field or a field 
@@ -526,6 +550,24 @@ public class fflib_QueryFactory { //No explicit sharing declaration - inherit fr
 		return this;
     }
 
+     /**
+	 * Remove existing ordering and set a field to be sorted on.  This may be a direct field or a field 
+	 * related through an object lookup or master-detail relationship.
+	 * Use the set to store unique field names, since we only want to sort
+	 * by the same field one time.  The sort expressions are stored in a list
+	 * so that they are applied to the SOQL in the same order that they
+	 * were added in. 
+	 * @param field The SObjectfield to sort.  This can only be a direct reference.
+	 * @param SortOrder the direction to be sorted on (ASCENDING or DESCENDING)
+	 * @param nullsLast whether to sort null values last (NULLS LAST keyword included).
+	**/
+    public fflib_QueryFactory setOrdering(SObjectField field, SortOrder direction, Boolean nullsLast){
+		order = new List<Ordering> {
+			new Ordering(new QueryField(field), direction, nullsLast)
+		};	
+		return this;
+    }
+
     /**
 	 * Add a field to be sorted on.  This may be a direct field or a field 
 	 * related through an object lookup or master-detail relationship.
@@ -545,6 +587,25 @@ public class fflib_QueryFactory { //No explicit sharing declaration - inherit fr
 		return this;
     }
 
+    /**
+	 * Remove existing ordering and set a field to be sorted on.  This may be a direct field or a field 
+	 * related through an object lookup or master-detail relationship.
+	 * Use the set to store unique field names, since we only want to sort
+	 * by the same field one time.  The sort expressions are stored in a list
+	 * so that they are applied to the SOQL in the same order that they
+	 * were added in. 
+	 * The "NULLS FIRST" keywords will be included by default.  If "NULLS LAST" 
+	 * is required, use one of the overloaded addOrdering methods which include this parameter.
+	 * @param fieldName The string value of the field to be sorted on
+	 * @param SortOrder the direction to be sorted on (ASCENDING or DESCENDING)
+	**/  
+    public fflib_QueryFactory setOrdering(String fieldName, SortOrder direction){
+		order = new List<Ordering> {
+			new Ordering(getFieldToken(fieldName), direction)
+		};	
+		return this;
+    }
+
      /**
 	 * Add a field to be sorted on.  This may be a direct field or a field 
 	 * related through an object lookup or master-detail relationship.
@@ -564,6 +625,25 @@ public class fflib_QueryFactory { //No explicit sharing declaration - inherit fr
 		return this;
     }
 
+     /**
+	 * Remove existing ordering and set a field to be sorted on.  This may be a direct field or a field 
+	 * related through an object lookup or master-detail relationship.
+	 * Use the set to store unique field names, since we only want to sort
+	 * by the same field one time.  The sort expressions are stored in a list
+	 * so that they are applied to the SOQL in the same order that they
+	 * were added in. 
+	 * The "NULLS FIRST" keywords will be included by default.  If "NULLS LAST" 
+	 * is required, use one of the overloaded addOrdering methods which include this parameter.
+	 * @param field The SObjectfield to sort.  This can only be a direct reference.
+	 * @param SortOrder the direction to be sorted on (ASCENDING or DESCENDING)
+	**/
+    public fflib_QueryFactory setOrdering(SObjectField field, SortOrder direction){
+		order = new List<Ordering> {
+			new Ordering(new QueryField(field), direction)
+		};	
+		return this;
+    }
+
 	/**
 	 * Convert the values provided to this instance into a full SOQL string for use with Database.query
 	 * Check to see if subqueries queries need to be added after the field list.