@mikro-orm/sql 7.2.1-dev.9 → 7.2.1

package/AbstractSqlDriver.js

@@ -352,6 +352,13 @@ export class AbstractSqlDriver extends DatabaseDriver {
             if (!prop) {
                 return;
             }
+            // A condition can join the target without selecting its columns. Keep the FK
+            // already mapped from the root row for reference-only owning to-one relations.
+            if (ref &&
+                !hint.filter &&
+                (prop.kind === ReferenceKind.MANY_TO_ONE || (prop.kind === ReferenceKind.ONE_TO_ONE && prop.owner))) {
+                return;
+            }
             // Polymorphic to-one: iterate targets, find the matching one, build entity from its columns.
             // Skip :ref hints — no JOINs were created, so the FK reference is already set by the result mapper.
             if (prop.polymorphic &&
@@ -400,7 +407,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 }
                 return;
             }
-            const pivotRefJoin = prop.kind === ReferenceKind.MANY_TO_MANY && ref;
+            const pivotRefJoin = prop.kind === ReferenceKind.MANY_TO_MANY && ref && !hint.filter;
             const meta2 = prop.targetMeta;
             let path = parentJoinPath ? `${parentJoinPath}.${prop.name}` : `${meta.name}.${prop.name}`;
             if (!parentJoinPath) {
@@ -765,9 +772,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 ? '(' + fields.map(k => this.platform.quoteIdentifier(k)).join(', ') + ')'
                 : `(${this.platform.quoteIdentifier(pks[0])})`;
         if (this.platform.usesOutputStatement()) {
-            const returningProps = this.getTableProps(meta)
-                .filter(prop => (prop.persist !== false && prop.defaultRaw) || prop.autoincrement || prop.generated)
-                .filter(prop => !(prop.name in data[0]) || isRaw(data[0][prop.name]));
+            const returningProps = this.getTableProps(meta).filter(prop => prop.returning ||
+                (((prop.persist !== false && prop.defaultRaw) || prop.autoincrement || prop.generated) &&
+                    (!(prop.name in data[0]) || isRaw(data[0][prop.name]))));
             const returningFields = Utils.flatten(returningProps.map(prop => prop.fieldNames));
             sql +=
                 returningFields.length > 0
@@ -885,9 +892,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 .join(', ');
         }
         if (meta && this.platform.usesReturningStatement()) {
-            const returningProps = this.getTableProps(meta)
-                .filter(prop => (prop.persist !== false && prop.defaultRaw) || prop.autoincrement || prop.generated)
-                .filter(prop => !(prop.name in data[0]) || isRaw(data[0][prop.name]));
+            const returningProps = this.getTableProps(meta).filter(prop => prop.returning ||
+                (((prop.persist !== false && prop.defaultRaw) || prop.autoincrement || prop.generated) &&
+                    (!(prop.name in data[0]) || isRaw(data[0][prop.name]))));
             const returningFields = Utils.flatten(returningProps.map(prop => prop.fieldNames));
             /* v8 ignore next */
             sql +=
@@ -1803,6 +1810,8 @@ export class AbstractSqlDriver extends DatabaseDriver {
         if (options.parentJoinPath) {
             // alias all fields in the primary table
             meta.props
+                // flattened children of inline embeddables are expanded via their parent, iterating them too would select the columns twice
+                .filter(prop => !prop.embedded)
                 .filter(prop => this.shouldHaveColumn(meta, prop, populate, options.explicitFields, options.exclude))
                 .forEach(prop => fields.push(...this.mapPropToFieldNames(qb, prop, options.parentTableAlias, meta, options.schema, options.explicitFields)));
         }
@@ -1861,7 +1870,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 continue;
             }
             const meta2 = prop.targetMeta;
-            const pivotRefJoin = prop.kind === ReferenceKind.MANY_TO_MANY && ref;
+            const pivotRefJoin = prop.kind === ReferenceKind.MANY_TO_MANY && ref && !hint.filter;
             const tableAlias = qb.getNextAlias(prop.name);
             const field = `${options.parentTableAlias}.${prop.name}`;
             let path = options.parentJoinPath ? `${options.parentJoinPath}.${prop.name}` : `${meta.name}.${prop.name}`;
@@ -1873,7 +1882,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 ? JoinType.pivotJoin
                 : hint.joinType
                     ? hint.joinType
-                    : (hint.filter && !prop.nullable) || mandatoryToOneProperty
+                    : (hint.filter && !prop.nullable && prop.kind !== ReferenceKind.MANY_TO_MANY) || mandatoryToOneProperty
                         ? JoinType.innerJoin
                         : JoinType.leftJoin;
             const schema = prop.targetMeta.schema === '*' ? (options?.schema ?? this.config.get('schema')) : prop.targetMeta.schema;
@@ -1941,7 +1950,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             // Add fields from this child (only ownProps, skip PKs)
             const schema = childMeta.schema === '*' ? '*' : this.getSchemaName(childMeta);
             childMeta
-                .ownProps.filter(p => !p.primary && this.platform.shouldHaveColumn(p, []))
+                .ownProps.filter(p => !p.primary && !p.embedded && this.platform.shouldHaveColumn(p, []))
                 .forEach(prop => fields.push(...this.mapPropToFieldNames(qb, prop, childAlias, childMeta, schema)));
         }
         // Add computed discriminator (descendants already sorted by depth)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.2.1-dev.9",
+  "version": "7.2.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",
@@ -47,13 +47,13 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "kysely": "0.29.5"
+    "kysely": "0.29.6"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.2.0"
+    "@mikro-orm/core": "^7.2.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.1-dev.9"
+    "@mikro-orm/core": "7.2.1"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/QueryBuilder.js

@@ -909,7 +909,7 @@ export class QueryBuilder {
                 .filter(prop => prop.returning || (prop.persist !== false && ((prop.primary && prop.autoincrement) || prop.defaultRaw)))
                 // a TPT table can only return its own columns
                 .filter(prop => meta.inheritanceType !== 'tpt' || prop.primary || meta.ownProps.some(p => p.name === prop.name))
-                .filter(prop => !data || !(prop.name in data));
+                .filter(prop => prop.returning || !data || !(prop.name in data));
             if (returningProps.length > 0) {
                 qb.returning(Utils.flatten(returningProps.map(prop => prop.fieldNames)));
             }
@@ -2505,7 +2505,7 @@ export class QueryBuilder {
         }
     }
     wrapModifySubQuery(meta) {
-        const subQuery = this.clone();
+        const subQuery = this.clone(['returning']);
         subQuery.#state.finalized = true;
         // wrap one more time to get around MySQL limitations
         // https://stackoverflow.com/questions/45494/mysql-error-1093-cant-specify-target-table-for-update-in-from-clause