typeorm 0.3.0-rc.8 → 0.3.1-dev.941b584

package/persistence/SubjectChangedColumnsComputer.js

@@ -1,76 +1,80 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var DateUtils_1 = require("../util/DateUtils");
-var EntityMetadata_1 = require("../metadata/EntityMetadata");
-var OrmUtils_1 = require("../util/OrmUtils");
+exports.SubjectChangedColumnsComputer = void 0;
+const DateUtils_1 = require("../util/DateUtils");
+const OrmUtils_1 = require("../util/OrmUtils");
+const ApplyValueTransformers_1 = require("../util/ApplyValueTransformers");
+const ObjectUtils_1 = require("../util/ObjectUtils");
 /**
  * Finds what columns are changed in the subject entities.
  */
-var SubjectChangedColumnsComputer = /** @class */ (function () {
-    function SubjectChangedColumnsComputer() {
-    }
+class SubjectChangedColumnsComputer {
     // -------------------------------------------------------------------------
     // Public Methods
     // -------------------------------------------------------------------------
     /**
      * Finds what columns are changed in the subject entities.
      */
-    SubjectChangedColumnsComputer.prototype.compute = function (subjects) {
-        var _this = this;
-        subjects.forEach(function (subject) {
-            _this.computeDiffColumns(subject);
-            _this.computeDiffRelationalColumns(subjects, subject);
+    compute(subjects) {
+        subjects.forEach((subject) => {
+            this.computeDiffColumns(subject);
+            this.computeDiffRelationalColumns(subjects, subject);
         });
-    };
+    }
     // -------------------------------------------------------------------------
     // Protected Methods
     // -------------------------------------------------------------------------
     /**
      * Differentiate columns from the updated entity and entity stored in the database.
      */
-    SubjectChangedColumnsComputer.prototype.computeDiffColumns = function (subject) {
+    computeDiffColumns(subject) {
         // if there is no persisted entity then nothing to compute changed in it
         if (!subject.entity)
             return;
-        subject.metadata.columns.forEach(function (column) {
+        subject.metadata.columns.forEach((column) => {
             // ignore special columns
             if (column.isVirtual ||
-                column.isDiscriminator ||
-                column.isUpdateDate ||
-                column.isVersion ||
-                column.isCreateDate)
+                column.isDiscriminator // ||
+            // column.isUpdateDate ||
+            // column.isVersion ||
+            // column.isCreateDate
+            )
                 return;
-            var changeMap = subject.changeMaps.find(function (changeMap) { return changeMap.column === column; });
+            const changeMap = subject.changeMaps.find((changeMap) => changeMap.column === column);
             if (changeMap) {
                 subject.changeMaps.splice(subject.changeMaps.indexOf(changeMap), 1);
             }
             // get user provided value - column value from the user provided persisted entity
-            var entityValue = column.getEntityValue(subject.entity);
+            const entityValue = column.getEntityValue(subject.entity);
             // we don't perform operation over undefined properties (but we DO need null properties!)
             if (entityValue === undefined)
                 return;
             // if there is no database entity then all columns are treated as new, e.g. changed
             if (subject.databaseEntity) {
+                // skip transform database value for json / jsonb for comparison later on
+                const shouldTransformDatabaseEntity = column.type !== "json" && column.type !== "jsonb";
                 // get database value of the column
-                var databaseValue = column.getEntityValue(subject.databaseEntity);
+                let databaseValue = column.getEntityValue(subject.databaseEntity, shouldTransformDatabaseEntity);
                 // filter out "relational columns" only in the case if there is a relation object in entity
                 if (column.relationMetadata) {
-                    var value = column.relationMetadata.getEntityValue(subject.entity);
+                    const value = column.relationMetadata.getEntityValue(subject.entity);
                     if (value !== null && value !== undefined)
                         return;
                 }
-                var normalizedValue = entityValue;
+                let normalizedValue = entityValue;
                 // normalize special values to make proper comparision
                 if (entityValue !== null) {
                     switch (column.type) {
                         case "date":
-                            normalizedValue = DateUtils_1.DateUtils.mixedDateToDateString(entityValue);
+                            normalizedValue =
+                                DateUtils_1.DateUtils.mixedDateToDateString(entityValue);
                             break;
                         case "time":
                         case "time with time zone":
                         case "time without time zone":
                         case "timetz":
-                            normalizedValue = DateUtils_1.DateUtils.mixedDateToTimeString(entityValue);
+                            normalizedValue =
+                                DateUtils_1.DateUtils.mixedDateToTimeString(entityValue);
                             break;
                         case "datetime":
                         case "datetime2":
@@ -80,12 +84,13 @@ var SubjectChangedColumnsComputer = /** @class */ (function () {
                         case "timestamp with time zone":
                         case "timestamp with local time zone":
                         case "timestamptz":
-                            normalizedValue = DateUtils_1.DateUtils.mixedDateToUtcDatetimeString(entityValue);
-                            databaseValue = DateUtils_1.DateUtils.mixedDateToUtcDatetimeString(databaseValue);
+                            normalizedValue =
+                                DateUtils_1.DateUtils.mixedDateToUtcDatetimeString(entityValue);
+                            databaseValue =
+                                DateUtils_1.DateUtils.mixedDateToUtcDatetimeString(databaseValue);
                             break;
                         case "json":
                         case "jsonb":
-                        case "simple-json":
                             // JSON.stringify doesn't work because postgresql sorts jsonb before save.
                             // If you try to save json '[{"messages": "", "attribute Key": "", "level":""}] ' as jsonb,
                             // then postgresql will save it as '[{"level": "", "message":"", "attributeKey": ""}]'
@@ -93,40 +98,57 @@ var SubjectChangedColumnsComputer = /** @class */ (function () {
                                 return;
                             break;
                         case "simple-array":
-                            normalizedValue = DateUtils_1.DateUtils.simpleArrayToString(entityValue);
-                            databaseValue = DateUtils_1.DateUtils.simpleArrayToString(databaseValue);
+                            normalizedValue =
+                                DateUtils_1.DateUtils.simpleArrayToString(entityValue);
+                            databaseValue =
+                                DateUtils_1.DateUtils.simpleArrayToString(databaseValue);
                             break;
                         case "simple-enum":
-                            normalizedValue = DateUtils_1.DateUtils.simpleEnumToString(entityValue);
-                            databaseValue = DateUtils_1.DateUtils.simpleEnumToString(databaseValue);
+                            normalizedValue =
+                                DateUtils_1.DateUtils.simpleEnumToString(entityValue);
+                            databaseValue =
+                                DateUtils_1.DateUtils.simpleEnumToString(databaseValue);
                             break;
                         case "simple-json":
-                            normalizedValue = DateUtils_1.DateUtils.simpleJsonToString(entityValue);
-                            databaseValue = DateUtils_1.DateUtils.simpleJsonToString(databaseValue);
+                            normalizedValue =
+                                DateUtils_1.DateUtils.simpleJsonToString(entityValue);
+                            databaseValue =
+                                DateUtils_1.DateUtils.simpleJsonToString(databaseValue);
                             break;
                     }
+                    if (column.transformer) {
+                        normalizedValue = ApplyValueTransformers_1.ApplyValueTransformers.transformTo(column.transformer, entityValue);
+                    }
                 }
                 // if value is not changed - then do nothing
-                if (normalizedValue === databaseValue)
-                    return;
+                if (Buffer.isBuffer(normalizedValue) &&
+                    Buffer.isBuffer(databaseValue)) {
+                    if (normalizedValue.equals(databaseValue)) {
+                        return;
+                    }
+                }
+                else {
+                    if (normalizedValue === databaseValue)
+                        return;
+                }
             }
             subject.diffColumns.push(column);
             subject.changeMaps.push({
                 column: column,
-                value: entityValue
+                value: entityValue,
             });
         });
-    };
+    }
     /**
      * Difference columns of the owning one-to-one and many-to-one columns.
      */
-    SubjectChangedColumnsComputer.prototype.computeDiffRelationalColumns = function (allSubjects, subject) {
+    computeDiffRelationalColumns(allSubjects, subject) {
         // if there is no persisted entity then nothing to compute changed in it
         if (!subject.entity)
             return;
-        subject.metadata.relationsWithJoinColumns.forEach(function (relation) {
+        subject.metadata.relationsWithJoinColumns.forEach((relation) => {
             // get the related entity from the persisted entity
-            var relatedEntity = relation.getEntityValue(subject.entity);
+            let relatedEntity = relation.getEntityValue(subject.entity);
             // we don't perform operation over undefined properties (but we DO need null properties!)
             if (relatedEntity === undefined)
                 return;
@@ -137,14 +159,15 @@ var SubjectChangedColumnsComputer = /** @class */ (function () {
                 // 2. related entity can be just an entity id
                 // if relation entity is just a relation id set (for example post.tag = 1)
                 // then we create an id map from it to make a proper comparision
-                var relatedEntityRelationIdMap = relatedEntity;
-                if (relatedEntityRelationIdMap !== null && relatedEntityRelationIdMap instanceof Object)
+                let relatedEntityRelationIdMap = relatedEntity;
+                if (relatedEntityRelationIdMap !== null &&
+                    ObjectUtils_1.ObjectUtils.isObject(relatedEntityRelationIdMap))
                     relatedEntityRelationIdMap = relation.getRelationIdMap(relatedEntityRelationIdMap);
                 // get database related entity. Since loadRelationIds are used on databaseEntity
                 // related entity will contain only its relation ids
-                var databaseRelatedEntityRelationIdMap = relation.getEntityValue(subject.databaseEntity);
+                const databaseRelatedEntityRelationIdMap = relation.getEntityValue(subject.databaseEntity);
                 // if relation ids are equal then we don't need to update anything
-                var areRelatedIdsEqual = EntityMetadata_1.EntityMetadata.compareIds(relatedEntityRelationIdMap, databaseRelatedEntityRelationIdMap);
+                const areRelatedIdsEqual = OrmUtils_1.OrmUtils.compareIds(relatedEntityRelationIdMap, databaseRelatedEntityRelationIdMap);
                 if (areRelatedIdsEqual) {
                     return;
                 }
@@ -154,24 +177,25 @@ var SubjectChangedColumnsComputer = /** @class */ (function () {
             }
             // if there is an inserted subject for the related entity of the persisted entity then use it as related entity
             // this code is used for related entities without ids to be properly inserted (and then updated if needed)
-            var valueSubject = allSubjects.find(function (subject) { return subject.mustBeInserted && subject.entity === relatedEntity; });
+            const valueSubject = allSubjects.find((subject) => subject.mustBeInserted && subject.entity === relatedEntity);
             if (valueSubject)
                 relatedEntity = valueSubject;
             // find if there is already a relation to be changed
-            var changeMap = subject.changeMaps.find(function (changeMap) { return changeMap.relation === relation; });
-            if (changeMap) { // and update its value if it was found
+            const changeMap = subject.changeMaps.find((changeMap) => changeMap.relation === relation);
+            if (changeMap) {
+                // and update its value if it was found
                 changeMap.value = relatedEntity;
             }
-            else { // if it wasn't found add a new relation for change
+            else {
+                // if it wasn't found add a new relation for change
                 subject.changeMaps.push({
                     relation: relation,
-                    value: relatedEntity
+                    value: relatedEntity,
                 });
             }
         });
-    };
-    return SubjectChangedColumnsComputer;
-}());
+    }
+}
 exports.SubjectChangedColumnsComputer = SubjectChangedColumnsComputer;
 
 //# sourceMappingURL=SubjectChangedColumnsComputer.js.map

package/persistence/SubjectChangedColumnsComputer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/persistence/SubjectChangedColumnsComputer.ts"],"names":[],"mappings":"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","file":"SubjectChangedColumnsComputer.js","sourcesContent":["import {Subject} from \"./Subject\";\nimport {DateUtils} from \"../util/DateUtils\";\nimport {ObjectLiteral} from \"../common/ObjectLiteral\";\nimport {EntityMetadata} from \"../metadata/EntityMetadata\";\nimport {OrmUtils} from \"../util/OrmUtils\";\n\n/**\n * Finds what columns are changed in the subject entities.\n */\nexport class SubjectChangedColumnsComputer {\n\n    // -------------------------------------------------------------------------\n    // Public Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Finds what columns are changed in the subject entities.\n     */\n    compute(subjects: Subject[]) {\n        subjects.forEach(subject => {\n            this.computeDiffColumns(subject);\n            this.computeDiffRelationalColumns(subjects, subject);\n        });\n    }\n\n    // -------------------------------------------------------------------------\n    // Protected Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Differentiate columns from the updated entity and entity stored in the database.\n     */\n    protected computeDiffColumns(subject: Subject): void {\n\n        // if there is no persisted entity then nothing to compute changed in it\n        if (!subject.entity)\n            return;\n\n        subject.metadata.columns.forEach(column => {\n\n            // ignore special columns\n            if (column.isVirtual ||\n                column.isDiscriminator ||\n                column.isUpdateDate ||\n                column.isVersion ||\n                column.isCreateDate)\n                return;\n\n            const changeMap = subject.changeMaps.find(changeMap => changeMap.column === column);\n            if (changeMap) {\n                subject.changeMaps.splice(subject.changeMaps.indexOf(changeMap), 1);\n            }\n\n            // get user provided value - column value from the user provided persisted entity\n            const entityValue = column.getEntityValue(subject.entity!);\n\n            // we don't perform operation over undefined properties (but we DO need null properties!)\n            if (entityValue === undefined)\n                return;\n\n            // if there is no database entity then all columns are treated as new, e.g. changed\n            if (subject.databaseEntity) {\n\n                // get database value of the column\n                let databaseValue = column.getEntityValue(subject.databaseEntity);\n\n                // filter out \"relational columns\" only in the case if there is a relation object in entity\n                if (column.relationMetadata) {\n                    const value = column.relationMetadata.getEntityValue(subject.entity!);\n                    if (value !== null && value !== undefined)\n                        return;\n                }\n                let normalizedValue = entityValue;\n                // normalize special values to make proper comparision\n                if (entityValue !== null) {\n                    switch (column.type) {\n                        case \"date\":\n                            normalizedValue = DateUtils.mixedDateToDateString(entityValue);\n                            break;\n\n                        case \"time\":\n                        case \"time with time zone\":\n                        case \"time without time zone\":\n                        case \"timetz\":\n                            normalizedValue = DateUtils.mixedDateToTimeString(entityValue);\n                            break;\n\n                        case \"datetime\":\n                        case \"datetime2\":\n                        case Date:\n                        case \"timestamp\":\n                        case \"timestamp without time zone\":\n                        case \"timestamp with time zone\":\n                        case \"timestamp with local time zone\":\n                        case \"timestamptz\":\n                            normalizedValue = DateUtils.mixedDateToUtcDatetimeString(entityValue);\n                            databaseValue = DateUtils.mixedDateToUtcDatetimeString(databaseValue);\n                            break;\n\n                        case \"json\":\n                        case \"jsonb\":\n                        case \"simple-json\":\n                            // JSON.stringify doesn't work because postgresql sorts jsonb before save.\n                            // If you try to save json '[{\"messages\": \"\", \"attribute Key\": \"\", \"level\":\"\"}] ' as jsonb,\n                            // then postgresql will save it as '[{\"level\": \"\", \"message\":\"\", \"attributeKey\": \"\"}]'\n                            if (OrmUtils.deepCompare(entityValue, databaseValue)) return;\n                            break;\n\n                        case \"simple-array\":\n                            normalizedValue = DateUtils.simpleArrayToString(entityValue);\n                            databaseValue = DateUtils.simpleArrayToString(databaseValue);\n                            break;\n                        case \"simple-enum\":\n                            normalizedValue = DateUtils.simpleEnumToString(entityValue);\n                            databaseValue = DateUtils.simpleEnumToString(databaseValue);\n                            break;\n                        case \"simple-json\":\n                            normalizedValue = DateUtils.simpleJsonToString(entityValue);\n                            databaseValue = DateUtils.simpleJsonToString(databaseValue);\n                            break;\n                    }\n                }\n\n                // if value is not changed - then do nothing\n                if (normalizedValue === databaseValue)\n                    return;\n            }\n            subject.diffColumns.push(column);\n            subject.changeMaps.push({\n                column: column,\n                value: entityValue\n            });\n        });\n    }\n\n    /**\n     * Difference columns of the owning one-to-one and many-to-one columns.\n     */\n    protected computeDiffRelationalColumns(allSubjects: Subject[], subject: Subject): void {\n\n        // if there is no persisted entity then nothing to compute changed in it\n        if (!subject.entity)\n            return;\n\n        subject.metadata.relationsWithJoinColumns.forEach(relation => {\n\n            // get the related entity from the persisted entity\n            let relatedEntity = relation.getEntityValue(subject.entity!);\n\n            // we don't perform operation over undefined properties (but we DO need null properties!)\n            if (relatedEntity === undefined)\n                return;\n\n            // if there is no database entity then all relational columns are treated as new, e.g. changed\n            if (subject.databaseEntity) {\n\n                // here we cover two scenarios:\n                // 1. related entity can be another entity which is natural way\n                // 2. related entity can be just an entity id\n                // if relation entity is just a relation id set (for example post.tag = 1)\n                // then we create an id map from it to make a proper comparision\n                let relatedEntityRelationIdMap: ObjectLiteral = relatedEntity;\n                if (relatedEntityRelationIdMap !== null && relatedEntityRelationIdMap instanceof Object)\n                    relatedEntityRelationIdMap = relation.getRelationIdMap(relatedEntityRelationIdMap)!;\n\n                // get database related entity. Since loadRelationIds are used on databaseEntity\n                // related entity will contain only its relation ids\n                const databaseRelatedEntityRelationIdMap = relation.getEntityValue(subject.databaseEntity);\n\n                // if relation ids are equal then we don't need to update anything\n                const areRelatedIdsEqual = EntityMetadata.compareIds(relatedEntityRelationIdMap, databaseRelatedEntityRelationIdMap);\n                if (areRelatedIdsEqual) {\n                    return;\n                } else {\n                    subject.diffRelations.push(relation);\n                }\n            }\n\n            // if there is an inserted subject for the related entity of the persisted entity then use it as related entity\n            // this code is used for related entities without ids to be properly inserted (and then updated if needed)\n            const valueSubject = allSubjects.find(subject => subject.mustBeInserted && subject.entity === relatedEntity);\n            if (valueSubject)\n                relatedEntity = valueSubject;\n\n            // find if there is already a relation to be changed\n            const changeMap = subject.changeMaps.find(changeMap => changeMap.relation === relation);\n            if (changeMap) { // and update its value if it was found\n                changeMap.value = relatedEntity;\n\n            } else { // if it wasn't found add a new relation for change\n                subject.changeMaps.push({\n                    relation: relation,\n                    value: relatedEntity\n                });\n            }\n        });\n    }\n\n}\n"],"sourceRoot":".."}
+{"version":3,"sources":["../../src/persistence/SubjectChangedColumnsComputer.ts"],"names":[],"mappings":"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","file":"SubjectChangedColumnsComputer.js","sourcesContent":["import { Subject } from \"./Subject\"\nimport { DateUtils } from \"../util/DateUtils\"\nimport { ObjectLiteral } from \"../common/ObjectLiteral\"\nimport { OrmUtils } from \"../util/OrmUtils\"\nimport { ApplyValueTransformers } from \"../util/ApplyValueTransformers\"\nimport { ObjectUtils } from \"../util/ObjectUtils\"\n\n/**\n * Finds what columns are changed in the subject entities.\n */\nexport class SubjectChangedColumnsComputer {\n    // -------------------------------------------------------------------------\n    // Public Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Finds what columns are changed in the subject entities.\n     */\n    compute(subjects: Subject[]) {\n        subjects.forEach((subject) => {\n            this.computeDiffColumns(subject)\n            this.computeDiffRelationalColumns(subjects, subject)\n        })\n    }\n\n    // -------------------------------------------------------------------------\n    // Protected Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Differentiate columns from the updated entity and entity stored in the database.\n     */\n    protected computeDiffColumns(subject: Subject): void {\n        // if there is no persisted entity then nothing to compute changed in it\n        if (!subject.entity) return\n\n        subject.metadata.columns.forEach((column) => {\n            // ignore special columns\n            if (\n                column.isVirtual ||\n                column.isDiscriminator // ||\n                // column.isUpdateDate ||\n                // column.isVersion ||\n                // column.isCreateDate\n            )\n                return\n\n            const changeMap = subject.changeMaps.find(\n                (changeMap) => changeMap.column === column,\n            )\n            if (changeMap) {\n                subject.changeMaps.splice(\n                    subject.changeMaps.indexOf(changeMap),\n                    1,\n                )\n            }\n\n            // get user provided value - column value from the user provided persisted entity\n            const entityValue = column.getEntityValue(subject.entity!)\n\n            // we don't perform operation over undefined properties (but we DO need null properties!)\n            if (entityValue === undefined) return\n\n            // if there is no database entity then all columns are treated as new, e.g. changed\n            if (subject.databaseEntity) {\n                // skip transform database value for json / jsonb for comparison later on\n                const shouldTransformDatabaseEntity =\n                    column.type !== \"json\" && column.type !== \"jsonb\"\n\n                // get database value of the column\n                let databaseValue = column.getEntityValue(\n                    subject.databaseEntity,\n                    shouldTransformDatabaseEntity,\n                )\n\n                // filter out \"relational columns\" only in the case if there is a relation object in entity\n                if (column.relationMetadata) {\n                    const value = column.relationMetadata.getEntityValue(\n                        subject.entity!,\n                    )\n                    if (value !== null && value !== undefined) return\n                }\n                let normalizedValue = entityValue\n                // normalize special values to make proper comparision\n                if (entityValue !== null) {\n                    switch (column.type) {\n                        case \"date\":\n                            normalizedValue =\n                                DateUtils.mixedDateToDateString(entityValue)\n                            break\n\n                        case \"time\":\n                        case \"time with time zone\":\n                        case \"time without time zone\":\n                        case \"timetz\":\n                            normalizedValue =\n                                DateUtils.mixedDateToTimeString(entityValue)\n                            break\n\n                        case \"datetime\":\n                        case \"datetime2\":\n                        case Date:\n                        case \"timestamp\":\n                        case \"timestamp without time zone\":\n                        case \"timestamp with time zone\":\n                        case \"timestamp with local time zone\":\n                        case \"timestamptz\":\n                            normalizedValue =\n                                DateUtils.mixedDateToUtcDatetimeString(\n                                    entityValue,\n                                )\n                            databaseValue =\n                                DateUtils.mixedDateToUtcDatetimeString(\n                                    databaseValue,\n                                )\n                            break\n\n                        case \"json\":\n                        case \"jsonb\":\n                            // JSON.stringify doesn't work because postgresql sorts jsonb before save.\n                            // If you try to save json '[{\"messages\": \"\", \"attribute Key\": \"\", \"level\":\"\"}] ' as jsonb,\n                            // then postgresql will save it as '[{\"level\": \"\", \"message\":\"\", \"attributeKey\": \"\"}]'\n                            if (\n                                OrmUtils.deepCompare(entityValue, databaseValue)\n                            )\n                                return\n                            break\n\n                        case \"simple-array\":\n                            normalizedValue =\n                                DateUtils.simpleArrayToString(entityValue)\n                            databaseValue =\n                                DateUtils.simpleArrayToString(databaseValue)\n                            break\n                        case \"simple-enum\":\n                            normalizedValue =\n                                DateUtils.simpleEnumToString(entityValue)\n                            databaseValue =\n                                DateUtils.simpleEnumToString(databaseValue)\n                            break\n                        case \"simple-json\":\n                            normalizedValue =\n                                DateUtils.simpleJsonToString(entityValue)\n                            databaseValue =\n                                DateUtils.simpleJsonToString(databaseValue)\n                            break\n                    }\n\n                    if (column.transformer) {\n                        normalizedValue = ApplyValueTransformers.transformTo(\n                            column.transformer,\n                            entityValue,\n                        )\n                    }\n                }\n\n                // if value is not changed - then do nothing\n                if (\n                    Buffer.isBuffer(normalizedValue) &&\n                    Buffer.isBuffer(databaseValue)\n                ) {\n                    if (normalizedValue.equals(databaseValue)) {\n                        return\n                    }\n                } else {\n                    if (normalizedValue === databaseValue) return\n                }\n            }\n            subject.diffColumns.push(column)\n            subject.changeMaps.push({\n                column: column,\n                value: entityValue,\n            })\n        })\n    }\n\n    /**\n     * Difference columns of the owning one-to-one and many-to-one columns.\n     */\n    protected computeDiffRelationalColumns(\n        allSubjects: Subject[],\n        subject: Subject,\n    ): void {\n        // if there is no persisted entity then nothing to compute changed in it\n        if (!subject.entity) return\n\n        subject.metadata.relationsWithJoinColumns.forEach((relation) => {\n            // get the related entity from the persisted entity\n            let relatedEntity = relation.getEntityValue(subject.entity!)\n\n            // we don't perform operation over undefined properties (but we DO need null properties!)\n            if (relatedEntity === undefined) return\n\n            // if there is no database entity then all relational columns are treated as new, e.g. changed\n            if (subject.databaseEntity) {\n                // here we cover two scenarios:\n                // 1. related entity can be another entity which is natural way\n                // 2. related entity can be just an entity id\n                // if relation entity is just a relation id set (for example post.tag = 1)\n                // then we create an id map from it to make a proper comparision\n                let relatedEntityRelationIdMap: ObjectLiteral = relatedEntity\n                if (\n                    relatedEntityRelationIdMap !== null &&\n                    ObjectUtils.isObject(relatedEntityRelationIdMap)\n                )\n                    relatedEntityRelationIdMap = relation.getRelationIdMap(\n                        relatedEntityRelationIdMap,\n                    )!\n\n                // get database related entity. Since loadRelationIds are used on databaseEntity\n                // related entity will contain only its relation ids\n                const databaseRelatedEntityRelationIdMap =\n                    relation.getEntityValue(subject.databaseEntity)\n\n                // if relation ids are equal then we don't need to update anything\n                const areRelatedIdsEqual = OrmUtils.compareIds(\n                    relatedEntityRelationIdMap,\n                    databaseRelatedEntityRelationIdMap,\n                )\n                if (areRelatedIdsEqual) {\n                    return\n                } else {\n                    subject.diffRelations.push(relation)\n                }\n            }\n\n            // if there is an inserted subject for the related entity of the persisted entity then use it as related entity\n            // this code is used for related entities without ids to be properly inserted (and then updated if needed)\n            const valueSubject = allSubjects.find(\n                (subject) =>\n                    subject.mustBeInserted && subject.entity === relatedEntity,\n            )\n            if (valueSubject) relatedEntity = valueSubject\n\n            // find if there is already a relation to be changed\n            const changeMap = subject.changeMaps.find(\n                (changeMap) => changeMap.relation === relation,\n            )\n            if (changeMap) {\n                // and update its value if it was found\n                changeMap.value = relatedEntity\n            } else {\n                // if it wasn't found add a new relation for change\n                subject.changeMaps.push({\n                    relation: relation,\n                    value: relatedEntity,\n                })\n            }\n        })\n    }\n}\n"],"sourceRoot":".."}

package/persistence/SubjectDatabaseEntityLoader.d.ts

@@ -17,7 +17,7 @@ export declare class SubjectDatabaseEntityLoader {
      * loadAllRelations flag is used to load all relation ids of the object, no matter if they present in subject entity or not.
      * This option is used for deletion.
      */
-    load(operationType: "save" | "remove"): Promise<void>;
+    load(operationType: "save" | "remove" | "soft-remove" | "recover"): Promise<void>;
     /**
      * Finds subjects where entity like given subject's entity.
      * Comparision made by entity id.

package/persistence/SubjectDatabaseEntityLoader.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
+exports.SubjectDatabaseEntityLoader = void 0;
 /**
  * Loads database entities for all operate subjects which do not have database entity set.
  * All entities that we load database entities for are marked as updated or inserted.
  * To understand which of them really needs to be inserted or updated we need to load
  * their original representations from the database.
  */
-var SubjectDatabaseEntityLoader = /** @class */ (function () {
+class SubjectDatabaseEntityLoader {
     // ---------------------------------------------------------------------
     // Constructor
     // ---------------------------------------------------------------------
-    function SubjectDatabaseEntityLoader(queryRunner, subjects) {
+    constructor(queryRunner, subjects) {
         this.queryRunner = queryRunner;
         this.subjects = subjects;
     }
@@ -24,108 +24,93 @@ var SubjectDatabaseEntityLoader = /** @class */ (function () {
      * loadAllRelations flag is used to load all relation ids of the object, no matter if they present in subject entity or not.
      * This option is used for deletion.
      */
-    SubjectDatabaseEntityLoader.prototype.load = function (operationType) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var promises;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        promises = this.groupByEntityTargets().map(function (subjectGroup) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                            var e_1, _a, allIds, allSubjects, loadRelationPropertyPaths, findOptions, entities, allSubjects_1, allSubjects_1_1, subject;
-                            var _this = this;
-                            return tslib_1.__generator(this, function (_b) {
-                                switch (_b.label) {
-                                    case 0:
-                                        allIds = [];
-                                        allSubjects = [];
-                                        subjectGroup.subjects.forEach(function (subject) {
-                                            // we don't load if subject already has a database entity loaded
-                                            if (subject.databaseEntity || !subject.identifier)
-                                                return;
-                                            allIds.push(subject.identifier);
-                                            allSubjects.push(subject);
-                                        });
-                                        // if there no ids found (means all entities are new and have generated ids) - then nothing to load there
-                                        if (!allIds.length)
-                                            return [2 /*return*/];
-                                        loadRelationPropertyPaths = [];
-                                        // for the save operation
-                                        // extract all property paths of the relations we need to load relation ids for
-                                        // this is for optimization purpose - this way we don't load relation ids for entities
-                                        // whose relations are undefined, and since they are undefined its really pointless to
-                                        // load something for them, since undefined properties are skipped by the orm
-                                        if (operationType === "save") {
-                                            subjectGroup.subjects.forEach(function (subject) {
-                                                // gets all relation property paths that exist in the persisted entity.
-                                                subject.metadata.relations.forEach(function (relation) {
-                                                    var value = relation.getEntityValue(subject.entityWithFulfilledIds);
-                                                    if (value === undefined)
-                                                        return;
-                                                    if (loadRelationPropertyPaths.indexOf(relation.propertyPath) === -1)
-                                                        loadRelationPropertyPaths.push(relation.propertyPath);
-                                                });
-                                            });
-                                        }
-                                        else { // remove
-                                            // for remove operation
-                                            // we only need to load junction relation ids since only they are removed by cascades
-                                            loadRelationPropertyPaths.push.apply(// remove
-                                            loadRelationPropertyPaths, tslib_1.__spread(subjectGroup.subjects[0].metadata.manyToManyRelations.map(function (relation) { return relation.propertyPath; })));
-                                        }
-                                        findOptions = {
-                                            options: {
-                                                listeners: false,
-                                                observers: false,
-                                                eagerRelations: false,
-                                                loadRelationIds: {
-                                                    relations: loadRelationPropertyPaths,
-                                                    disableMixedMap: true
-                                                }
-                                            }
-                                        };
-                                        return [4 /*yield*/, this.queryRunner.manager
-                                                .getRepository(subjectGroup.target)
-                                                .findByIds(allIds, findOptions)];
-                                    case 1:
-                                        entities = _b.sent();
-                                        // console.timeEnd("loading findByIds");
-                                        // now when we have entities we need to find subject of each entity
-                                        // and insert that entity into database entity of the found subjects
-                                        entities.forEach(function (entity) {
-                                            var subjects = _this.findByPersistEntityLike(subjectGroup.target, entity);
-                                            subjects.forEach(function (subject) {
-                                                subject.databaseEntity = entity;
-                                                if (!subject.identifier)
-                                                    subject.identifier = subject.metadata.hasAllPrimaryKeys(entity) ? subject.metadata.getEntityIdMap(entity) : undefined;
-                                            });
-                                        });
-                                        try {
-                                            // this way we tell what subjects we tried to load database entities of
-                                            for (allSubjects_1 = tslib_1.__values(allSubjects), allSubjects_1_1 = allSubjects_1.next(); !allSubjects_1_1.done; allSubjects_1_1 = allSubjects_1.next()) {
-                                                subject = allSubjects_1_1.value;
-                                                subject.databaseEntityLoaded = true;
-                                            }
-                                        }
-                                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                                        finally {
-                                            try {
-                                                if (allSubjects_1_1 && !allSubjects_1_1.done && (_a = allSubjects_1.return)) _a.call(allSubjects_1);
-                                            }
-                                            finally { if (e_1) throw e_1.error; }
-                                        }
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); });
-                        return [4 /*yield*/, Promise.all(promises)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
+    async load(operationType) {
+        // we are grouping subjects by target to perform more optimized queries using WHERE IN operator
+        // go through the groups and perform loading of database entities of each subject in the group
+        const promises = this.groupByEntityTargets().map(async (subjectGroup) => {
+            // prepare entity ids of the subjects we need to load
+            const allIds = [];
+            const allSubjects = [];
+            subjectGroup.subjects.forEach((subject) => {
+                // we don't load if subject already has a database entity loaded
+                if (subject.databaseEntity || !subject.identifier)
+                    return;
+                allIds.push(subject.identifier);
+                allSubjects.push(subject);
             });
+            // if there no ids found (means all entities are new and have generated ids) - then nothing to load there
+            if (!allIds.length)
+                return;
+            const loadRelationPropertyPaths = [];
+            // for the save, soft-remove and recover operation
+            // extract all property paths of the relations we need to load relation ids for
+            // this is for optimization purpose - this way we don't load relation ids for entities
+            // whose relations are undefined, and since they are undefined its really pointless to
+            // load something for them, since undefined properties are skipped by the orm
+            if (operationType === "save" ||
+                operationType === "soft-remove" ||
+                operationType === "recover") {
+                subjectGroup.subjects.forEach((subject) => {
+                    // gets all relation property paths that exist in the persisted entity.
+                    subject.metadata.relations.forEach((relation) => {
+                        const value = relation.getEntityValue(subject.entityWithFulfilledIds);
+                        if (value === undefined)
+                            return;
+                        if (loadRelationPropertyPaths.indexOf(relation.propertyPath) === -1)
+                            loadRelationPropertyPaths.push(relation.propertyPath);
+                    });
+                });
+            }
+            else {
+                // remove
+                // for remove operation
+                // we only need to load junction relation ids since only they are removed by cascades
+                loadRelationPropertyPaths.push(...subjectGroup.subjects[0].metadata.manyToManyRelations.map((relation) => relation.propertyPath));
+            }
+            const findOptions = {
+                loadEagerRelations: false,
+                loadRelationIds: {
+                    relations: loadRelationPropertyPaths,
+                    disableMixedMap: true,
+                },
+                // the soft-deleted entities should be included in the loaded entities for recover operation
+                withDeleted: true,
+            };
+            // load database entities for all given ids
+            let entities = [];
+            if (this.queryRunner.connection.driver.options.type ===
+                "mongodb") {
+                const mongoRepo = this.queryRunner.manager.getRepository(subjectGroup.target);
+                entities = await mongoRepo.findByIds(allIds, findOptions);
+            }
+            else {
+                entities = await this.queryRunner.manager
+                    .getRepository(subjectGroup.target)
+                    .createQueryBuilder()
+                    .setFindOptions(findOptions)
+                    .whereInIds(allIds)
+                    .getMany();
+            }
+            // now when we have entities we need to find subject of each entity
+            // and insert that entity into database entity of the found subjects
+            entities.forEach((entity) => {
+                const subjects = this.findByPersistEntityLike(subjectGroup.target, entity);
+                subjects.forEach((subject) => {
+                    subject.databaseEntity = entity;
+                    if (!subject.identifier)
+                        subject.identifier =
+                            subject.metadata.hasAllPrimaryKeys(entity)
+                                ? subject.metadata.getEntityIdMap(entity)
+                                : undefined;
+                });
+            });
+            // this way we tell what subjects we tried to load database entities of
+            for (let subject of allSubjects) {
+                subject.databaseEntityLoaded = true;
+            }
         });
-    };
+        await Promise.all(promises);
+    }
     // ---------------------------------------------------------------------
     // Protected Methods
     // ---------------------------------------------------------------------
@@ -135,21 +120,22 @@ var SubjectDatabaseEntityLoader = /** @class */ (function () {
      * Multiple subjects may be returned if duplicates are present in the subject array.
      * This will likely result in the same row being updated multiple times during a transaction.
      */
-    SubjectDatabaseEntityLoader.prototype.findByPersistEntityLike = function (entityTarget, entity) {
-        return this.subjects.filter(function (subject) {
+    findByPersistEntityLike(entityTarget, entity) {
+        return this.subjects.filter((subject) => {
             if (!subject.entity)
                 return false;
             if (subject.entity === entity)
                 return true;
-            return subject.metadata.target === entityTarget && subject.metadata.compareEntities(subject.entityWithFulfilledIds, entity);
+            return (subject.metadata.target === entityTarget &&
+                subject.metadata.compareEntities(subject.entityWithFulfilledIds, entity));
         });
-    };
+    }
     /**
      * Groups given Subject objects into groups separated by entity targets.
      */
-    SubjectDatabaseEntityLoader.prototype.groupByEntityTargets = function () {
-        return this.subjects.reduce(function (groups, operatedEntity) {
-            var group = groups.find(function (group) { return group.target === operatedEntity.metadata.target; });
+    groupByEntityTargets() {
+        return this.subjects.reduce((groups, operatedEntity) => {
+            let group = groups.find((group) => group.target === operatedEntity.metadata.target);
             if (!group) {
                 group = { target: operatedEntity.metadata.target, subjects: [] };
                 groups.push(group);
@@ -157,9 +143,8 @@ var SubjectDatabaseEntityLoader = /** @class */ (function () {
             group.subjects.push(operatedEntity);
             return groups;
         }, []);
-    };
-    return SubjectDatabaseEntityLoader;
-}());
+    }
+}
 exports.SubjectDatabaseEntityLoader = SubjectDatabaseEntityLoader;
 
 //# sourceMappingURL=SubjectDatabaseEntityLoader.js.map