@mikro-orm/core 6.4.4-dev.12 → 6.4.4-dev.14

package/EntityManager.js

@@ -607,6 +607,13 @@ class EntityManager {
      * If the entity is already present in current context, there won't be any queries - instead, the entity data will be assigned and an explicit `flush` will be required for those changes to be persisted.
      */
     async upsert(entityNameOrEntity, data, options = {}) {
+        if (options.disableIdentityMap ?? this.config.get('disableIdentityMap')) {
+            const em = this.getContext(false);
+            const fork = em.fork({ keepTransactionContext: true });
+            const ret = await fork.upsert(entityNameOrEntity, data, { ...options, disableIdentityMap: false });
+            fork.clear();
+            return ret;
+        }
         const em = this.getContext(false);
         em.prepareOptions(options);
         let entityName;
@@ -731,6 +738,13 @@ class EntityManager {
      * If the entity is already present in current context, there won't be any queries - instead, the entity data will be assigned and an explicit `flush` will be required for those changes to be persisted.
      */
     async upsertMany(entityNameOrEntity, data, options = {}) {
+        if (options.disableIdentityMap ?? this.config.get('disableIdentityMap')) {
+            const em = this.getContext(false);
+            const fork = em.fork({ keepTransactionContext: true });
+            const ret = await fork.upsertMany(entityNameOrEntity, data, { ...options, disableIdentityMap: false });
+            fork.clear();
+            return ret;
+        }
         const em = this.getContext(false);
         em.prepareOptions(options);
         let entityName;

package/drivers/IDatabaseDriver.d.ts

@@ -171,6 +171,7 @@ export interface UpsertOptions<Entity, Fields extends string = never> extends Om
     onConflictAction?: 'ignore' | 'merge';
     onConflictMergeFields?: AutoPath<Entity, Fields, `${PopulatePath.ALL}`>[];
     onConflictExcludeFields?: AutoPath<Entity, Fields, `${PopulatePath.ALL}`>[];
+    disableIdentityMap?: boolean;
 }
 export interface UpsertManyOptions<Entity, Fields extends string = never> extends UpsertOptions<Entity, Fields> {
     batchSize?: number;

package/entity/EntityValidator.js

@@ -5,6 +5,7 @@ const enums_1 = require("../enums");
 const Utils_1 = require("../utils/Utils");
 const errors_1 = require("../errors");
 const wrap_1 = require("./wrap");
+const RawQueryFragment_1 = require("../utils/RawQueryFragment");
 class EntityValidator {
     strict;
     KNOWN_TYPES = new Set(['string', 'number', 'boolean', 'bigint', 'Uint8Array', 'Date', 'Buffer', 'RegExp']);
@@ -54,7 +55,7 @@ class EntityValidator {
         }
     }
     validateProperty(prop, givenValue, entity) {
-        if (givenValue === null || givenValue === undefined) {
+        if (givenValue == null || givenValue instanceof RawQueryFragment_1.RawQueryFragment) {
             return givenValue;
         }
         const expectedType = prop.runtimeType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.4.4-dev.12",
+  "version": "6.4.4-dev.14",
   "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",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.3.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.4.4-dev.12",
+    "mikro-orm": "6.4.4-dev.14",
     "reflect-metadata": "0.2.2"
   }
 }