myorm_pg 6.1.4 → 6.2.1

package/lib/implementations/PGDBSet.js

@@ -44,9 +44,10 @@ class PGDBSet extends myorm_core_1.AbstractSet {
     AddAsync(obj) {
         return this.AddObjectAsync(obj);
     }
-    AddObjectAsync(obj, cascade = true, relations = []) {
+    AddObjectAsync(obj, cascade = true, relations = [], visiteds = []) {
         return this.CreatePromisse(() => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c;
+            visiteds = visiteds !== null && visiteds !== void 0 ? visiteds : [];
             if (!obj)
                 throw new InvalidOperationException_1.default(`Cannot insert a null reference object of ${this._type.name}`);
             if (!this.IsCorrectType(obj))
@@ -88,6 +89,9 @@ class PGDBSet extends myorm_core_1.AbstractSet {
             }
             if (key == undefined)
                 throw new InvalidOperationException_1.default(`The type ${this._type.name} must have a primary key field`);
+            if (visiteds.filter(s => s && s.constructor == obj.constructor && Reflect.get(s, key.Property) == Reflect.get(obj, key.Property)).length > 0)
+                return obj;
+            visiteds.push(obj);
             if (Type_1.default.HasValue(Reflect.get(obj, key.Property)))
                 throw new InvalidOperationException_1.default(`Can not add a ${this._type.name} with ${key.Property} provided`);
             sql = sql.substring(0, sql.length - 1) + ") ";
@@ -99,6 +103,9 @@ class PGDBSet extends myorm_core_1.AbstractSet {
             }
             let subTypesUpdates = [];
             let updatableFields = [];
+            let objectsToUpdate = [];
+            let objectsToAdd = [];
+            let buildSubupdates = [];
             for (let sub of subTypes) {
                 let relation = SchemasDecorators_1.default.GetRelationAttribute(this._type, sub.Field);
                 let subType = Type_1.default.GetDesingType(this._type, sub.Field);
@@ -126,11 +133,13 @@ class PGDBSet extends myorm_core_1.AbstractSet {
                         if (subRelation && subRelation.TypeBuilder() == this._type) {
                             if (subRelation.Field != undefined && subRelation.Field != sub.Field)
                                 continue;
+                            updatableFields.push(subKey);
                             if (subRelation.Relation == RelationType_1.RelationType.ONE_TO_MANY || subRelation.Relation == RelationType_1.RelationType.MANY_TO_MANY) {
-                                updatableFields.push(subKey);
                                 if (isArray) {
+                                    if (subObj == undefined || visiteds.indexOf(subObj) > -1)
+                                        continue;
                                     for (let i of subObj) {
-                                        if (i == undefined)
+                                        if (i == undefined || visiteds.indexOf(i) > -1)
                                             continue;
                                         let metadata = Type_1.default.ExtractMetadata(i).filter(s => s.Field == subKey && s.Loaded);
                                         let value = [];
@@ -147,6 +156,8 @@ class PGDBSet extends myorm_core_1.AbstractSet {
                                     }
                                 }
                                 else {
+                                    if (subObj == undefined || visiteds.indexOf(subObj) > -1)
+                                        continue;
                                     let metadata = Type_1.default.ExtractMetadata(subObj).filter(s => s.Field == subKey && s.Loaded);
                                     let value = [];
                                     if (metadata.length > 0) {
@@ -164,12 +175,14 @@ class PGDBSet extends myorm_core_1.AbstractSet {
                             else {
                                 if (subRelation.Relation == RelationType_1.RelationType.MANY_TO_ONE && isArray) {
                                     for (let i of subObj) {
-                                        if (i == undefined)
+                                        if (i == undefined || visiteds.indexOf(i) > -1)
                                             continue;
                                         Reflect.set(i, subKey, obj);
                                     }
                                 }
                                 else {
+                                    if (subObj == undefined || visiteds.indexOf(subObj) > -1)
+                                        continue;
                                     Reflect.set(subObj, subKey, obj);
                                 }
                             }
@@ -177,43 +190,105 @@ class PGDBSet extends myorm_core_1.AbstractSet {
                     }
                 }
                 if (isArray) {
+                    if (subObj == undefined)
+                        continue;
                     for (let i of subObj) {
                         if (i == undefined)
                             continue;
                         if (!Type_1.default.HasValue(Reflect.get(i, subPK))) {
-                            if (cascade || relations.filter(s => s == sub.Field))
-                                yield colletion["AddAsync"](i);
+                            if (cascade || relations.filter(s => s == sub.Field).length > 0) {
+                                let cs = objectsToAdd.filter(s => s.Type == subType);
+                                if (cs.length == 0)
+                                    objectsToAdd.push({ Objs: [i], Type: subType, SubPK: subPK });
+                                else
+                                    cs[0].Objs.push(i);
+                            }
+                        }
+                        else {
+                            let cs = objectsToUpdate.filter(s => s.Type == subType);
+                            if (cs.length == 0)
+                                objectsToUpdate.push({ Objs: [{ Obj: i, UpdatableFields: updatableFields }], Type: subType, SubPK: subPK });
+                            else {
+                                let ccs = cs.filter(s => s.Objs.filter(j => j.Obj == i).length > 0);
+                                if (ccs.length == 0) {
+                                    cs[0].Objs.push({ Obj: i, UpdatableFields: updatableFields });
+                                }
+                                else {
+                                    ccs[0].Objs[0].UpdatableFields.push(...updatableFields);
+                                }
+                            }
                         }
-                        else
-                            yield colletion["UpdateObjectAsync"](i, false, updatableFields);
                     }
                 }
                 else {
                     if (subObj == undefined)
                         continue;
                     if (!Type_1.default.HasValue(Reflect.get(subObj, subPK))) {
-                        if (cascade || relations.filter(s => s == sub.Field))
-                            yield colletion["AddAsync"](subObj);
+                        if (cascade || relations.filter(s => s == sub.Field).length > 0) {
+                            let cs = objectsToAdd.filter(s => s.Type == subType);
+                            if (cs.length == 0)
+                                objectsToAdd.push({ Objs: [subObj], Type: subType, SubPK: subPK });
+                            else
+                                cs[0].Objs.push(subObj);
+                        }
                     }
-                    else
-                        yield colletion["UpdateObjectAsync"](subObj, false, updatableFields);
-                }
-                let columnType = Type_1.default.CastType(Type_1.default.GetDesingTimeTypeName(subType, subPK));
-                if ((relation === null || relation === void 0 ? void 0 : relation.Relation) == RelationType_1.RelationType.MANY_TO_MANY || (relation === null || relation === void 0 ? void 0 : relation.Relation) == RelationType_1.RelationType.ONE_TO_MANY || isArray)
-                    columnType = Type_1.default.AsArray(columnType);
-                if (subObj == undefined)
-                    continue;
-                let updateValues = [Reflect.get(subObj, subPK)];
-                if (isArray) {
-                    updateValues = [];
-                    for (let i of subObj) {
-                        if (i == undefined)
-                            continue;
-                        updateValues.push(Reflect.get(i, subPK));
+                    else {
+                        let cs = objectsToUpdate.filter(s => s.Type == subType);
+                        if (cs.length == 0)
+                            objectsToUpdate.push({ Objs: [{ Obj: subObj, UpdatableFields: updatableFields }], Type: subType, SubPK: subPK });
+                        else {
+                            let ccs = cs.filter(s => s.Objs.filter(j => j.Obj == subObj).length > 0);
+                            if (ccs.length == 0) {
+                                cs[0].Objs.push({ Obj: subObj, UpdatableFields: updatableFields });
+                            }
+                            else {
+                                ccs[0].Objs[0].UpdatableFields.push(...updatableFields);
+                            }
+                        }
                     }
                 }
-                subTypesUpdates.push(`"${sub.Column}" = ${this.CreateValueStatement(columnType, isArray ? updateValues : updateValues[0])}`);
+                buildSubupdates.push(() => {
+                    let spk = SchemasDecorators_1.default.ExtractPrimaryKey(subType);
+                    let columnType = Type_1.default.CastType(Type_1.default.GetDesingTimeTypeName(subType, spk));
+                    if ((relation === null || relation === void 0 ? void 0 : relation.Relation) == RelationType_1.RelationType.MANY_TO_MANY || (relation === null || relation === void 0 ? void 0 : relation.Relation) == RelationType_1.RelationType.ONE_TO_MANY || isArray)
+                        columnType = Type_1.default.AsArray(columnType);
+                    if (subObj == undefined)
+                        return;
+                    let updateValues = [Reflect.get(subObj, spk)];
+                    if (isArray) {
+                        updateValues = [];
+                        for (let i of subObj) {
+                            if (i == undefined)
+                                continue;
+                            updateValues.push(Reflect.get(i, spk));
+                        }
+                    }
+                    Type_1.default.InjectMetadata(obj, {
+                        Field: sub.Field,
+                        Type: columnType,
+                        Value: updateValues,
+                        Loaded: true
+                    });
+                    subTypesUpdates.push(`"${sub.Column}" = ${this.CreateValueStatement(columnType, isArray ? updateValues : updateValues[0])}`);
+                });
             }
+            objectsToAdd.forEach(o => {
+                o.Objs = o.Objs.filter((i, ix, s) => {
+                    return ix == s.findIndex(v => v == i);
+                });
+            });
+            for (let cs of objectsToAdd) {
+                let colletion = this._context.Collection(cs.Type);
+                for (let i of cs.Objs)
+                    yield colletion["AddObjectAsync"](i, true, [], visiteds);
+            }
+            for (let cs of objectsToUpdate) {
+                let colletion = this._context.Collection(cs.Type);
+                for (let i of cs.Objs)
+                    yield colletion["UpdateObjectAsync"](i.Obj, false, (_c = i.UpdatableFields) !== null && _c !== void 0 ? _c : [], [], visiteds);
+            }
+            for (let b of buildSubupdates)
+                b();
             if (subTypesUpdates.length > 0) {
                 let subUpdate = `update "${Type_1.default.GetTableName(this._type)}" set `;
                 for (let p of subTypesUpdates) {
@@ -381,12 +456,11 @@ class PGDBSet extends myorm_core_1.AbstractSet {
     }
     UpdateObjectAsync(obj, cascade, relationsAllowed, fieldsAllowed, visiteds = []) {
         return this.CreatePromisse(() => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c, _d;
             relationsAllowed = relationsAllowed !== null && relationsAllowed !== void 0 ? relationsAllowed : [];
             visiteds = visiteds !== null && visiteds !== void 0 ? visiteds : [];
             if (visiteds.indexOf(obj) > -1)
                 return obj;
-            visiteds.push(obj);
             if (!this.IsCorrectType(obj))
                 throw new InvalidOperationException_1.default(`The object passed as argument is not a ${this._type.name} instance`);
             if (!obj)
@@ -436,6 +510,11 @@ class PGDBSet extends myorm_core_1.AbstractSet {
                     continue;
                 values += `"${map.Column}" = ${this.CreateValueStatement(colType, Reflect.get(obj, map.Field))},`;
             }
+            if (key == undefined)
+                throw new InvalidOperationException_1.default(`The type ${this._type.name} must have a primary key column`);
+            if (visiteds.filter(s => s && s.constructor == obj.constructor && Reflect.get(s, key.Property) == Reflect.get(obj, key.Property)).length > 0)
+                return obj;
+            visiteds.push(obj);
             update = `${update} ${values.substring(0, values.length - 1)}`;
             for (let where of wheres) {
                 update += ` ${where.StatementType} ${this.EvaluateStatement(where)} `;
@@ -443,18 +522,20 @@ class PGDBSet extends myorm_core_1.AbstractSet {
             if (values.trim().length > 1)
                 yield this._manager.ExecuteNonQueryAsync(update);
             let subTypesUpdates = [];
+            let objectsToUpdate = [];
+            let objectsToAdd = [];
+            let buildSubupdates = [];
+            let updatableFields = [];
             for (let sub of subTypes) {
                 let subObj = Reflect.get(obj, sub.Field);
                 let metadata = Type_1.default.ExtractMetadata(obj);
                 let meta = metadata.filter(s => s.Field == sub.Field && s.Loaded);
+                let objetsToRemoveThisReferece = { HasRelation: false, IsArray: false, SubIsArray: false, SubField: "", Relation: undefined, SubRelation: undefined };
                 if (((meta.length > 0 && meta[0].Loaded) || relationsAllowed.filter(s => s == sub.Field).length > 0) && subObj == undefined) {
                     subTypesUpdates.push(`"${sub.Column}" = null`);
-                    continue;
                 }
                 if (meta.length == 0 && relationsAllowed.filter(s => s == sub.Field).length == 0)
                     continue;
-                if (meta.length > 0)
-                    relationsAllowed.push(meta[0].Field);
                 let relation = SchemasDecorators_1.default.GetRelationAttribute(this._type, sub.Field);
                 let subType = Type_1.default.GetDesingType(this._type, sub.Field);
                 if (!subType && !relation)
@@ -468,9 +549,11 @@ class PGDBSet extends myorm_core_1.AbstractSet {
                         continue;
                     subType = relation === null || relation === void 0 ? void 0 : relation.TypeBuilder();
                 }
-                let subPK = SchemasDecorators_1.default.ExtractPrimaryKey(subType);
-                if (subObj == undefined)
+                if (relationsAllowed.filter(s => s == sub.Field).length == 0 && this.GetChanges(meta, subObj, subType).length == 0)
                     continue;
+                if (meta.length > 0)
+                    relationsAllowed.push(meta[0].Field);
+                let subPK = SchemasDecorators_1.default.ExtractPrimaryKey(subType);
                 if (subPK == undefined)
                     throw new InvalidOperationException_1.default(`The type ${subType.name} must have a primary key column`);
                 if (key == undefined)
@@ -483,13 +566,24 @@ class PGDBSet extends myorm_core_1.AbstractSet {
                         if (subRelation && subRelation.TypeBuilder() == this._type) {
                             if (subRelation.Field != undefined && subRelation.Field != sub.Field)
                                 continue;
+                            updatableFields.push(subKey);
+                            objetsToRemoveThisReferece.HasRelation = true;
+                            objetsToRemoveThisReferece.Relation = relation;
+                            objetsToRemoveThisReferece.SubRelation = subRelation;
+                            objetsToRemoveThisReferece.SubField = subKey;
                             hasSubrelation = true;
                             if (subRelation.Relation == RelationType_1.RelationType.ONE_TO_MANY || subRelation.Relation == RelationType_1.RelationType.MANY_TO_MANY) {
+                                let subFKTypeIsArray = Type_1.default.GetDesingType(subType, subKey) == Array;
+                                objetsToRemoveThisReferece.IsArray = isArray;
+                                objetsToRemoveThisReferece.SubIsArray = subFKTypeIsArray;
+                                if (subObj == undefined || visiteds.indexOf(subObj) > -1)
+                                    continue;
                                 if (isArray) {
+                                    if (subObj == undefined)
+                                        continue;
                                     for (let i of subObj) {
-                                        if (i == undefined)
+                                        if (i == undefined || visiteds.indexOf(i) > -1)
                                             continue;
-                                        let subFKTypeIsArray = Type_1.default.GetDesingType(subType, subKey) == Array;
                                         if (subFKTypeIsArray) {
                                             let value = [];
                                             let subMeta = Type_1.default.ExtractMetadata(i);
@@ -511,7 +605,8 @@ class PGDBSet extends myorm_core_1.AbstractSet {
                                     }
                                 }
                                 else {
-                                    let subFKTypeIsArray = Type_1.default.GetDesingType(subType, subKey) == Array;
+                                    if (subObj == undefined || visiteds.indexOf(subObj) > -1)
+                                        continue;
                                     if (subFKTypeIsArray) {
                                         let value = [];
                                         let subMeta = Type_1.default.ExtractMetadata(subObj);
@@ -533,9 +628,11 @@ class PGDBSet extends myorm_core_1.AbstractSet {
                                 }
                             }
                             else {
+                                if (subObj == undefined || visiteds.indexOf(subObj) > -1)
+                                    continue;
                                 if (subRelation.Relation == RelationType_1.RelationType.MANY_TO_ONE) {
                                     for (let i of subObj) {
-                                        if (i == undefined)
+                                        if (i == undefined || visiteds.indexOf(i) > -1)
                                             continue;
                                         Reflect.set(i, subKey, obj);
                                     }
@@ -548,40 +645,124 @@ class PGDBSet extends myorm_core_1.AbstractSet {
                     }
                 }
                 let colletion = this._context.Collection(subType);
+                if (!hasSubrelation || (cascade || relationsAllowed.filter(s => s == sub.Field).length > 0))
+                    if (meta.length > 0 && objetsToRemoveThisReferece.HasRelation) {
+                        let v = meta[0].Value;
+                        let changes = this.GetChanges(meta, subObj, subType);
+                        if (v instanceof Array)
+                            meta[0].Value = meta[0].Value.filter((s) => changes.indexOf(s) == -1);
+                        else if (v == changes[0])
+                            meta[0].Loaded = false;
+                        for (let c of changes) {
+                            let item = yield colletion["Where"]({ Field: subPK, Value: c })["LoadRelationOn"](objetsToRemoveThisReferece.SubField)["FirstOrDefaultAsync"]();
+                            if (item) {
+                                if (objetsToRemoveThisReferece.SubIsArray) {
+                                    item[objetsToRemoveThisReferece.SubField] =
+                                        item[objetsToRemoveThisReferece.SubField].filter(s => s && Reflect.get(s, key.Property) != Reflect.get(obj, key.Property));
+                                }
+                                else if (((_c = objetsToRemoveThisReferece.SubRelation) === null || _c === void 0 ? void 0 : _c.Relation) != RelationType_1.RelationType.ONE_TO_MANY) {
+                                    item[objetsToRemoveThisReferece.SubField] = undefined;
+                                }
+                                yield colletion["UpdateObjectAsync"](item, false, [], [], visiteds);
+                            }
+                        }
+                    }
                 if (isArray) {
+                    if (subObj == undefined)
+                        continue;
                     for (let i of subObj) {
                         if (i == undefined)
                             continue;
-                        if (!Type_1.default.HasValue(Reflect.get(i, subPK)))
-                            yield colletion["AddAsync"](i);
-                        else if (!hasSubrelation || (cascade || relationsAllowed.filter(s => s == sub.Field).length > 0))
-                            yield colletion["UpdateObjectAsync"](i, false, [], [], visiteds);
+                        if (!Type_1.default.HasValue(Reflect.get(i, subPK))) {
+                            let cs = objectsToAdd.filter(s => s.Type == subType);
+                            if (cs.length == 0)
+                                objectsToAdd.push({ Objs: [i], Type: subType, SubPK: subPK });
+                            else
+                                cs[0].Objs.push(i);
+                        }
+                        else if (!hasSubrelation || (cascade || relationsAllowed.filter(s => s == sub.Field).length > 0)) {
+                            let cs = objectsToUpdate.filter(s => s.Type == subType);
+                            if (cs.length == 0)
+                                objectsToUpdate.push({ Objs: [{ Obj: i, UpdatableFields: updatableFields }], Type: subType, SubPK: subPK });
+                            else {
+                                let ccs = cs.filter(s => s.Objs.filter(j => j.Obj == i).length > 0);
+                                if (ccs.length == 0) {
+                                    cs[0].Objs.push({ Obj: i, UpdatableFields: updatableFields });
+                                }
+                                else {
+                                    ccs[0].Objs[0].UpdatableFields.push(...updatableFields);
+                                }
+                            }
+                        }
                     }
                 }
                 else {
                     if (subObj == undefined)
                         continue;
-                    if (!Type_1.default.HasValue(Reflect.get(subObj, subPK)))
-                        yield colletion["AddAsync"](subObj);
-                    else if (!hasSubrelation || (cascade || relationsAllowed.filter(s => s == sub.Field).length > 0))
-                        yield colletion["UpdateObjectAsync"](subObj, false, [], [], visiteds);
-                }
-                let columnType = Type_1.default.CastType(Type_1.default.GetDesingTimeTypeName(subType, subPK));
-                if ((relation === null || relation === void 0 ? void 0 : relation.Relation) == RelationType_1.RelationType.MANY_TO_MANY || (relation === null || relation === void 0 ? void 0 : relation.Relation) == RelationType_1.RelationType.ONE_TO_MANY)
-                    columnType = Type_1.default.AsArray(columnType);
-                if (subObj == undefined)
-                    continue;
-                let updateValues = [Reflect.get(subObj, subPK)];
-                if (isArray) {
-                    updateValues = [];
-                    for (let i of subObj) {
-                        if (i == undefined)
-                            continue;
-                        updateValues.push(Reflect.get(i, subPK));
+                    if (!Type_1.default.HasValue(Reflect.get(subObj, subPK))) {
+                        let cs = objectsToAdd.filter(s => s.Type == subType);
+                        if (cs.length == 0)
+                            objectsToAdd.push({ Objs: [subObj], Type: subType, SubPK: subPK });
+                        else
+                            cs[0].Objs.push(subObj);
+                    }
+                    else if (!hasSubrelation || (cascade || relationsAllowed.filter(s => s == sub.Field).length > 0)) {
+                        let cs = objectsToUpdate.filter(s => s.Type == subType);
+                        if (cs.length == 0)
+                            objectsToUpdate.push({ Objs: [{ Obj: subObj, UpdatableFields: updatableFields }], Type: subType, SubPK: subPK });
+                        else {
+                            let ccs = cs.filter(s => s.Objs.filter(j => j.Obj == subObj).length > 0);
+                            if (ccs.length == 0) {
+                                cs[0].Objs.push({ Obj: subObj, UpdatableFields: updatableFields });
+                            }
+                            else {
+                                ccs[0].Objs[0].UpdatableFields.push(...updatableFields);
+                            }
+                        }
                     }
                 }
-                subTypesUpdates.push(`"${sub.Column}" = ${this.CreateValueStatement(columnType, isArray ? updateValues : updateValues[0])}`);
+                buildSubupdates.push(() => {
+                    let spk = SchemasDecorators_1.default.ExtractPrimaryKey(subType);
+                    let columnType = Type_1.default.CastType(Type_1.default.GetDesingTimeTypeName(subType, spk));
+                    if ((relation === null || relation === void 0 ? void 0 : relation.Relation) == RelationType_1.RelationType.MANY_TO_MANY || (relation === null || relation === void 0 ? void 0 : relation.Relation) == RelationType_1.RelationType.ONE_TO_MANY || isArray)
+                        columnType = Type_1.default.AsArray(columnType);
+                    if (subObj == undefined)
+                        return;
+                    let updateValues = [Reflect.get(subObj, spk)];
+                    if (isArray) {
+                        updateValues = [];
+                        for (let i of subObj) {
+                            if (i == undefined)
+                                continue;
+                            updateValues.push(Reflect.get(i, spk));
+                        }
+                    }
+                    Type_1.default.InjectMetadata(obj, {
+                        Field: sub.Field,
+                        Type: columnType,
+                        Value: updateValues,
+                        Loaded: true
+                    });
+                    subTypesUpdates.push(`"${sub.Column}" = ${this.CreateValueStatement(columnType, isArray ? updateValues : updateValues[0])}`);
+                });
             }
+            objectsToAdd.forEach(o => {
+                o.Objs = o.Objs.filter((i, ix, s) => {
+                    return ix == s.findIndex(v => v == i);
+                });
+            });
+            for (let cs of objectsToAdd) {
+                let colletion = this._context.Collection(cs.Type);
+                for (let i of cs.Objs)
+                    yield colletion["AddObjectAsync"](i, true, [], visiteds);
+            }
+            for (let cs of objectsToUpdate) {
+                let colletion = this._context.Collection(cs.Type);
+                for (let i of cs.Objs)
+                    yield colletion["UpdateObjectAsync"](i.Obj, false, (_d = i.UpdatableFields) !== null && _d !== void 0 ? _d : [], [], visiteds);
+            }
+            for (let b of buildSubupdates)
+                b();
             if (subTypesUpdates.length > 0) {
                 let subUpdate = `update "${Type_1.default.GetTableName(this._type)}" set `;
                 for (let p of subTypesUpdates) {
@@ -601,6 +782,25 @@ class PGDBSet extends myorm_core_1.AbstractSet {
             return obj;
         }));
     }
+    GetChanges(meta, subObj, subType) {
+        let v = meta[0].Value;
+        let subPK = SchemasDecorators_1.default.ExtractPrimaryKey(subType);
+        let g = Reflect.get;
+        if (v == undefined)
+            return [];
+        if (v instanceof Array && subObj instanceof Array)
+            if (v.length == 0 || v.every(s => subObj.find(u => g(u, subPK) == s)))
+                return [];
+            else
+                return v.filter(s => !subObj.find(u => g(u, subPK) == s));
+        if (v instanceof Array && subObj == undefined)
+            return v;
+        if (v && subObj == undefined)
+            return [v];
+        if (v != g(subObj, subPK))
+            return [v];
+        return [];
+    }
     DeleteSelectionAsync() {
         return this.CreatePromisse(() => __awaiter(this, void 0, void 0, function* () {
             let whereSrt = PGSetHelper_1.default.ExtractWhereData(this);
@@ -718,14 +918,24 @@ class PGDBSet extends myorm_core_1.AbstractSet {
     CountAsync() {
         return __awaiter(this, void 0, void 0, function* () {
             return this.CreatePromisse(() => __awaiter(this, void 0, void 0, function* () {
+                let whereSrt = PGSetHelper_1.default.ExtractWhereData(this);
+                let sqlSrt = PGSetHelper_1.default.ExtractSQLData(this);
                 let query = `select count(*) from "${this._table}"`;
-                if (this._whereAsString != undefined && this._statements.length > 0) {
-                    throw new InvalidOperationException_1.default("Is not possible combine free and structured queries");
+                if (sqlSrt && sqlSrt.toLowerCase().trim().startsWith(`select distinct "${this._table}".*`)) {
+                    query = sqlSrt;
                 }
-                if (this._whereAsString != undefined) {
-                    query += ` ${this._whereAsString} `;
+                if (!whereSrt) {
+                    if (this._whereAsString != undefined && this._statements.length > 0) {
+                        throw new InvalidOperationException_1.default("Is not possible combine free and structured queries");
+                    }
+                    if (this._whereAsString != undefined) {
+                        query += ` ${this._whereAsString} `;
+                    }
+                    query += this.EvaluateWhere();
+                }
+                else {
+                    query += whereSrt;
                 }
-                query += this.EvaluateWhere();
                 let ordenation = "";
                 for (let orderby of this._ordering) {
                     ordenation += `${this.EvaluateOrderBy(orderby)},`;
@@ -739,11 +949,14 @@ class PGDBSet extends myorm_core_1.AbstractSet {
                 if (this._limit != undefined) {
                     query += ` limit ${this._limit.Limit}`;
                 }
+                if (sqlSrt && sqlSrt.toLowerCase().trim().startsWith(`select distinct "${this._table}".*`)) {
+                    query = `select count(*) from (${query}) as counter`;
+                }
                 var r = yield this._manager.ExecuteAsync(query);
                 this.Reset();
                 if (!r || r.rows.length == 0)
                     return 0;
-                return r.rows[0].count;
+                return Number.parseInt(r.rows[0].count);
             }));
         });
     }
@@ -1103,6 +1316,7 @@ class PGDBSet extends myorm_core_1.AbstractSet {
                             let colletion = this._context.Collection(type);
                             if (colletion == undefined)
                                 continue;
+                            colletion["Reset"]();
                             let subKey = SchemasDecorators_1.default.ExtractPrimaryKey(type);
                             if ((relation === null || relation === void 0 ? void 0 : relation.Relation) == RelationType_1.RelationType.MANY_TO_MANY || (relation === null || relation === void 0 ? void 0 : relation.Relation) == RelationType_1.RelationType.ONE_TO_MANY) {
                                 let values = Reflect.get(row, map.Column);