@mikro-orm/sql 7.0.0-dev.167 → 7.0.0-dev.169

package/AbstractSqlDriver.js

@@ -573,6 +573,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 if (options.onConflictAction === 'ignore') {
                     qb.ignore();
                 }
+                if (options.onConflictWhere) {
+                    qb.where(options.onConflictWhere);
+                }
             }
             else {
                 qb.update(data).where(where);
@@ -608,6 +611,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
             if (options.onConflictAction === 'ignore') {
                 qb.ignore();
             }
+            if (options.onConflictWhere) {
+                qb.where(options.onConflictWhere);
+            }
             return this.rethrow(qb.execute('run', false));
         }
         const collections = options.processCollections ? data.map(d => this.extractManyToMany(meta, d)) : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.0-dev.167",
+  "version": "7.0.0-dev.169",
   "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.",
   "type": "module",
   "exports": {
@@ -56,6 +56,6 @@
     "@mikro-orm/core": "^6.6.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.167"
+    "@mikro-orm/core": "7.0.0-dev.169"
   }
 }

package/schema/DatabaseTable.js

@@ -1,4 +1,4 @@
-import { Cascade, DecimalType, EntitySchema, RawQueryFragment, ReferenceKind, t, Type, UnknownType, Utils, } from '@mikro-orm/core';
+import { DecimalType, EntitySchema, RawQueryFragment, ReferenceKind, t, Type, UnknownType, Utils, } from '@mikro-orm/core';
 /**
  * @internal
  */
@@ -117,23 +117,9 @@ export class DatabaseTable {
                     referencedColumnNames: prop.referencedColumnNames,
                     referencedTableName: schema ? `${schema}.${prop.referencedTableName}` : prop.referencedTableName,
                 };
-                const cascade = prop.cascade.includes(Cascade.REMOVE) || prop.cascade.includes(Cascade.ALL);
-                if (prop.deleteRule || cascade || prop.nullable) {
-                    this.foreignKeys[constraintName].deleteRule = prop.deleteRule || (cascade ? 'cascade' : 'set null');
-                }
-                if (prop.updateRule) {
-                    this.foreignKeys[constraintName].updateRule = prop.updateRule || 'cascade';
-                }
-                if ((prop.cascade.includes(Cascade.PERSIST) || prop.cascade.includes(Cascade.ALL))) {
-                    const hasCascadePath = Object.values(this.foreignKeys).some(fk => {
-                        return fk.constraintName !== constraintName
-                            && ((fk.updateRule && fk.updateRule !== 'no action') || (fk.deleteRule && fk.deleteRule !== 'no action'))
-                            && fk.referencedTableName === this.foreignKeys[constraintName].referencedTableName;
-                    });
-                    if (!hasCascadePath || this.platform.supportsMultipleCascadePaths()) {
-                        this.foreignKeys[constraintName].updateRule ??= 'cascade';
-                    }
-                }
+                const schemaConfig = config.get('schemaGenerator');
+                this.foreignKeys[constraintName].deleteRule = prop.deleteRule ?? schemaConfig.defaultDeleteRule;
+                this.foreignKeys[constraintName].updateRule = prop.updateRule ?? schemaConfig.defaultUpdateRule;
                 if (prop.deferMode) {
                     this.foreignKeys[constraintName].deferMode = prop.deferMode;
                 }

package/schema/SchemaHelper.d.ts

@@ -66,6 +66,8 @@ export declare abstract class SchemaHelper {
         skipTables?: (string | RegExp)[];
         skipColumns?: Dictionary<(string | RegExp)[]>;
         managementDbName?: string;
+        defaultUpdateRule?: "cascade" | "no action" | "set null" | "set default" | "restrict";
+        defaultDeleteRule?: "cascade" | "no action" | "set null" | "set default" | "restrict";
     };
     protected processComment(comment: string): string;
     protected quote(...keys: (string | undefined)[]): string;

package/schema/SqlSchemaGenerator.d.ts

@@ -11,6 +11,8 @@ export declare class SqlSchemaGenerator extends AbstractSchemaGenerator<Abstract
         skipTables?: (string | RegExp)[];
         skipColumns?: Dictionary<(string | RegExp)[]>;
         managementDbName?: string;
+        defaultUpdateRule?: "cascade" | "no action" | "set null" | "set default" | "restrict";
+        defaultDeleteRule?: "cascade" | "no action" | "set null" | "set default" | "restrict";
     };
     protected lastEnsuredDatabase?: string;
     static register(orm: MikroORM): void;