Various fixes

#1
15 - Done

#1
08 - Done
#1
07 - Done
#1
03 - Done (Upgraded to latest API)

rolluptool/src/classes/ApexClassesSelector.cls-meta.xml

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

rolluptool/src/classes/ApexTriggersSelector.cls-meta.xml

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

rolluptool/src/classes/AsyncApexJobsSelector.cls-meta.xml

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

rolluptool/src/classes/LREngine.cls

@@ -60,7 +60,7 @@ public class LREngine {
             for(sObject ct : Database.query(query))
                 currencyConversionMap.put((String)ct.get('IsoCode'), (Decimal)ct.get('ConversionRate'));
         }
-        return val * currencyConversionMap.get(iso);
+        return val!=null ? val * currencyConversionMap.get(iso) : 0;
     }
 
     /**
@@ -82,7 +82,7 @@ public class LREngine {
         }
         return rollUp(ctx, masterRecordIds);
     }
-    
+
     /**
         Key driver method that rolls up lookup fields based on the context. This is meant to be called from non trigger contexts like
         scheduled/batch apex, where we want to rollup on some master record ids.
@@ -93,6 +93,20 @@ public class LREngine {
                 because we want client or calling code to have this freedom to do some post processing and update when required.
     */
     public static Sobject[] rollUp(Context ctx,  Set<Id> masterIds) {
+        return rollUp(ctx, masterIds, false);
+    }
+
+    /**
+        Key driver method that rolls up lookup fields based on the context. This is meant to be called from non trigger contexts like
+        scheduled/batch apex, where we want to rollup on some master record ids.
+        
+        @param Context the complete context required to rollup
+        @param masterIds Master record IDs whose child records should be rolled up. 
+        @param validateOnly Checks the SOQL query is valid, throws an exception if not, returns null if valid
+        @returns Array of in memory master objects. These objects are not updated back to the database
+                because we want client or calling code to have this freedom to do some post processing and update when required.
+    */
+    public static Sobject[] rollUp(Context ctx,  Set<Id> masterIds, Boolean validateOnly) {
         // Clone this since we are about to modify it later
         masterIds = masterIds.clone();
         // K: Id of master record
@@ -141,6 +155,12 @@ public class LREngine {
         String soql = String.format(SOQL_TEMPLATE, new String[]{soqlProjection, detailTblName, whereClause, grpByFld});
         System.debug('SOQL is ' + soql);
 
+        // validate only?
+        if(validateOnly) {
+            Database.getQueryLocator(soql);
+            return null;
+        }
+
         // aggregated results 
         List<AggregateResult> results = Database.query(soql);
 

rolluptool/src/classes/LREngine.cls-meta.xml

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

rolluptool/src/classes/MetadataService.cls-meta.xml

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

rolluptool/src/classes/MetadataServiceTest.cls-meta.xml

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

rolluptool/src/classes/RollupCalculateController.cls-meta.xml

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

rolluptool/src/classes/RollupCalculateJob.cls-meta.xml

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

rolluptool/src/classes/RollupController.cls-meta.xml

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

rolluptool/src/classes/RollupControllerTest.cls-meta.xml

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

rolluptool/src/classes/RollupJob.cls-meta.xml

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

rolluptool/src/classes/RollupJobTest.cls-meta.xml

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

rolluptool/src/classes/RollupService.cls-meta.xml

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

rolluptool/src/classes/RollupServiceException.cls-meta.xml

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

rolluptool/src/classes/RollupServiceTest.cls

@@ -680,15 +680,13 @@ private with sharing class RollupServiceTest
 		// Sample various limits prior to an update
 		Integer beforeQueries = Limits.getQueries();
 		Integer beforeRows = Limits.getQueryRows();
-		Integer beforeDescribes = Limits.getFieldsDescribes();
 
 		// Update opportunities (no changes to the field being aggregted, thus no rollup processng)
 		update opps;
 
 		// Assert no further limits have been used since the field to aggregate on the detail has not changed
 		System.assertEquals(beforeQueries + 1, Limits.getQueries()); // Only tolerate a query for the Lookup definition
 		System.assertEquals(beforeRows + 1, Limits.getQueryRows()); // Only tolerate a row for the Lookup definition
-		System.assertEquals(beforeDescribes, Limits.getFieldsDescribes()); // Zero tolerance on field describes		
 	}
 
 	private testmethod static void testLimitsConsumedWithConditions()
@@ -762,24 +760,18 @@ private with sharing class RollupServiceTest
 
 		// One query on ApexTrigger (in the TestContext.isSupported method)
 		// One query on ApexTrigger (validation when inserting rollups)
+		// One query on Database.newQueryLocator (validation when insert rollup a)
 		// One query on Rollup object
 		// One query on Opportunity for rollup a
 		// One query on Opportunity for rollup b				
-		System.assertEquals(5, Limits.getQueries());	
+		System.assertEquals(6, Limits.getQueries());	
 
 		// One row for ApexTrigger (in the TestContext.isSupported method)		
 		// One row for ApexTrigger
 		// Two rows for Rollup object
 		// Two rows for Opportunity for rollup a
 		// Four rows for Opportunity for rollup b
 		System.assertEquals(10, Limits.getQueryRows());
-
-		// One for the statics at the top of the test
-		// One for the parent object validation on insert of lookup
-		// One for the child object validaiton on insert of lookup
-		// One for the lookup of the field type for the parent object during trigger
-		// One for the lookup of the field type for the child object during trigger
-		System.assertEquals(5, Limits.getFieldsDescribes());
 
 		// Assert rollup
 		Id accountId = account.Id;
@@ -795,16 +787,12 @@ private with sharing class RollupServiceTest
 		// + One query for the Account query above
 		// + One query on Rollup object
 		// + One query on Opportunity for rollup a
-		System.assertEquals(8, Limits.getQueries());	
+		System.assertEquals(9, Limits.getQueries());	
 
 		// + One query for the Account query above		
 		// + Two rows for Rollup object
 		// + Two rows for Opportunity for rollup a
 		System.assertEquals(15, Limits.getQueryRows());
-
-		// + One for the lookup of the field type for the parent object during trigger
-		// + One for the lookup of the field type for the child object during trigger
-		System.assertEquals(7, Limits.getFieldsDescribes());
 
 		// Assert rollup
 		accountResult = Database.query('select AnnualRevenue, NumberOfLocations__c from Account where Id = :accountId');
@@ -892,13 +880,6 @@ private with sharing class RollupServiceTest
 		// Two rows for Rollup object
 		// Four rows for Opportunity for rollup a and b
 		System.assertEquals(8, Limits.getQueryRows());
-
-		// One for the statics at the top of the test
-		// One for the parent object validation on insert of lookup
-		// One for the child object validaiton on insert of lookup
-		// One for the lookup of the field type for the parent object during trigger
-		// One for the lookup of the field type for the child object during trigger
-		System.assertEquals(5, Limits.getFieldsDescribes());
 
 		// Assert rollup
 		Id accountId = account.Id;
@@ -920,10 +901,6 @@ private with sharing class RollupServiceTest
 		// + Two rows for Rollup object
 		// + Four rows for Opportunity for rollup a and 
 		System.assertEquals(15, Limits.getQueryRows());
-
-		// + One for the lookup of the field type for the parent object during trigger
-		// + One for the lookup of the field type for the child object during trigger
-		System.assertEquals(7, Limits.getFieldsDescribes());
 
 		// Assert rollup
 		accountResult = Database.query('select AnnualRevenue, NumberOfLocations__c from Account where Id = :accountId');

rolluptool/src/classes/RollupServiceTest.cls-meta.xml

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

rolluptool/src/classes/RollupServiceTest2.cls-meta.xml

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

rolluptool/src/classes/RollupServiceTest3.cls-meta.xml

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

rolluptool/src/classes/RollupSummaries.cls

@@ -77,13 +77,8 @@ public with sharing class RollupSummaries extends SObjectDomain
 	 **/ 
 	public override void onValidate()
 	{
-		// Query for any related Apex triggers
+		// Cache Apex Describes and calculate child object tigger names
 		Set<String> rollupTriggerNames = new Set<String>();
-		for(LookupRollupSummary__c lookupRollupSummary : (List<LookupRollupSummary__c>) Records)
-			rollupTriggerNames.add(makeTriggerName(lookupRollupSummary));
-		Map<String, ApexTrigger> apexTriggers = new ApexTriggersSelector().selectByName(rollupTriggerNames);
-
-		// Cache Apex Describes		
 		Map<String, Schema.SObjectType> gd = Schema.getGlobalDescribe();
 		Map<SObjectType, Map<String, Schema.SObjectField>> gdFields = new Map<SObjectType, Map<String, Schema.SObjectField>>(); 	
 		for(LookupRollupSummary__c lookupRollupSummary : (List<LookupRollupSummary__c>) Records)
@@ -94,7 +89,13 @@ public with sharing class RollupSummaries extends SObjectDomain
 				gdFields.put(parentObjectType, parentObjectType.getDescribe().fields.getMap());
 			if(childObjectType!=null && !gdFields.containsKey(childObjectType))
 				gdFields.put(childObjectType, childObjectType.getDescribe().fields.getMap());
+			// Calculate trigger name child object reqquires in order to check existance
+			if(childObjectType!=null)
+				rollupTriggerNames.add(makeTriggerName(lookupRollupSummary));				
 		}
+
+		// Query for any related Apex triggers
+		Map<String, ApexTrigger> apexTriggers = new ApexTriggersSelector().selectByName(rollupTriggerNames);
 
 		for(LookupRollupSummary__c lookupRollupSummary : (List<LookupRollupSummary__c>) Records)
 		{
@@ -134,12 +135,15 @@ public with sharing class RollupSummaries extends SObjectDomain
 					lookupRollupSummary.AggregateResultField__c.addError(error('Field does not exist.', lookupRollupSummary, LookupRollupSummary__c.AggregateResultField__c));
 			}						
 			// Cannot activate Realtime or Scheduled rollup without the required trigger deployed
-			String triggerName = makeTriggerName(lookupRollupSummary); 
-			if(lookupRollupSummary.Active__c &&
-			   (lookupRollupSummary.CalculationMode__c == CalculationMode.Realtime.name() ||
-			    lookupRollupSummary.CalculationMode__c == CalculationMode.Scheduled.name()) && 
-			   !apexTriggers.containsKey(triggerName))
-				lookupRollupSummary.Active__c.addError(error('Apex Trigger ' + triggerName + ' has not been deployed. Click Manage Child Trigger and try again.', lookupRollupSummary, LookupRollupSummary__c.Active__c));
+			if(childObjectType!=null) 
+			{
+				String triggerName = makeTriggerName(lookupRollupSummary); 
+				if(lookupRollupSummary.Active__c &&
+				   (lookupRollupSummary.CalculationMode__c == CalculationMode.Realtime.name() ||
+				    lookupRollupSummary.CalculationMode__c == CalculationMode.Scheduled.name()) && 
+				   !apexTriggers.containsKey(triggerName))
+					lookupRollupSummary.Active__c.addError(error('Apex Trigger ' + triggerName + ' has not been deployed. Click Manage Child Trigger and try again.', lookupRollupSummary, LookupRollupSummary__c.Active__c));				
+			}
 			// Check the list of fields expressed in the relationship critiera fields
 			if(childObjectFields!=null && lookupRollupSummary.RelationshipCriteriaFields__c!=null)
 			{
@@ -173,6 +177,18 @@ public with sharing class RollupSummaries extends SObjectDomain
 							aggregateResultField.getDescribe(),
 							fieldToAggregate.getDescribe(),
 							OPERATION_PICKLIST_TO_ENUMS.get(lookupRollupSummary.AggregateOperation__c)));
