@mikro-orm/sql 7.2.6-dev.41 → 7.2.6-dev.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.2.6-dev.41",
+  "version": "7.2.6-dev.42",
   "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.",
   "keywords": [
     "data-mapper",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.2.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.6-dev.41"
+    "@mikro-orm/core": "7.2.6-dev.42"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/QueryBuilder.js

@@ -1569,6 +1569,19 @@ export class QueryBuilder {
             if (prop && [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(prop.kind)) {
                 return;
             }
+            // the joined strategy selects by column name, which can collide with the name of another property
+            const shadowed = customAlias &&
+                prop &&
+                (prop.kind === ReferenceKind.EMBEDDED ||
+                    (customAlias.endsWith(`__${f}`) && (prop.persist === false || !prop.fieldNames.includes(f)))) &&
+                (this.#state.aliases[a]?.meta ?? this.mainAlias.meta).props.some(p => p !== prop &&
+                    p.persist !== false &&
+                    (p.kind !== ReferenceKind.EMBEDDED || p.object) &&
+                    p.fieldNames?.includes(f));
+            if (shadowed) {
+                ret.push(raw('?? as ??', [`${a}.${f}`, customAlias]));
+                return;
+            }
             if (prop?.persist === false && !prop.embedded && !prop.formula && type === 'where') {
                 return;
             }
@@ -1578,11 +1591,7 @@ export class QueryBuilder {
                 ret.push(getFieldName(aliased, customAlias));
                 return;
             }
-            // the joined strategy selects by column name, which can collide with an inline embedded property name
-            const shadowed = customAlias &&
-                prop?.kind === ReferenceKind.EMBEDDED &&
-                (this.#state.aliases[a]?.meta ?? this.mainAlias.meta).props.some(p => (p.kind !== ReferenceKind.EMBEDDED || p.object) && p.fieldNames?.includes(f));
-            if (prop?.kind === ReferenceKind.EMBEDDED && !shadowed) {
+            if (prop?.kind === ReferenceKind.EMBEDDED) {
                 if (customAlias) {
                     throw new Error(`Cannot use 'as ${customAlias}' alias on embedded property '${field}' because it expands to multiple columns. Alias individual fields instead (e.g. '${field}.propertyName as ${customAlias}').`);
                 }