Merge pull request #61 from forcedotcom/SmallFeatures

#60 Added support for polymorphic lookup fields
forcedotcom · May 30, 2020 · 58929da · 58929da
2 parents dcfea9d + 385875d
commit 58929da
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -2,12 +2,10 @@
 
 ```bash
 ### ------------------------------------------------------------------------------- ###
-### ------ Latest stable version: 2.8.342 ------------------------------------------ ###
+### ------ Latest stable version: 2.8.4 ------------------------------------------- ###
 ### ------ !! Highly recommended always keeping your local copy up-to-date !! ----- ###
+### -------!! All older versions may not functioning properly !! ------------------ ###
 ### ------------------------------------------------------------------------------- ###
-
-### Applied mandatory patch starting from the version 2.8.330
-### (All earlier versions < 2.8.330 are outdated and may not functioning properly)
 ```
 #### For the detailed documentation visit the project WIKI: [https://github.com/forcedotcom/SFDX-Data-Move-Utility/wiki](https://github.com/forcedotcom/SFDX-Data-Move-Utility/wiki)
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "sfdmu",
     "description": "The advanced Salesforce Data Loader SFDX Plugin (SFDMU) will assist you to populate your org (scratch/development/sandbox/production) with data imported from another org or CSV files. Supports Delete, Insert, Update and Upsert for multiple related sObjects.",
