@mikro-orm/core 7.1.15-dev.15 → 7.1.15-dev.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.1.15-dev.15",
+  "version": "7.1.15-dev.17",
   "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",

package/utils/Utils.js

@@ -153,7 +153,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.1.15-dev.15';
+    static #ORM_VERSION = '7.1.15-dev.17';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */

package/utils/upsert-utils.js

@@ -138,7 +138,14 @@ function getPropertyValue(obj, key) {
 }
 /** @internal */
 export function getWhereCondition(meta, onConflictFields, data, where) {
-    const unique = onConflictFields ?? meta.props.filter(p => p.unique).map(p => p.name);
+    // TPT children do not inherit the unique flags and indexes of their parent tables
+    const uniqueProps = new Set();
+    const uniques = [];
+    for (let current = meta; current; current = current.tptParent) {
+        current.props.filter(p => p.unique).forEach(p => uniqueProps.add(p.name));
+        uniques.push(...current.uniques);
+    }
+    const unique = onConflictFields ?? [...uniqueProps];
     const propIndex = !isRaw(unique) &&
         unique.findIndex(p => data[p] ?? data[p.substring(0, p.indexOf('.'))] != null);
     if (onConflictFields || where == null) {
@@ -152,8 +159,8 @@ export function getWhereCondition(meta, onConflictFields, data, where) {
             }
             where = { [key]: getPropertyValue(data, unique[propIndex]) };
         }
-        else if (meta.uniques.length > 0) {
-            for (const u of meta.uniques) {
+        else {
+            for (const u of uniques) {
                 if (Utils.asArray(u.properties).every(p => data[p] != null)) {
                     where = Utils.asArray(u.properties).reduce((o, key) => {
                         o[key] = data[key];