@mikro-orm/knex 6.2.10-dev.30 → 6.2.10-dev.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.2.10-dev.30",
+  "version": "6.2.10-dev.32",
   "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.2.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.10-dev.30",
+    "@mikro-orm/core": "6.2.10-dev.32",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilder.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { inspect } from 'util';
 import type { Knex } from 'knex';
-import { type AnyEntity, type ConnectionType, type Dictionary, type EntityData, type EntityKey, type EntityMetadata, type EntityName, type EntityProperty, type FlushMode, type GroupOperator, type Loaded, LockMode, type LoggingOptions, type MetadataStorage, type ObjectQuery, PopulateHint, type PopulateOptions, type QBFilterQuery, type QBQueryOrderMap, QueryFlag, type QueryOrderMap, type QueryResult, type RequiredEntityData, type ExpandProperty } from '@mikro-orm/core';
+import { type AnyEntity, type ConnectionType, type Dictionary, type EntityData, type EntityKey, type EntityMetadata, type EntityName, type EntityProperty, type FlushMode, type GroupOperator, type Loaded, LockMode, type LoggingOptions, type MetadataStorage, type ObjectQuery, PopulateHint, type PopulateOptions, type QBFilterQuery, type QBQueryOrderMap, QueryFlag, type QueryOrderMap, type QueryResult, RawQueryFragment, type RequiredEntityData, type ExpandProperty } from '@mikro-orm/core';
 import { JoinType, QueryType } from './enums';
 import type { AbstractSqlDriver } from '../AbstractSqlDriver';
 import { type Alias, QueryBuilderHelper } from './QueryBuilderHelper';
@@ -88,7 +88,7 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
     protected _having: Dictionary;
     protected _returning?: Field<Entity>[];
     protected _onConflict?: {
-        fields: string[];
+        fields: string[] | RawQueryFragment;
         ignore?: boolean;
         merge?: EntityData<Entity> | Field<Entity>[];
         where?: QBFilterQuery<Entity>;

package/query/QueryBuilder.js

@@ -348,11 +348,13 @@ class QueryBuilder {
         this.ensureNotFinalized();
         this._onConflict ??= [];
         this._onConflict.push({
-            fields: core_1.Utils.asArray(fields).flatMap(f => {
-                const key = f.toString();
-                /* istanbul ignore next */
-                return meta.properties[key]?.fieldNames ?? [key];
-            }),
+            fields: core_1.Utils.isRawSql(fields)
+                ? fields
+                : core_1.Utils.asArray(fields).flatMap(f => {
+                    const key = f.toString();
+                    /* istanbul ignore next */
+                    return meta.properties[key]?.fieldNames ?? [key];
+                }),
         });
         return this;
     }

package/query/QueryBuilderHelper.d.ts

@@ -1,5 +1,5 @@
 import type { Knex } from 'knex';
-import { type Dictionary, type EntityData, type EntityKey, type EntityMetadata, type EntityProperty, type FlatQueryOrderMap, LockMode, type QBFilterQuery } from '@mikro-orm/core';
+import { type Dictionary, type EntityData, type EntityKey, type EntityMetadata, type EntityProperty, type FlatQueryOrderMap, LockMode, type QBFilterQuery, RawQueryFragment } from '@mikro-orm/core';
 import { JoinType, QueryType } from './enums';
 import type { Field, JoinOptions } from '../typings';
 import type { AbstractSqlDriver } from '../AbstractSqlDriver';
@@ -34,7 +34,7 @@ export declare class QueryBuilderHelper {
     isSimpleRegExp(re: any): re is RegExp;
     getRegExpParam(re: RegExp): string;
     appendOnConflictClause<T>(type: QueryType, onConflict: {
-        fields: string[];
+        fields: string[] | RawQueryFragment;
         ignore?: boolean;
         merge?: EntityData<T> | Field<T>[];
         where?: QBFilterQuery<T>;

package/query/QueryBuilderHelper.js

@@ -352,7 +352,16 @@ class QueryBuilderHelper {
     }
     appendOnConflictClause(type, onConflict, qb) {
         onConflict.forEach(item => {
-            const sub = item.fields.length > 0 ? qb.onConflict(item.fields) : qb.onConflict();
+            let sub;
+            if (core_1.Utils.isRawSql(item.fields)) {
+                sub = qb.onConflict(this.knex.raw(item.fields.sql, item.fields.params));
+            }
+            else if (item.fields.length > 0) {
+                sub = qb.onConflict(item.fields);
+            }
+            else {
+                sub = qb.onConflict();
+            }
             core_1.Utils.runIfNotEmpty(() => sub.ignore(), item.ignore);
             core_1.Utils.runIfNotEmpty(() => {
                 let mergeParam = item.merge;