@mikro-orm/knex 6.6.7-dev.2 → 6.6.7-dev.4
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 +6 -0
- package/package.json +2 -2
package/AbstractSqlDriver.js
CHANGED
|
@@ -534,6 +534,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
|
|
|
534
534
|
if (options.onConflictAction === 'ignore') {
|
|
535
535
|
qb.ignore();
|
|
536
536
|
}
|
|
537
|
+
if (options.onConflictWhere) {
|
|
538
|
+
qb.where(options.onConflictWhere);
|
|
539
|
+
}
|
|
537
540
|
}
|
|
538
541
|
else {
|
|
539
542
|
qb.update(data).where(where);
|
|
@@ -569,6 +572,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
|
|
|
569
572
|
if (options.onConflictAction === 'ignore') {
|
|
570
573
|
qb.ignore();
|
|
571
574
|
}
|
|
575
|
+
if (options.onConflictWhere) {
|
|
576
|
+
qb.where(options.onConflictWhere);
|
|
577
|
+
}
|
|
572
578
|
return this.rethrow(qb.execute('run', false));
|
|
573
579
|
}
|
|
574
580
|
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": "6.6.7-dev.
|
|
3
|
+
"version": "6.6.7-dev.4",
|
|
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,7 +66,7 @@
|
|
|
66
66
|
"@mikro-orm/core": "^6.6.6"
|
|
67
67
|
},
|
|
68
68
|
"peerDependencies": {
|
|
69
|
-
"@mikro-orm/core": "6.6.7-dev.
|
|
69
|
+
"@mikro-orm/core": "6.6.7-dev.4",
|
|
70
70
|
"better-sqlite3": "*",
|
|
71
71
|
"libsql": "*",
|
|
72
72
|
"mariadb": "*"
|