@mikro-orm/knex 5.7.12-dev.4 → 5.7.12-dev.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AbstractSqlDriver.js +2 -2
- package/package.json +4 -4
package/AbstractSqlDriver.js
CHANGED
|
@@ -337,7 +337,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
|
|
|
337
337
|
qb.insert(data)
|
|
338
338
|
.onConflict(uniqueFields.map(p => meta?.properties[p]?.fieldNames[0] ?? p))
|
|
339
339
|
.merge(Object.keys(data).filter(f => !uniqueFields.includes(f)))
|
|
340
|
-
.returning(meta?.comparableProps.filter(p => !p.lazy && !(p.name in data)).map(p => p.name) ?? '*');
|
|
340
|
+
.returning(meta?.comparableProps.filter(p => !p.lazy && !p.embeddable && !(p.name in data)).map(p => p.name) ?? '*');
|
|
341
341
|
}
|
|
342
342
|
else {
|
|
343
343
|
qb.update(data).where(where);
|
|
@@ -359,7 +359,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
|
|
|
359
359
|
qb.insert(data)
|
|
360
360
|
.onConflict(uniqueFields.map(p => meta.properties[p]?.fieldNames[0] ?? p))
|
|
361
361
|
.merge(Object.keys(data[0]).filter(f => !uniqueFields.includes(f)))
|
|
362
|
-
.returning(meta.comparableProps.filter(p => !p.lazy && !(p.name in data[0])).map(p => p.name) ?? '*');
|
|
362
|
+
.returning(meta.comparableProps.filter(p => !p.lazy && !p.embeddable && !(p.name in data[0])).map(p => p.name) ?? '*');
|
|
363
363
|
return qb.execute('run', false);
|
|
364
364
|
}
|
|
365
365
|
const collections = options.processCollections ? data.map(d => this.extractManyToMany(entityName, d)) : [];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mikro-orm/knex",
|
|
3
|
-
"version": "5.7.12-dev.
|
|
3
|
+
"version": "5.7.12-dev.6",
|
|
4
4
|
"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.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"module": "index.mjs",
|
|
@@ -66,9 +66,9 @@
|
|
|
66
66
|
"@mikro-orm/core": "^5.7.11"
|
|
67
67
|
},
|
|
68
68
|
"peerDependencies": {
|
|
69
|
-
"@mikro-orm/core": "~5.7.12-dev.
|
|
70
|
-
"@mikro-orm/entity-generator": "~5.7.12-dev.
|
|
71
|
-
"@mikro-orm/migrations": "~5.7.12-dev.
|
|
69
|
+
"@mikro-orm/core": "~5.7.12-dev.6",
|
|
70
|
+
"@mikro-orm/entity-generator": "~5.7.12-dev.6",
|
|
71
|
+
"@mikro-orm/migrations": "~5.7.12-dev.6",
|
|
72
72
|
"better-sqlite3": "*",
|
|
73
73
|
"mssql": "*",
|
|
74
74
|
"mysql": "*",
|