-    "version": "2.8.342",
+    "version": "2.8.4",
     "author": "hknokh@salesforce.com",
     "bugs": "https://github.com/forcedotcom/SFDX-Data-Move-Utility/issues",
     "dependencies": {

diff --git a/src/modules/components/common_components/sfdx.ts b/src/modules/components/common_components/sfdx.ts
@@ -14,7 +14,7 @@ import {
 } from 'soql-parser-js';
 import { CONSTANTS } from './statics';
 import { DescribeSObjectResult, QueryResult } from 'jsforce';
-import { SFieldDescribe, SObjectDescribe, ScriptOrg } from '../../models';
+import { SFieldDescribe, SObjectDescribe, ScriptOrg, CommandExecutionError } from '../../models';
 import { Common } from './common';
 import { IOrgConnectionData } from '../../models/common_models/helper_interfaces';
 
@@ -95,17 +95,20 @@ export class Sfdx {
         useBulkQueryApi: boolean = false,
         csvFullFilename?: string,
         sFieldsDescribeMap?: Map<string, SFieldDescribe>): Promise<Array<any>> {
-
         let self = this;
-        if (csvFullFilename && sFieldsDescribeMap) {
-            return await ___readAndFormatCsvRecordsAsync();
-        }
-        let records = [].concat(await ___queryAsync(soql));
-        if (soql.indexOf("FROM Group") >= 0) {
-            soql = soql.replace("FROM Group", "FROM User");
-            records = records.concat(await ___queryAsync(soql));
+        try {
+            if (csvFullFilename && sFieldsDescribeMap) {
+                return await ___readAndFormatCsvRecordsAsync();
+            }
+            let records = [].concat(await ___queryAsync(soql));
+            if (soql.indexOf("FROM Group") >= 0) {
+                soql = soql.replace("FROM Group", "FROM User");
+                records = records.concat(await ___queryAsync(soql));
+            }
+            return records;
+        } catch (ex) {
+            throw new CommandExecutionError(ex.message);
         }
-        return records;
 
         // ------------------ internal functions ------------------------- //
         async function ___queryAsync(soql: string): Promise<Array<any>> {

diff --git a/src/modules/components/common_components/statics.ts b/src/modules/components/common_components/statics.ts
@@ -23,6 +23,7 @@ export const CONSTANTS = {
     COMPLEX_FIELDS_QUERY_SEPARATOR: '$',
     COMPLEX_FIELDS_QUERY_PREFIX: '$$',
     COMPLEX_FIELDS_SEPARATOR: ';',
+    REFERENCE_FIELD_OBJECT_SEPARATOR: '$',
 
     SCRIPT_FILE_NAME: 'export.json',
     CSV_SOURCE_SUB_DIRECTORY: "source",

diff --git a/src/modules/models/script_models/scriptObject.ts b/src/modules/models/script_models/scriptObject.ts
@@ -72,6 +72,7 @@ export default class ScriptObject {
     processAllSource: boolean = false;
     processAllTarget: boolean = false;
     multiselectPattern: any;
+    referenceFieldToObjectMap: Map<string, string> = new Map<string, string>();
 
     get task(): MigrationJobTask {
         return this.script.job.getTaskBySObjectName(this.name);
@@ -325,14 +326,14 @@ export default class ScriptObject {
                 try {
                     // Retrieve sobject metadata
                     this.sourceSObjectDescribe = await apisf.describeSObjectAsync(this.name);
-                    [...this.sourceSObjectDescribe.fieldsMap.values()].forEach(x => x.scriptObject = this);
+                    this._updateSObjectDescribe(this.sourceSObjectDescribe);
 
                     if (this.script.targetOrg.media == DATA_MEDIA_TYPE.File) {
                         this.targetSObjectDescribe = this.sourceSObjectDescribe;
                     }
 
                     // Add fields by the multiselect keywords + filter query
-                    this._addOrRemmoveFields(this.sourceSObjectDescribe);
+                    this._addOrRemoveFields(this.sourceSObjectDescribe);
 
                     // Check fields existance
                     this._validateFields(this.sourceSObjectDescribe, true);
@@ -354,13 +355,13 @@ export default class ScriptObject {
                 try {
                     // Retrieve sobject metadata
                     this.targetSObjectDescribe = await apisf.describeSObjectAsync(this.name);
-                    [...this.targetSObjectDescribe.fieldsMap.values()].forEach(x => x.scriptObject = this);
+                    this._updateSObjectDescribe(this.targetSObjectDescribe);
 
                     if (this.script.sourceOrg.media == DATA_MEDIA_TYPE.File) {
                         this.sourceSObjectDescribe = this.targetSObjectDescribe;
 
                         // Add fields by the multiselect keywords + filter query
-                        this._addOrRemmoveFields(this.targetSObjectDescribe);
+                        this._addOrRemoveFields(this.targetSObjectDescribe);
                     }
 
                     // Check fields existance
@@ -407,7 +408,7 @@ export default class ScriptObject {
     }
 
     // ----------------------- Private members -------------------------------------------
-    private _addOrRemmoveFields(describe: SObjectDescribe) {
+    private _addOrRemoveFields(describe: SObjectDescribe) {
         if (this.multiselectPattern) {
             let fieldsInOriginalQuery = [].concat(this.fieldsInQuery);
             let pattern = this.multiselectPattern;
@@ -435,6 +436,15 @@ export default class ScriptObject {
         }
     }
 
+    private _updateSObjectDescribe(describe: SObjectDescribe) {
+        [...this.sourceSObjectDescribe.fieldsMap.values()].forEach(x => {
+            x.scriptObject = this;
+            if (x.lookup && this.referenceFieldToObjectMap.has(x.name)){
+                x.referencedObjectType = this.referenceFieldToObjectMap.get(x.name);
+            }
+        });
+    }
+
     private _validateFields(describe: SObjectDescribe, isSource: boolean) {
 
         if (this.fieldsInQuery.length == 0) {
@@ -478,7 +488,13 @@ export default class ScriptObject {
             } else if (CONSTANTS.MULTISELECT_SOQL_KEYWORDS.indexOf(fieldName) >= 0) {
                 ___set(fieldName);
             } else if (fieldName != "id") {
-                parsedQuery.fields.push(getComposedField((<SOQLField>field).field));
+                fieldName = (<SOQLField>field).field;
+                let parts = fieldName.split(CONSTANTS.REFERENCE_FIELD_OBJECT_SEPARATOR);
+                if (parts.length > 1) {
+                    self.referenceFieldToObjectMap.set(parts[0], parts[1]);
+                    fieldName = parts[0];
+                }
+                parsedQuery.fields.push(getComposedField(fieldName));
             }
         });
         this.query = composeQuery(parsedQuery);