@mikro-orm/mysql 7.2.6-dev.2 → 7.2.6-dev.21

package/MySqlConnection.js

@@ -138,6 +138,9 @@ export class MySqlConnection extends AbstractSqlConnection {
     }
     async commit(ctx, eventBroadcaster) {
         if (!ctx.isRolledBack && 'savepointName' in ctx) {
+            if ('failedSavepointRollback' in ctx) {
+                throw ctx.failedSavepointRollback;
+            }
             try {
                 await ctx.releaseSavepoint(ctx.savepointName).execute();
             }

package/MySqlDriver.js

@@ -19,12 +19,22 @@ export class MySqlDriver extends AbstractSqlDriver {
     }
     async nativeInsertMany(entityName, data, options = {}) {
         options.processCollections ??= true;
-        const res = await super.nativeInsertMany(entityName, data, options);
         const meta = this.metadata.get(entityName);
+        const pk = meta.primaryKeys[0];
+        // mysql continues auto_increment from an explicit id, so a generated row after one starts a new insert
+        const split = data.findIndex((item, idx) => idx > 0 && item[pk] == null && data[idx - 1][pk] != null);
+        if (split > 0) {
+            const res = await this.nativeInsertMany(entityName, data.slice(0, split), options);
+            const rest = await this.nativeInsertMany(entityName, data.slice(split), options);
+            res.rows.push(...rest.rows);
+            res.affectedRows += rest.affectedRows;
+            return res;
+        }
+        const res = await super.nativeInsertMany(entityName, data, options);
         const pks = this.getPrimaryKeyFields(meta);
         const ctx = options.ctx;
         const autoIncrementIncrement = await this.getAutoIncrementIncrement(ctx);
-        data.forEach((item, idx) => (res.rows[idx] = { [pks[0]]: item[pks[0]] ?? res.insertId + idx * autoIncrementIncrement }));
+        data.forEach((item, idx) => (res.rows[idx] = { [pks[0]]: item[pk] ?? res.insertId + idx * autoIncrementIncrement }));
         res.row = res.rows[0];
         return res;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mysql",
-  "version": "7.2.6-dev.2",
+  "version": "7.2.6-dev.21",
   "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,16 +47,16 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/sql": "7.2.6-dev.2",
-    "kysely": "0.29.6",
-    "mysql2": "3.24.5",
+    "@mikro-orm/sql": "7.2.6-dev.21",
+    "kysely": "0.29.7",
+    "mysql2": "3.24.6",
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
     "@mikro-orm/core": "^7.2.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.6-dev.2"
+    "@mikro-orm/core": "7.2.6-dev.21"
   },
   "engines": {
     "node": ">= 22.17.0"