dynamic sort

Signed-off-by: Piotr PG Gajek <[email protected]>

Author: pgajek2

force-app/main/default/classes/main/standard-soql/SOQL.cls

@@ -106,6 +106,7 @@ public virtual inherited sharing class SOQL implements Queryable {
         Queryable orderBy(String field, String direction);
         Queryable orderBy(String relationshipName, SObjectField field);
         Queryable sortDesc();
+        Queryable sort(String direction);
         Queryable nullsLast();
         // LIMIT
         Queryable setLimit(Integer amount);
@@ -169,12 +170,12 @@ public virtual inherited sharing class SOQL implements Queryable {
         // WHERE
         SubQuery whereAre(FilterGroup filterGroup);
         SubQuery whereAre(Filter filter);
-        //ORDER BY
+        // ORDER BY
         SubQuery orderBy(SObjectField field);
         SubQuery orderBy(String field);
-        SubQuery orderBy(String field, String direction);
         SubQuery orderBy(String relationshipName, SObjectField field);
         SubQuery sortDesc();
+        SubQuery sort(String direction);
         SubQuery nullsLast();
         // LIMIT
         SubQuery setLimit(Integer amount);
@@ -724,6 +725,11 @@ public virtual inherited sharing class SOQL implements Queryable {
         return this;
     }
 
+    public Queryable sort(String direction) {
+        builder.latestOrderBy.sortingOrder(direction);
+        return this;
+    }
+
     public SOQL nullsLast() {
         builder.latestOrderBy.nullsLast();
         return this;
@@ -1254,13 +1260,13 @@ public virtual inherited sharing class SOQL implements Queryable {
             return this;
         }
 
-        public SubQuery orderBy(String field, String direction) {
-            builder.orderBys.newOrderBy().with(field).sortingOrder(direction);
+        public SubQuery sortDesc() {
+            builder.latestOrderBy.sortDesc();
             return this;
         }
 
-        public SubQuery sortDesc() {
-            builder.latestOrderBy.sortDesc();
+        public SubQuery sort(String direction) {
+            builder.latestOrderBy.sortingOrder(direction);
             return this;
         }
 
@@ -2095,11 +2101,11 @@ public virtual inherited sharing class SOQL implements Queryable {
         }
 
         public void sortingOrder(String direction) {
-            sortingOrder = direction;
+            this.sortingOrder = direction;
         }
 
         public void nullsLast() {
-            nullsOrder = 'LAST';
+            this.nullsOrder = 'LAST';
         }
 
         public override String toString() {

force-app/main/default/classes/main/standard-soql/SOQL_Test.cls

@@ -877,7 +877,8 @@ private class SOQL_Test {
             .with(Account.Name)
             .with(SOQL.SubQuery.of('Contacts')
                 .with(Contact.Id, Contact.Name)
-                .orderBy('Name', 'ASC')
+                .orderBy('Name')
+                .sort('ASC')
                 .nullsLast()
             ).toString();
 
@@ -2850,6 +2851,18 @@ private class SOQL_Test {
         Assert.areEqual('SELECT Id FROM Account ORDER BY Industry ASC NULLS FIRST', soql, 'The generated SOQL should match the expected one.');
     }
 
+    @IsTest
+    static void orderByDynamicWithSort() {
+        // Test
+        String soql = SOQL.of(Account.SObjectType)
+            .orderBy('Industry')
+            .sort('ASC')
+            .toString();
+
+        // Verify
+        Assert.areEqual('SELECT Id FROM Account ORDER BY Industry ASC NULLS FIRST', soql, 'The generated SOQL should match the expected one.');
+    }
+
     @IsTest
     static void orderBy() {
         // Test
@@ -2873,7 +2886,6 @@ private class SOQL_Test {
         Assert.areEqual('SELECT Id FROM Contact ORDER BY Account.Name ASC NULLS FIRST', soql, 'The generated SOQL should match the expected one.');
     }
 
-
     @IsTest
     static void setLimit() {
         // Test

website/docs/api/standard-soql/soql-sub.md

@@ -46,9 +46,9 @@ The following are methods for `SubQuery`.
 
 - [`orderBy(SObjectField field)`](#order-by)
 - [`orderBy(String field)`](#order-by-string-fields)
-- [`orderBy(String field, String direction)`](#orderby-string-fields-with-direction)
 - [`orderBy(String relationshipName, SObjectField field)`](#orderby-related)
 - [`sortDesc()`](#sortdesc)
+- [`sort(String direction)`](#sort)
 - [`nullsLast()`](#nullslast)
 
 [**LIMIT**](#limit)
@@ -325,12 +325,14 @@ SOQL.of(Account.SObjectType)
     .toList();
 ```
 
-### orderBy string field with direction
+### orderBy related
+
+Order SOQL query by parent field.
 
 **Signature**
 
 ```apex
-SubQuery orderBy(String field, String direction)
+SubQuery orderBy(String relationshipName, SObjectField field)
 ```
 
 **Example**
@@ -339,25 +341,25 @@ SubQuery orderBy(String field, String direction)
 SELECT Id, (
     SELECT Id
     FROM Contacts
-    ORDER BY Name DESC
+    ORDER BY CreatedBy.Name
 ) FROM Account
 ```
 ```apex
 SOQL.of(Account.SObjectType)
     .with(SOQL.SubQuery.of('Contacts')
-        .orderBy('Name', 'DESC')
+        .orderBy('CreatedBy', User.Name)
     )
     .toList();
 ```
 
-### orderBy related
+### sortDesc
 
-Order SOQL query by parent field.
+Default order is ascending (`ASC`).
 
 **Signature**
 
 ```apex
-SubQuery orderBy(String relationshipName, SObjectField field)
+SubQuery sortDesc()
 ```
 
 **Example**
@@ -366,25 +368,24 @@ SubQuery orderBy(String relationshipName, SObjectField field)
 SELECT Id, (
     SELECT Id
     FROM Contacts
-    ORDER BY CreatedBy.Name
+    ORDER BY Name DESC
 ) FROM Account
 ```
 ```apex
 SOQL.of(Account.SObjectType)
     .with(SOQL.SubQuery.of('Contacts')
-        .orderBy('CreatedBy', User.Name)
+        .orderBy(Contact.Name)
+        .sortDesc()
     )
     .toList();
 ```
 
-### sortDesc
-
-Default order is ascending (`ASC`).
+### sort
 
 **Signature**
 
 ```apex
-SubQuery sortDesc()
+SubQuery sort(String direction)
 ```
 
 **Example**
@@ -399,8 +400,8 @@ SELECT Id, (
 ```apex
 SOQL.of(Account.SObjectType)
     .with(SOQL.SubQuery.of('Contacts')
-        .orderBy(Contact.Name)
-        .sortDesc()
+        .orderBy('Name')
+        .sort('DESC')
     )
     .toList();
 ```

website/docs/api/standard-soql/soql.md

@@ -130,6 +130,7 @@ The following are methods for using `SOQL`:
 - [`orderBy(String field, String direction)`](#order-by)
 - [`orderBy(String relationshipName, SObjectField field)`](#orderby-related)
 - [`sordDesc()`](#sortdesc)
+-  [`sort(String direction)`](#sort)
 - [`nullsLast()`](#nullslast)
 
 [**LIMIT**](#limit)
@@ -1674,6 +1675,31 @@ SOQL.of(Account.SObjectType)
     .toList();
 ```
 
+### sort
+
+
+### sort
+
+**Signature**
+
+```apex
+Queryable sort(String direction)
+```
+
+**Example**
+
+```sql
+SELECT Id
+FROM Account
+ORDER BY Industry ASC NULLS FIRST
+```
+```apex
+SOQL.of(Account.SObjectType)
+    .orderBy('Industry')
+    .sort('ASC')
+    .toList();
+```
+
 ### nullsLast
 
 By default, null values are sorted first (`NULLS FIRST`).