@mikro-orm/sql 7.2.1 → 7.2.2-dev.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.2.1",
+  "version": "7.2.2-dev.1",
   "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.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.1"
+    "@mikro-orm/core": "7.2.2-dev.1"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/QueryBuilder.js

@@ -1576,16 +1576,22 @@ export class QueryBuilder {
                 ret.push(getFieldName(aliased, customAlias));
                 return;
             }
-            if (prop?.kind === ReferenceKind.EMBEDDED) {
+            // 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 (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}').`);
                 }
                 const nest = (prop) => {
                     for (const childProp of Object.values(prop.embeddedProps)) {
-                        if (childProp.fieldNames &&
-                            (childProp.kind !== ReferenceKind.EMBEDDED || childProp.object) &&
-                            childProp.persist !== false) {
-                            ret.push(getFieldName(childProp.fieldNames[0]));
+                        if (childProp.persist === false) {
+                            continue;
+                        }
+                        if (childProp.fieldNames && (childProp.kind !== ReferenceKind.EMBEDDED || childProp.object)) {
+                            const name = childProp.fieldNames[0];
+                            ret.push(getFieldName(this.#state.aliases[a] ? `${a}.${name}` : name));
                         }
                         else {
                             nest(childProp);