@mikro-orm/knex 5.7.10-dev.0 → 5.7.10-dev.2

package/AbstractSqlDriver.d.ts

@@ -55,7 +55,7 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     }): ConnectionType;
     protected extractManyToMany<T>(entityName: string, data: EntityDictionary<T>): EntityData<T>;
     protected processManyToMany<T extends object>(meta: EntityMetadata<T> | undefined, pks: Primary<T>[], collections: EntityData<T>, clear: boolean, options?: DriverMethodOptions): Promise<void>;
-    protected updateCollectionDiff<T extends object, O extends object>(meta: EntityMetadata<O>, prop: EntityProperty<T>, pks: Primary<O>[], deleteDiff: Primary<T>[][] | boolean, insertDiff: Primary<T>[][], options?: DriverMethodOptions & {
+    protected updateCollectionDiff<T extends object, O extends object>(meta: EntityMetadata<O>, prop: EntityProperty<O>, pks: Primary<O>[], deleteDiff: Primary<T>[][] | boolean, insertDiff: Primary<T>[][], options?: DriverMethodOptions & {
         ownerSchema?: string;
     }): Promise<void>;
     lockPessimistic<T>(entity: T, options: LockOptions): Promise<void>;

package/AbstractSqlDriver.js

@@ -337,7 +337,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 qb.insert(data)
                     .onConflict(uniqueFields.map(p => meta?.properties[p]?.fieldNames[0] ?? p))
                     .merge(Object.keys(data).filter(f => !uniqueFields.includes(f)))
-                    .returning(meta?.hydrateProps.filter(p => !p.lazy && !(p.name in data)).map(p => p.name) ?? '*');
+                    .returning(meta?.comparableProps.filter(p => !p.lazy && !(p.name in data)).map(p => p.name) ?? '*');
             }
             else {
                 qb.update(data).where(where);
@@ -359,7 +359,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             qb.insert(data)
                 .onConflict(uniqueFields.map(p => meta.properties[p]?.fieldNames[0] ?? p))
                 .merge(Object.keys(data[0]).filter(f => !uniqueFields.includes(f)))
-                .returning(meta.hydrateProps.filter(p => !p.lazy && !(p.name in data[0])).map(p => p.name) ?? '*');
+                .returning(meta.comparableProps.filter(p => !p.lazy && !(p.name in data[0])).map(p => p.name) ?? '*');
             return qb.execute('run', false);
         }
         const collections = options.processCollections ? data.map(d => this.extractManyToMany(entityName, d)) : [];

package/package.json

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