@mikro-orm/core 6.3.12-dev.1 → 6.3.12-dev.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/entity/EntityLoader.js +5 -3
- package/package.json +2 -2
- package/utils/clone.js +1 -1
package/entity/EntityLoader.js
CHANGED
|
@@ -274,9 +274,11 @@ class EntityLoader {
|
|
|
274
274
|
}
|
|
275
275
|
mergePrimaryCondition(ids, pk, options, meta, metadata, platform) {
|
|
276
276
|
const cond1 = QueryHelper_1.QueryHelper.processWhere({ where: { [pk]: { $in: ids } }, entityName: meta.className, metadata, platform, convertCustomTypes: !options.convertCustomTypes });
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
277
|
+
const where = { ...options.where };
|
|
278
|
+
Utils_1.Utils.dropUndefinedProperties(where);
|
|
279
|
+
return where[pk]
|
|
280
|
+
? { $and: [cond1, where] }
|
|
281
|
+
: { ...cond1, ...where };
|
|
280
282
|
}
|
|
281
283
|
async populateField(entityName, entities, populate, options) {
|
|
282
284
|
const field = populate.field.split(':')[0];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mikro-orm/core",
|
|
3
|
-
"version": "6.3.12-dev.
|
|
3
|
+
"version": "6.3.12-dev.3",
|
|
4
4
|
"description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"module": "index.mjs",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"esprima": "4.0.1",
|
|
65
65
|
"fs-extra": "11.2.0",
|
|
66
66
|
"globby": "11.1.0",
|
|
67
|
-
"mikro-orm": "6.3.12-dev.
|
|
67
|
+
"mikro-orm": "6.3.12-dev.3",
|
|
68
68
|
"reflect-metadata": "0.2.2"
|
|
69
69
|
}
|
|
70
70
|
}
|
package/utils/clone.js
CHANGED
|
@@ -75,7 +75,7 @@ function clone(parent, respectCustomCloneMethod = true) {
|
|
|
75
75
|
child.lastIndex = parent.lastIndex;
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
|
-
else if (parent instanceof Date) {
|
|
78
|
+
else if (parent instanceof Date || (typeof parent === 'object' && parent.constructor.name === 'Date')) {
|
|
79
79
|
child = new Date(parent.getTime());
|
|
80
80
|
}
|
|
81
81
|
else if (Buffer.isBuffer(parent)) {
|