Additional updates missed in first sync

Author: jamessimone

force-app/dml/DMLTest.cls

@@ -99,7 +99,7 @@ private class DMLTest {
     List<Account> accounts = new List<Account>();
     List<Contact> contacts = new List<Contact>();
 
-    for (Integer i = 0; i < dml.MAX_DML_CHUNKING; i++) {
+    for (Integer i = 0; i < DML.MAX_DML_CHUNKING; i++) {
       Account a = new Account(Name = '' + i);
       accounts.add(a);
       records.add(a);
@@ -162,6 +162,17 @@ private class DMLTest {
     Assert.areEqual(true, secondResult.isSuccess());
   }
 
+  @IsTest
+  static void shouldPassNonNullValueOnOperatonThatDoesNotUseDmlOptions() {
+    Database.DMLOptions dmlOptions = new Database.DMLOptions();
+    dmlOptions.AllowFieldTruncation = true;
+    Contact contact = new Contact(LastName = 'Test2');
+
+    new DML().setOptions(dmlOptions).doUpsert(contact);
+
+    Assert.isNotNull(contact.Id);
+  }
+
   @IsTest
   static void upsertWithDefaultSetOptionsWorks() {
     // on some code paths, like insert, OptAllOrNone not being initialized on Database.DMLOptions is fine

force-app/factory/RepoFactoryMock.cls

@@ -190,13 +190,6 @@ public class RepoFactoryMock extends RepoFactory {
       }
       fields.addAll(this.groupedByFieldNames);
 
-      Map<String, RepositorySortOrder> localFieldToSortOrders = FieldToSortOrders.get(this.repoType);
-      if (localFieldToSortOrders == null) {
-        localFieldToSortOrders = new Map<String, RepositorySortOrder>();
-        FieldToSortOrders.put(this.repoType, localFieldToSortOrders);
-      }
-      localFieldToSortOrders.putAll(this.fieldToSortOrder);
-
       this.trackFieldToSortOrder();
 
       return this.aggRecords;

force-app/repository/Query.cls

@@ -330,7 +330,7 @@ public virtual class Query {
       BIND_VAR_NUMBER++;
       this.bindVars.put(this.predicateKey, predicate);
     }
-    return ':' + predicateKey;
+    return ':' + this.predicateKey;
   }
 
   private String getSoslPredicate(Object predicate) {

force-app/repository/QueryTest.cls

@@ -241,4 +241,13 @@ private class QueryTest {
 
     Assert.areEqual('Id IN (\'' + String.join(fakeAccountIds, '\',\'') + '\')', query.toSoslString());
   }
+
+  @IsTest
+  static void itDoesNotAddEmptyParenthesisToTheEnd() {
+    Query query = Query.andQuery(
+      new List<Query>{ Query.equals(Account.Id, new List<Id>()), Query.orQuery(new List<Query>()) }
+    );
+
+    Assert.areEqual('(Id = :bindVar0)', query.toString());
+  }
 }

force-app/repository/RepositoryTest.cls

@@ -46,6 +46,18 @@ private class RepositoryTest {
     Assert.areEqual(1, Limits.getQueries());
   }
 
+  @IsTest
+  static void itShouldSearchWithEmptyCollections() {
+    Query listQuery = Query.equals(ContactPointAddress.Id, new List<Id>());
+
+    IRepository repo = new ContactPointAddressRepo();
+
+    List<List<SObject>> results = repo.getSosl('aaa', listQuery);
+    Assert.areEqual(1, results.size());
+    Assert.areEqual(0, results.get(0).size());
+    Assert.areEqual(1, Limits.getSoslQueries());
+  }
+
   @IsTest
   static void itShouldRespectOrStatementsInQueries() {
     ContactPointAddress cpa = new ContactPointAddress(Name = 'Test Or', PreferenceRank = 1);