+					// Validate the SOQL
+					if(lookupRollupSummary.RelationShipCriteria__c!=null && 
+					   lookupRollupSummary.RelationShipCriteria__c.length()>0) 
+					{
+						try {
+							// Validate only mode ensures no query is actually made should it be valid
+							LREngine.rollUp(lreContext, new Set<Id>(), true);	
+						} catch (QueryException e) {
+							lookupRollupSummary.RelationShipCriteria__c.addError(
+								error(String.format(MSG_INVALID_CRITERIA, new String[] { lookupRollupSummary.RelationShipCriteria__c, e.getMessage() }), lookupRollupSummary, LookupRollupSummary__c.RelationShipCriteria__c));
+						}											
+					}
 				}
 			}
 			catch (LREngine.BadRollUpSummaryStateException e)
@@ -182,6 +198,8 @@ public with sharing class RollupSummaries extends SObjectDomain
 			} 											
 		}
 	}
+
+	private static final String MSG_INVALID_CRITERIA = 'Relationship Criteria \'\'{0}\'\' is not valid, see SOQL documentation http://www.salesforce.com/us/developer/docs/soql_sosl/Content/sforce_api_calls_soql_select_conditionexpression.htm, error is \'\'{1}\'\'';
 
 	public class Constructor implements SObjectDomain.IConstructable
 	{

rolluptool/src/classes/RollupSummaries.cls-meta.xml

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

rolluptool/src/classes/RollupSummariesSelector.cls-meta.xml

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