@mikro-orm/knex 5.7.15-dev.35 → 5.7.15-dev.37

package/AbstractSqlDriver.js

@@ -335,7 +335,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 const uniqueFields = core_1.Utils.isPlainObject(where) ? Object.keys(where) : meta.primaryKeys;
                 /* istanbul ignore next */
                 qb.insert(data)
-                    .onConflict(uniqueFields.map(p => meta?.properties[p]?.fieldNames[0] ?? p))
+                    .onConflict(uniqueFields)
                     .merge(Object.keys(data).filter(f => !uniqueFields.includes(f)))
                     .returning(meta?.comparableProps.filter(p => !p.lazy && !p.embeddable && !(p.name in data)).map(p => p.name) ?? '*');
             }
@@ -357,7 +357,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             const uniqueFields = core_1.Utils.isPlainObject(where[0]) ? Object.keys(where[0]) : meta.primaryKeys;
             const qb = this.createQueryBuilder(entityName, options.ctx, 'write', options.convertCustomTypes).withSchema(this.getSchemaName(meta, options));
             qb.insert(data)
-                .onConflict(uniqueFields.map(p => meta.properties[p]?.fieldNames[0] ?? p))
+                .onConflict(uniqueFields)
                 .merge(Object.keys(data[0]).filter(f => !uniqueFields.includes(f)))
                 .returning(meta.comparableProps.filter(p => !p.lazy && !p.embeddable && !(p.name in data[0])).map(p => p.name) ?? '*');
             return qb.execute('run', false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "5.7.15-dev.35",
+  "version": "5.7.15-dev.37",
   "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,9 +66,9 @@
     "@mikro-orm/core": "^5.7.14"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~5.7.15-dev.35",
-    "@mikro-orm/entity-generator": "~5.7.15-dev.35",
-    "@mikro-orm/migrations": "~5.7.15-dev.35",
+    "@mikro-orm/core": "~5.7.15-dev.37",
+    "@mikro-orm/entity-generator": "~5.7.15-dev.37",
+    "@mikro-orm/migrations": "~5.7.15-dev.37",
     "better-sqlite3": "*",
     "mssql": "*",
     "mysql": "*",

package/query/QueryBuilder.d.ts

@@ -34,7 +34,7 @@ export declare class QueryBuilder<T extends object = AnyEntity> {
     private readonly context?;
     private connectionType?;
     private readonly em?;
-    get mainAlias(): Alias;
+    get mainAlias(): Alias<T>;
     get alias(): string;
     get helper(): QueryBuilderHelper;
     /** @internal */

package/query/QueryBuilder.js

@@ -244,9 +244,16 @@ class QueryBuilder {
         return this;
     }
     onConflict(fields = []) {
+        const meta = this.mainAlias.metadata;
         this.ensureNotFinalized();
-        this._onConflict = this._onConflict || [];
-        this._onConflict.push({ fields: core_1.Utils.asArray(fields).map(f => f.toString()) });
+        this._onConflict ?? (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];
+            }),
+        });
         return this;
     }
     ignore() {

package/query/QueryBuilderHelper.d.ts

@@ -16,7 +16,7 @@ export declare class QueryBuilderHelper {
     private readonly driver;
     private readonly platform;
     private readonly metadata;
-    constructor(entityName: string, alias: string, aliasMap: Dictionary<Alias>, subQueries: Dictionary<string>, knex: Knex, driver: AbstractSqlDriver);
+    constructor(entityName: string, alias: string, aliasMap: Dictionary<Alias<any>>, subQueries: Dictionary<string>, knex: Knex, driver: AbstractSqlDriver);
     mapper(field: string | Knex.Raw, type?: QueryType): string;
     mapper(field: string | Knex.Raw, type?: QueryType, value?: any, alias?: string | null): string;
     processData(data: Dictionary, convertCustomTypes: boolean, multi?: boolean): any;
@@ -61,9 +61,9 @@ export declare class QueryBuilderHelper {
     isTableNameAliasRequired(type?: QueryType): boolean;
     private mapData;
 }
-export interface Alias {
+export interface Alias<T> {
     aliasName: string;
     entityName: string;
-    metadata?: EntityMetadata;
+    metadata?: EntityMetadata<T>;
     subQuery?: Knex.QueryBuilder;
 }

package/schema/DatabaseTable.d.ts

@@ -17,6 +17,7 @@ export declare class DatabaseTable {
     constructor(platform: AbstractSqlPlatform, name: string, schema?: string | undefined);
     getColumns(): Column[];
     getColumn(name: string): Column | undefined;
+    removeColumn(name: string): void;
     getIndexes(): Index[];
     getChecks(): Check[];
     init(cols: Column[], indexes: Index[] | undefined, checks: Check<unknown>[] | undefined, pks: string[], fks?: Dictionary<ForeignKey>, enums?: Dictionary<string[]>): void;

package/schema/DatabaseTable.js

@@ -24,6 +24,9 @@ class DatabaseTable {
     getColumn(name) {
         return this.columns[name];
     }
+    removeColumn(name) {
+        delete this.columns[name];
+    }
     getIndexes() {
         return this.indexes;
     }