#491

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sfdmu",
   "description": "The Salesforce Data Loader SFDX Plugin (SFDMU) will help you to populate your org (scratch / dev / sandbox / production) with data imported from another org or CSV files. It supports all important CRUD operations (Insert/Update/Upsert/Delete) also for multiple related sObjects.",
-  "version": "4.16.10",
+  "version": "4.17.0",
   "author": "Haim Knokh",
   "bugs": "https://github.com/forcedotcom/SFDX-Data-Move-Utility/issues",
   "dependencies": {
@@ -91,4 +91,4 @@
     "build": "tsc -b",
     "typedoc-sfdmu-run-addons": "typedoc --options typedoc-sfdmu-run-addons.json"
   }
-}
+}

src/modules/models/script_models/script.ts

@@ -57,6 +57,8 @@ export default class Script implements IAppScript, ISfdmuRunScript {
   @Type(() => ScriptObject)
   objects: ScriptObject[] = new Array<ScriptObject>();
 
+  excludedObjects: string[] = new Array<string>();
+
   @Type(() => ScriptObjectSet)
   objectSets: ScriptObjectSet[] = new Array<ScriptObjectSet>();
 
@@ -117,6 +119,7 @@ export default class Script implements IAppScript, ISfdmuRunScript {
   runInfo: ICommandRunInfo;
   canModify: string;
 
+
   // Additional sobject descriptions for sobject which were nbot included into the export.json
   // but necessary for the job
   extraSObjectDescriptions: Map<string, SObjectDescribe> = new Map<string, SObjectDescribe>();
@@ -265,8 +268,11 @@ export default class Script implements IAppScript, ISfdmuRunScript {
       let rule = object.operation != OPERATION.Readonly
         && CONSTANTS.NOT_SUPPORTED_OBJECTS.indexOf(object.name) < 0
         && isSupportedForOperation;
-      let included = !object.excluded && (object.operation == OPERATION.Readonly || rule);
+      let included = !object.excluded && (object.operation == OPERATION.Readonly || rule) && this.excludedObjects.indexOf(object.name) < 0;
       if (!included) {
+        if (this.excludedObjects.indexOf(object.name) < 0) {
+          this.excludedObjects.push(object.name);
+        }
         this.logger.infoVerbose(RESOURCES.objectWillBeExcluded, object.name);
       }
       return included;

src/modules/models/script_models/scriptObject.ts

@@ -669,10 +669,12 @@ export default class ScriptObject implements ISfdmuRunScriptObject {
   // ----------------------- Private members -------------------------------------------
   private _addOrRemoveFields(describe: SObjectDescribe) {
 
+    let fieldDescribes = [...describe.fieldsMap.values()];
+
     // Add multiselect fields
     if (this.multiselectPattern) {
       let pattern = this.multiselectPattern;
-      [...describe.fieldsMap.values()].forEach(fieldDescribe => {
+      fieldDescribes.forEach(fieldDescribe => {
 
         // *** Rules when to add this field to the query:
         if (
@@ -732,8 +734,8 @@ export default class ScriptObject implements ISfdmuRunScriptObject {
     });
 
     // Filter excluded fields
-    this.parsedQuery.fields = this.parsedQuery.fields.filter((f: FieldType) => {
-      let field = f as SOQLField;
+    this.parsedQuery.fields = this.parsedQuery.fields.filter((fieldType: FieldType) => {
+      let field = fieldType as SOQLField;
       return this.excludedFields.indexOf(field.field) < 0
     });
 
@@ -747,8 +749,8 @@ export default class ScriptObject implements ISfdmuRunScriptObject {
     // Verify external id value when the original one was not supplied with the script
     if (this.originalExternalIdIsEmpty
       && !describe.fieldsMap.get(this.externalId)) {
-      this.parsedQuery.fields = this.parsedQuery.fields.filter((f: FieldType) => {
-        let field = f as SOQLField;
+      this.parsedQuery.fields = this.parsedQuery.fields.filter((fieldType: FieldType) => {
+        let field = fieldType as SOQLField;
         return field.field != this.externalId
       });
       this.externalId = this.defaultExternalId;
@@ -763,6 +765,13 @@ export default class ScriptObject implements ISfdmuRunScriptObject {
       return isComplexField || !isComplexField && describedFields.indexOf(field.field.toLowerCase()) >= 0;
     });
 
+    // Filter lookup fields referenced to excluded objects
+    this.parsedQuery.fields = this.parsedQuery.fields.filter((fieldType: FieldType) => {
+      let field = fieldType as SOQLField;
+      let fieldDescribe = fieldDescribes.find(describe => describe.name.toLowerCase() == field.field.toLowerCase() && describe.lookup);
+      return !fieldDescribe || !this.script.excludedObjects.some(object => object == fieldDescribe.referencedObjectType);
+    });
+
     // Make each field appear only once
     this.parsedQuery.fields = Common.distinctArray(this.parsedQuery.fields, "field");