@mikro-orm/knex 7.0.0-dev.84 → 7.0.0-dev.86

package/AbstractSqlDriver.js

@@ -792,7 +792,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             }
             const tableName = `${schema ?? '_'}.${pivotMeta.tableName}`;
             const persister = groups[tableName] ??= new PivotCollectionPersister(pivotMeta, this, options?.ctx, schema, options?.loggerContext);
-            persister.enqueueUpdate(coll.property, insertDiff, deleteDiff, pks);
+            persister.enqueueUpdate(coll.property, insertDiff, deleteDiff, pks, coll.isInitialized());
         }
         for (const persister of Utils.values(groups)) {
             await this.rethrow(persister.execute());
@@ -1063,7 +1063,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
         if (prop.kind === ReferenceKind.EMBEDDED && !prop.object) {
             return Object.entries(prop.embeddedProps).flatMap(([name, childProp]) => {
                 const childFields = explicitFields ? Utils.extractChildElements(explicitFields, prop.name) : [];
-                if (childFields.length > 0 && !this.shouldHaveColumn(prop.targetMeta, { ...childProp, name }, [], childFields)) {
+                if (!this.shouldHaveColumn(prop.targetMeta, { ...childProp, name }, [], childFields.length > 0 ? childFields : undefined)) {
                     return [];
                 }
                 return this.mapPropToFieldNames(qb, childProp, tableAlias, childFields);

package/PivotCollectionPersister.d.ts

@@ -6,14 +6,17 @@ export declare class PivotCollectionPersister<Entity extends object> {
     private readonly ctx?;
     private readonly schema?;
     private readonly loggerContext?;
-    private readonly platform;
     private readonly inserts;
+    private readonly upserts;
     private readonly deletes;
     private readonly batchSize;
     private order;
     constructor(meta: EntityMetadata<Entity>, driver: AbstractSqlDriver, ctx?: Transaction | undefined, schema?: string | undefined, loggerContext?: Dictionary | undefined);
-    enqueueUpdate(prop: EntityProperty<Entity>, insertDiff: Primary<Entity>[][], deleteDiff: Primary<Entity>[][] | boolean, pks: Primary<Entity>[]): void;
+    enqueueUpdate(prop: EntityProperty<Entity>, insertDiff: Primary<Entity>[][], deleteDiff: Primary<Entity>[][] | boolean, pks: Primary<Entity>[], isInitialized?: boolean): void;
     private enqueueInsert;
+    private enqueueUpsert;
+    private createInsertStatement;
     private enqueueDelete;
+    private collectStatements;
     execute(): Promise<void>;
 }

package/PivotCollectionPersister.js

@@ -38,8 +38,8 @@ export class PivotCollectionPersister {
     ctx;
     schema;
     loggerContext;
-    platform;
     inserts = new Map();
+    upserts = new Map();
     deletes = new Map();
     batchSize;
     order = 0;
@@ -49,12 +49,16 @@ export class PivotCollectionPersister {
         this.ctx = ctx;
         this.schema = schema;
         this.loggerContext = loggerContext;
-        this.platform = this.driver.getPlatform();
         this.batchSize = this.driver.config.get('batchSize');
     }
-    enqueueUpdate(prop, insertDiff, deleteDiff, pks) {
+    enqueueUpdate(prop, insertDiff, deleteDiff, pks, isInitialized = true) {
         if (insertDiff.length) {
-            this.enqueueInsert(prop, insertDiff, pks);
+            if (isInitialized) {
+                this.enqueueInsert(prop, insertDiff, pks);
+            }
+            else {
+                this.enqueueUpsert(prop, insertDiff, pks);
+            }
         }
         if (deleteDiff === true || (Array.isArray(deleteDiff) && deleteDiff.length)) {
             this.enqueueDelete(prop, deleteDiff, pks);
@@ -62,17 +66,29 @@ export class PivotCollectionPersister {
     }
     enqueueInsert(prop, insertDiff, pks) {
         for (const fks of insertDiff) {
-            const data = prop.owner ? [...fks, ...pks] : [...pks, ...fks];
-            const keys = prop.owner
-                ? [...prop.inverseJoinColumns, ...prop.joinColumns]
-                : [...prop.joinColumns, ...prop.inverseJoinColumns];
-            const statement = new InsertStatement(keys, data, this.order++);
+            const statement = this.createInsertStatement(prop, fks, pks);
             const hash = statement.getHash();
             if (prop.owner || !this.inserts.has(hash)) {
                 this.inserts.set(hash, statement);
             }
         }
     }
+    enqueueUpsert(prop, insertDiff, pks) {
+        for (const fks of insertDiff) {
+            const statement = this.createInsertStatement(prop, fks, pks);
+            const hash = statement.getHash();
+            if (prop.owner || !this.upserts.has(hash)) {
+                this.upserts.set(hash, statement);
+            }
+        }
+    }
+    createInsertStatement(prop, fks, pks) {
+        const data = prop.owner ? [...fks, ...pks] : [...pks, ...fks];
+        const keys = prop.owner
+            ? [...prop.inverseJoinColumns, ...prop.joinColumns]
+            : [...prop.joinColumns, ...prop.inverseJoinColumns];
+        return new InsertStatement(keys, data, this.order++);
+    }
     enqueueDelete(prop, deleteDiff, pks) {
         if (deleteDiff === true) {
             const statement = new DeleteStatement(prop.joinColumns, pks);
@@ -88,6 +104,13 @@ export class PivotCollectionPersister {
             this.deletes.set(statement.getHash(), statement);
         }
     }
+    collectStatements(statements) {
+        const items = [];
+        for (const statement of statements.values()) {
+            items[statement.order] = statement.getData();
+        }
+        return items.filter(Boolean);
+    }
     async execute() {
         if (this.deletes.size > 0) {
             const deletes = [...this.deletes.values()];
@@ -104,23 +127,33 @@ export class PivotCollectionPersister {
                 });
             }
         }
-        if (this.inserts.size === 0) {
-            return;
-        }
-        let items = [];
-        for (const insert of this.inserts.values()) {
-            items[insert.order] = insert.getData();
+        if (this.inserts.size > 0) {
+            const filtered = this.collectStatements(this.inserts);
+            for (let i = 0; i < filtered.length; i += this.batchSize) {
+                const chunk = filtered.slice(i, i + this.batchSize);
+                await this.driver.nativeInsertMany(this.meta.className, chunk, {
+                    ctx: this.ctx,
+                    schema: this.schema,
+                    convertCustomTypes: false,
+                    processCollections: false,
+                    loggerContext: this.loggerContext,
+                });
+            }
         }
-        items = items.filter(i => i);
-        for (let i = 0; i < items.length; i += this.batchSize) {
-            const chunk = items.slice(i, i + this.batchSize);
-            await this.driver.nativeInsertMany(this.meta.className, chunk, {
-                ctx: this.ctx,
-                schema: this.schema,
-                convertCustomTypes: false,
-                processCollections: false,
-                loggerContext: this.loggerContext,
-            });
+        if (this.upserts.size > 0) {
+            const filtered = this.collectStatements(this.upserts);
+            for (let i = 0; i < filtered.length; i += this.batchSize) {
+                const chunk = filtered.slice(i, i + this.batchSize);
+                await this.driver.nativeUpdateMany(this.meta.className, [], chunk, {
+                    ctx: this.ctx,
+                    schema: this.schema,
+                    convertCustomTypes: false,
+                    processCollections: false,
+                    upsert: true,
+                    onConflictAction: 'ignore',
+                    loggerContext: this.loggerContext,
+                });
+            }
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "7.0.0-dev.84",
+  "version": "7.0.0-dev.86",
   "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.",
   "type": "module",
   "exports": {
@@ -54,9 +54,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.6.1"
+    "@mikro-orm/core": "^6.6.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.84"
+    "@mikro-orm/core": "7.0.0-dev.86"
   }
 }