@mikro-orm/knex 6.3.14-dev.60 → 6.3.14-dev.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.3.14-dev.60",
+  "version": "6.3.14-dev.62",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,7 +66,7 @@
     "@mikro-orm/core": "^6.3.13"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.14-dev.60",
+    "@mikro-orm/core": "6.3.14-dev.62",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilder.js

@@ -314,7 +314,7 @@ class QueryBuilder {
             this._cond = { [op]: cond1 };
         }
         if (this._onConflict) {
-            this._onConflict[this._onConflict.length - 1].where = this._cond;
+            this._onConflict[this._onConflict.length - 1].where = this.helper.processOnConflictCondition(this._cond, this._schema);
             this._cond = {};
         }
         return this;

package/query/QueryBuilderHelper.d.ts

@@ -59,6 +59,7 @@ export declare class QueryBuilderHelper {
     private fieldName;
     getProperty(field: string, alias?: string): EntityProperty | undefined;
     isTableNameAliasRequired(type?: QueryType): boolean;
+    processOnConflictCondition(cond: QBFilterQuery, schema?: string): QBFilterQuery;
 }
 export interface Alias<T> {
     aliasName: string;

package/query/QueryBuilderHelper.js

@@ -731,5 +731,15 @@ class QueryBuilderHelper {
     isTableNameAliasRequired(type) {
         return [enums_1.QueryType.SELECT, enums_1.QueryType.COUNT].includes(type ?? enums_1.QueryType.SELECT);
     }
+    // workaround for https://github.com/knex/knex/issues/5257
+    processOnConflictCondition(cond, schema) {
+        const meta = this.metadata.get(this.entityName);
+        const tableName = this.driver.getTableName(meta, { schema }, false);
+        for (const key of Object.keys(cond)) {
+            const mapped = this.mapper(key, enums_1.QueryType.INSERT);
+            core_1.Utils.renameKey(cond, key, tableName + '.' + mapped);
+        }
+        return cond;
+    }
 }
 exports.QueryBuilderHelper = QueryBuilderHelper;