@mikro-orm/core 6.2.10-dev.4 → 6.2.10-dev.6
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.
|
@@ -771,9 +771,14 @@ class MetadataDiscovery {
|
|
|
771
771
|
return prop.embedded ? isParentObject(meta.properties[prop.embedded[0]]) : false;
|
|
772
772
|
};
|
|
773
773
|
const rootProperty = getRootProperty(embeddedProp);
|
|
774
|
+
const parentProperty = meta.properties[embeddedProp.embedded?.[0] ?? ''];
|
|
774
775
|
const object = isParentObject(embeddedProp);
|
|
775
776
|
this.initFieldName(embeddedProp, rootProperty !== embeddedProp && object);
|
|
776
|
-
const prefix = embeddedProp.prefix === false
|
|
777
|
+
const prefix = embeddedProp.prefix === false
|
|
778
|
+
? (parentProperty?.prefix || '')
|
|
779
|
+
: embeddedProp.prefix === true
|
|
780
|
+
? embeddedProp.embeddedPath?.join('_') ?? embeddedProp.fieldNames[0] + '_'
|
|
781
|
+
: embeddedProp.prefix;
|
|
777
782
|
for (const prop of Object.values(embeddable.properties)) {
|
|
778
783
|
const name = (embeddedProp.embeddedPath?.join('_') ?? embeddedProp.fieldNames[0] + '_') + prop.name;
|
|
779
784
|
meta.properties[name] = Utils_1.Utils.copy(prop, false);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mikro-orm/core",
|
|
3
|
-
"version": "6.2.10-dev.
|
|
3
|
+
"version": "6.2.10-dev.6",
|
|
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.2.10-dev.
|
|
67
|
+
"mikro-orm": "6.2.10-dev.6",
|
|
68
68
|
"reflect-metadata": "0.2.2"
|
|
69
69
|
}
|
|
70
70
|
}
|
|
@@ -544,7 +544,7 @@ class EntityComparator {
|
|
|
544
544
|
* perf: used to generate list of comparable properties during discovery, so we speed up the runtime comparison
|
|
545
545
|
*/
|
|
546
546
|
static isComparable(prop, root) {
|
|
547
|
-
const virtual = prop.persist === false;
|
|
547
|
+
const virtual = prop.persist === false || prop.generated;
|
|
548
548
|
const inverse = prop.kind === enums_1.ReferenceKind.ONE_TO_ONE && !prop.owner;
|
|
549
549
|
const discriminator = prop.name === root.discriminatorColumn;
|
|
550
550
|
const collection = prop.kind === enums_1.ReferenceKind.ONE_TO_MANY || prop.kind === enums_1.ReferenceKind.MANY_TO_MANY;
|