@mikro-orm/knex - npm Package Compare versions

Comparing version 6.4.7-dev.18 to 6.4.7-dev.19

dialects/mssql/MsSqlQueryCompiler.js

@@ -62,8 +62,11 @@ "use strict";
     _mergeOn(conflict) {
-        let sql = 'on 1=1';
-        if (Array.isArray(conflict)) {
-            const conflictColumn = this.formatter.columnize(conflict[0]);
-            sql = `on ${this.tableName}.${conflictColumn} = tsource.${conflictColumn}`;
+        if (!Array.isArray(conflict)) {
+            return 'on 1=1';
         }
-        return sql;
+        const parts = [];
+        for (const col of conflict) {
+            const conflictColumn = this.formatter.columnize(col);
+            parts.push(`${this.tableName}.${conflictColumn} = tsource.${conflictColumn}`);
+        }
+        return `on ${parts.join(' and ')}`;
     }
@@ -70,0 +73,0 @@ _insertWithMerge() {

package.json

 {
   "name": "@mikro-orm/knex",
-  "version": "6.4.7-dev.18",
+  "version": "6.4.7-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.",
@@ -69,3 +69,3 @@ "main": "index.js",
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.7-dev.18",
+    "@mikro-orm/core": "6.4.7-dev.19",
     "better-sqlite3": "*",
@@ -72,0 +72,0 @@ "libsql": "*",

No alert changes

Improved metrics

Total package byte prevSize

519066

increased by0.02%

Lines of code

10572

increased by0.03%

No dependency changes