@mikro-orm/knex 6.3.6-dev.2 → 6.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.3.6-dev.2",
+  "version": "6.3.6",
   "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",
@@ -63,10 +63,10 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.3.5"
+    "@mikro-orm/core": "^6.3.6"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.6-dev.2",
+    "@mikro-orm/core": "^6.0.0",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/schema/SchemaComparator.d.ts

@@ -34,7 +34,7 @@ export declare class SchemaComparator {
      * however ambiguities between different possibilities should not lead to renaming at all.
      */
     private detectIndexRenamings;
-    diffForeignKey(key1: ForeignKey, key2: ForeignKey): boolean;
+    diffForeignKey(key1: ForeignKey, key2: ForeignKey, tableDifferences: TableDifference): boolean;
     /**
      * Returns the difference between the columns
      * If there are differences this method returns field2, otherwise the boolean false.

package/schema/SchemaComparator.js

@@ -248,7 +248,7 @@ class SchemaComparator {
         const toForeignKeys = { ...toTable.getForeignKeys() };
         for (const fromConstraint of Object.values(fromForeignKeys)) {
             for (const toConstraint of Object.values(toForeignKeys)) {
-                if (!this.diffForeignKey(fromConstraint, toConstraint)) {
+                if (!this.diffForeignKey(fromConstraint, toConstraint, tableDifferences)) {
                     delete fromForeignKeys[fromConstraint.constraintName];
                     delete toForeignKeys[toConstraint.constraintName];
                 }
@@ -351,7 +351,7 @@ class SchemaComparator {
             this.log(`renamed index detected in table ${tableDifferences.name}`, { old: removedIndexName, new: addedIndexName });
         }
     }
-    diffForeignKey(key1, key2) {
+    diffForeignKey(key1, key2, tableDifferences) {
         if (key1.columnNames.join('~').toLowerCase() !== key2.columnNames.join('~').toLowerCase()) {
             return true;
         }
@@ -367,6 +367,9 @@ class SchemaComparator {
         if (key1.localTableName === key1.referencedTableName && !this.platform.supportsMultipleCascadePaths()) {
             return false;
         }
+        if (key1.columnNames.some(col => tableDifferences.changedColumns[col]?.changedProperties.has('type'))) {
+            return true;
+        }
         const defaultRule = ['restrict', 'no action'];
         const rule = (key, method) => {
             return (key[method] ?? defaultRule[0])