@mikro-orm/sql 7.2.6-dev.2 → 7.2.6-dev.20

package/AbstractSqlConnection.js

@@ -130,6 +130,10 @@ export class AbstractSqlConnection extends Connection {
             }
             catch (rollbackError) {
                 this.logger.warn('query', `Failed to roll back transaction: ${rollbackError.message}`);
+                // the inner writes are still part of the outer transaction, so it must not commit them
+                if (options.ctx) {
+                    options.ctx.failedSavepointRollback ??= new Error(`Cannot commit the transaction, rolling back to savepoint "${trx.savepointName}" failed: ${rollbackError.message}`, { cause: rollbackError });
+                }
             }
             throw error;
         }
@@ -203,6 +207,9 @@ export class AbstractSqlConnection extends Connection {
         if (ctx.isRolledBack) {
             return;
         }
+        if ('failedSavepointRollback' in ctx) {
+            throw ctx.failedSavepointRollback;
+        }
         await eventBroadcaster?.dispatchEvent(EventType.beforeTransactionCommit, ctx);
         if ('savepointName' in ctx) {
             await ctx.releaseSavepoint(ctx.savepointName).execute();

package/AbstractSqlDriver.js

@@ -825,11 +825,11 @@ export class AbstractSqlDriver extends DatabaseDriver {
                     value = this.platform.cloneEmbeddable(value);
                     for (let i = 0; i < value.length; i++) {
                         const item = value[i];
-                        value[i] = this.mapDataToFieldNames(item, false, prop.embeddedProps, options.convertCustomTypes);
+                        value[i] = this.mapDataToFieldNames(item, false, this.variantProps(prop, item), options.convertCustomTypes);
                     }
                 }
                 else {
-                    value = this.mapDataToFieldNames(value, false, prop.embeddedProps, options.convertCustomTypes);
+                    value = this.mapDataToFieldNames(value, false, this.variantProps(prop, value), options.convertCustomTypes);
                 }
             }
             if (typeof value === 'undefined' && this.platform.usesDefaultKeyword()) {
@@ -1095,11 +1095,11 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 if (prop.array && value) {
                     for (let i = 0; i < value.length; i++) {
                         const item = value[i];
-                        value[i] = this.mapDataToFieldNames(item, false, prop.embeddedProps, options.convertCustomTypes);
+                        value[i] = this.mapDataToFieldNames(item, false, this.variantProps(prop, item), options.convertCustomTypes);
                     }
                 }
                 else {
-                    value = this.mapDataToFieldNames(value, false, prop.embeddedProps, options.convertCustomTypes);
+                    value = this.mapDataToFieldNames(value, false, this.variantProps(prop, value), options.convertCustomTypes);
                 }
             }
             params.push(value ?? null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.2.6-dev.2",
+  "version": "7.2.6-dev.20",
   "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.6"
+    "kysely": "0.29.7"
   },
   "devDependencies": {
     "@mikro-orm/core": "^7.2.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.6-dev.2"
+    "@mikro-orm/core": "7.2.6-dev.20"
   },
   "engines": {
     "node": ">= 22.17.0"

package/schema/SchemaComparator.js

@@ -866,16 +866,10 @@ export class SchemaComparator {
         if (cols1.length === 0 && cols2.length === 0) {
             return true;
         }
-        // If only one has column options, they don't match
-        if (cols1.length !== cols2.length) {
-            return false;
-        }
-        // Compare each column's options
-        // Note: We don't check c1.name !== c2.name because the indexes already have matching columnNames
-        // and the columns array is derived from those same column names
-        for (let i = 0; i < cols1.length; i++) {
-            const c1 = cols1[i];
-            const c2 = cols2[i];
+        // introspection may omit entries for columns with default options, so match them by name
+        for (const name of index1.columnNames) {
+            const c1 = cols1.find(c => c.name === name) ?? { name };
+            const c2 = cols2.find(c => c.name === name) ?? { name };
             const sort1 = c1.sort?.toUpperCase() ?? 'ASC';
             const sort2 = c2.sort?.toUpperCase() ?? 'ASC';
             if (sort1 !== sort2) {