@mikro-orm/sql 7.1.9-dev.17 → 7.1.9-dev.19

package/AbstractSqlDriver.js

@@ -604,7 +604,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
         let pk;
         if (meta.primaryKeys.length > 1) {
             // owner has composite pk
-            pk = Utils.getPrimaryKeyCond(data, meta.primaryKeys);
+            pk = Utils.getOrderedPrimaryKeys(data, meta);
         }
         else {
             /* v8 ignore next */
@@ -887,10 +887,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
         }
         const res = await this.execute(sql, params, 'run', options.ctx, withAbortContext(options.loggerContext, options));
         let pk;
-        /* v8 ignore next */
         if (pks.length > 1) {
             // owner has composite pk
-            pk = data.map(d => Utils.getPrimaryKeyCond(d, pks));
+            pk = data.map(d => Utils.getOrderedPrimaryKeys(d, meta));
         }
         else {
             res.row ??= {};
@@ -949,8 +948,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             }
             res = await this.rethrow(qb.execute('run', false));
         }
-        /* v8 ignore next */
-        const pk = pks.map(pk => Utils.extractPK(data[pk] || where, meta));
+        const pk = Utils.getOrderedPrimaryKeys({ ...where, ...data }, meta);
         await this.processManyToMany(meta, pk, collections, true, options);
         return res;
     }
@@ -1113,7 +1111,8 @@ export class AbstractSqlDriver extends DatabaseDriver {
         }
         const res = await this.rethrow(this.execute(sql, params, 'run', options.ctx, withAbortContext(options.loggerContext, options)));
         for (let i = 0; i < collections.length; i++) {
-            await this.processManyToMany(meta, where[i], collections[i], false, options);
+            const pk = Utils.getOrderedPrimaryKeys(where[i], meta);
+            await this.processManyToMany(meta, pk, collections[i], false, options);
         }
         return res;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.9-dev.17",
+  "version": "7.1.9-dev.19",
   "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",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.1.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.9-dev.17"
+    "@mikro-orm/core": "7.1.9-dev.19"
   },
   "engines": {
     "node": ">= 22.17.0"

package/schema/SqlSchemaGenerator.d.ts

@@ -54,6 +54,8 @@ export declare class SqlSchemaGenerator extends AbstractSchemaGenerator<Abstract
         wrap?: boolean;
         ctx?: Transaction;
     }): Promise<void>;
+    /** Whether the statement has to be the first one in a query batch, e.g. `create trigger` on MSSQL. */
+    protected startsBatch(_statement: string): boolean;
     dropTableIfExists(name: string, schema?: string): Promise<void>;
     private wrapSchema;
     private append;

package/schema/SqlSchemaGenerator.js

@@ -443,14 +443,19 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
         const groups = [];
         let i = 0;
         for (const line of lines) {
-            if (line.trim() === '') {
+            const stmt = line.trim();
+            if (stmt === '') {
                 if (groups[i]?.length > 0) {
                     i++;
                 }
                 continue;
             }
+            // same boundary an empty line creates, for statements that have to start their own batch
+            if (groups[i]?.length > 0 && this.startsBatch(stmt)) {
+                i++;
+            }
             groups[i] ??= [];
-            groups[i].push(line.trim());
+            groups[i].push(stmt);
         }
         if (groups.length === 0) {
             return;
@@ -471,6 +476,10 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
         });
         await Utils.runSerial(statements, stmt => this.driver.execute(stmt));
     }
+    /** Whether the statement has to be the first one in a query batch, e.g. `create trigger` on MSSQL. */
+    startsBatch(_statement) {
+        return false;
+    }
     async dropTableIfExists(name, schema) {
         const sql = this.helper.dropTableIfExists(name, schema);
         return this.execute(sql);