@mikro-orm/knex 5.7.15-dev.32 → 5.7.15-dev.33

package/AbstractSqlDriver.js

@@ -461,11 +461,23 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         if (coll.property.reference === core_1.ReferenceType.ONE_TO_MANY) {
             const cols = coll.property.referencedColumnNames;
             const qb = this.createQueryBuilder(coll.property.type, ctx, 'write')
-                .withSchema(this.getSchemaName(meta, options))
-                .update({ [coll.property.mappedBy]: pks })
+                .withSchema(this.getSchemaName(meta, options));
+            if (coll.getSnapshot() === undefined) {
+                if (coll.property.orphanRemoval) {
+                    const kqb = qb.delete({ [coll.property.mappedBy]: pks })
+                        .getKnexQuery()
+                        .whereNotIn(cols, insertDiff);
+                    return this.rethrow(this.execute(kqb));
+                }
+                const kqb = qb.update({ [coll.property.mappedBy]: null })
+                    .getKnexQuery()
+                    .whereNotIn(cols, insertDiff);
+                return this.rethrow(this.execute(kqb));
+            }
+            const kqb = qb.update({ [coll.property.mappedBy]: pks })
                 .getKnexQuery()
                 .whereIn(cols, insertDiff);
-            return this.rethrow(this.execute(qb));
+            return this.rethrow(this.execute(kqb));
         }
         /* istanbul ignore next */
         const ownerSchema = wrapped.getSchema() === '*' ? this.config.get('schema') : wrapped.getSchema();
@@ -754,7 +766,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         if (prop.reference === core_1.ReferenceType.EMBEDDED) {
             if (prop.object) {
-                ret.push(prop.fieldNames[0]);
+                ret.push(prop.name);
                 return;
             }
             const parts = field.split('.');
@@ -766,13 +778,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             }
             return;
         }
-        if (prop.formula) {
-            ret.push(prop.name);
-            return;
-        }
-        if (prop.fieldNames) {
-            ret.push(...prop.fieldNames);
-        }
+        ret.push(prop.name);
     }
     buildFields(meta, populate, joinedProps, qb, fields) {
         const lazyProps = meta.props.filter(prop => prop.lazy && !populate.some(p => p.field === prop.name || p.all));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "5.7.15-dev.32",
+  "version": "5.7.15-dev.33",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,9 +66,9 @@
     "@mikro-orm/core": "^5.7.14"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~5.7.15-dev.32",
-    "@mikro-orm/entity-generator": "~5.7.15-dev.32",
-    "@mikro-orm/migrations": "~5.7.15-dev.32",
+    "@mikro-orm/core": "~5.7.15-dev.33",
+    "@mikro-orm/entity-generator": "~5.7.15-dev.33",
+    "@mikro-orm/migrations": "~5.7.15-dev.33",
     "better-sqlite3": "*",
     "mssql": "*",
     "mysql": "*",

package/query/QueryBuilder.js

@@ -686,6 +686,10 @@ class QueryBuilder {
                 }
                 return;
             }
+            if (prop && prop.fieldNames.length > 1) {
+                ret.push(...prop.fieldNames.map(f => this.helper.mapper(f, this.type)));
+                return;
+            }
             ret.push(this.helper.mapper(field, this.type));
         });
         const meta = this.mainAlias.metadata;