Added ability to use subqueries with Query.subquery() in where clauses

example-app/ExampleFactory.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

example-app/ExampleRepoFactory.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

example-app/handlers/AccountHandler.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

example-app/handlers/AccountHandlerTests.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

example-app/handlers/ExampleSObjectTest.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

example-app/triggers/TriggerHandler.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

example-app/triggers/TriggerHandler_Tests.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/dml/DML.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/dml/DMLMock.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/dml/DMLTests.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/dml/IDML.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/factory/Factory.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/factory/RepoFactory.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/factory/RepoFactoryMock.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/AggregateRecord.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/AggregateRepository.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/AggregateRepositoryTests.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/Aggregation.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/AggregationTests.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/DateFunction.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/FieldLevelHistory.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/FieldLevelHistoryRepo.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/FieldLevelHistoryRepoTests.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/IAggregateRepository.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/IHistoryRepository.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/IRepository.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/Query.cls

@@ -29,6 +29,19 @@ public virtual class Query {
     return new ParentQuery(parentFields, this);
   }
 
+  public static Query subquery(Schema.SObjectField field, Schema.SObjectField innerMatchingField, Query subcondition) {
+    return subquery(field, innerMatchingField.getDescribe().getSObjectType(), innerMatchingField, subcondition);
+  }
+
+  public static Query subquery(
+    Schema.SObjectField field,
+    Schema.SObjectType objectType,
+    Schema.SObjectField innerMatchingField,
+    Query subcondition
+  ) {
+    return new SubQuery(field, objectType, innerMatchingField, subcondition);
+  }
+
   public static Query equals(SObjectField field, Object predicate) {
     return new Query(field, Operator.EQUALS, predicate);
   }
@@ -80,6 +93,37 @@ public virtual class Query {
     return new AndQuery(innerQueries);
   }
 
+  private class SubQuery extends Query {
+    private final Schema.SObjectField field;
+    private final Schema.SObjectType objectType;
+    private final Schema.SObjectField innerMatchingField;
+    private final Query subcondition;
+
+    public SubQuery(
+      Schema.SObjectField field,
+      Schema.SObjectType objectType,
+      Schema.SObjectField innerMatchingField,
+      Query subcondition
+    ) {
+      this.field = field;
+      this.objectType = objectType;
+      this.innerMatchingField = innerMatchingField;
+      this.subcondition = subcondition;
+    }
+
+    public override String toString() {
+      String whereClause = ' WHERE ' + this.subcondition.toString();
+      this.bindVars.putAll(this.subcondition.getBindVars());
+      return this.field.getDescribe().getName() +
+        ' IN (SELECT ' +
+        this.innerMatchingField +
+        ' FROM ' +
+        this.objectType +
+        whereClause +
+        ')';
+    }
+  }
+
   private abstract class DelimitedQuery extends Query {
     private final List<Query> queries;
 

force-app/repository/Query.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/QueryTests.cls

@@ -163,4 +163,26 @@ private class QueryTests {
     System.assertEquals('AccountId != :bindVar0', notEquals.toString());
     System.assertEquals(new Set<Id>(), notEquals.getBindVars().get('bindVar0'));
   }
+
+  @IsTest
+  static void it_allows_subqueries() {
+    Query subquery = Query.subquery(
+      Contact.AccountId,
+      Account.Id,
+      Query.andQuery(
+        new List<Query>{
+          Query.equals(Account.AnnualRevenue, 50),
+          Query.equals(Account.Industry, 'Tech'),
+          Query.orQuery(
+            new List<Query>{ Query.equals(Account.NumberOfEmployees, 1), Query.equals(Account.Site, 'web3') }
+          )
+        }
+      )
+    );
+
+    Assert.areEqual(
+      'AccountId IN (SELECT Id FROM Account WHERE (AnnualRevenue = :bindVar0 AND Industry = :bindVar1 AND (NumberOfEmployees = :bindVar2 OR Site = :bindVar3)))',
+      subquery.toString()
+    );
+  }
 }

force-app/repository/QueryTests.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/Repository.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/RepositorySortOrder.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/repository/RepositoryTests.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>

force-app/utils/TestingUtils.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>58.0</apiVersion>
+    <apiVersion>60.0</apiVersion>
     <status>Active</status>
 </ApexClass>