@mikro-orm/knex 6.1.12-dev.9 → 6.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.1.12-dev.9",
+  "version": "6.1.12",
   "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,9 +63,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.1.11"
+    "@mikro-orm/core": "^6.1.12"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.1.12-dev.9"
+    "@mikro-orm/core": "^6.0.0"
   }
 }

package/schema/DatabaseTable.js

@@ -465,7 +465,7 @@ class DatabaseTable {
     }
     getForeignKeyDeclaration(fk, namingStrategy, schemaHelper, fkIndex, nullable, propNameBase) {
         const prop = this.getPropertyName(namingStrategy, propNameBase, fk);
-        const kind = (fkIndex.unique && !fkIndex.primary) ? this.getReferenceKind(fk, fkIndex) : this.getReferenceKind(fk);
+        const kind = (fkIndex?.unique && !fkIndex.primary) ? this.getReferenceKind(fk, fkIndex) : this.getReferenceKind(fk);
         const type = this.getPropertyTypeForForeignKey(namingStrategy, fk);
         const fkOptions = {};
         fkOptions.fieldNames = fk.columnNames;
@@ -497,9 +497,9 @@ class DatabaseTable {
             kind,
             ...columnOptions,
             nullable,
-            primary: fkIndex.primary || !fk.columnNames.some(columnName => !this.getPrimaryKey()?.columnNames.includes(columnName)),
-            index: !fkIndex.unique ? fkIndex.keyName : undefined,
-            unique: (fkIndex.unique && !fkIndex.primary) ? fkIndex.keyName : undefined,
+            primary: fkIndex?.primary || !fk.columnNames.some(columnName => !this.getPrimaryKey()?.columnNames.includes(columnName)),
+            index: !fkIndex?.unique ? fkIndex?.keyName : undefined,
+            unique: (fkIndex?.unique && !fkIndex.primary) ? fkIndex.keyName : undefined,
             ...fkOptions,
         };
     }

package/schema/SchemaHelper.js

@@ -187,8 +187,12 @@ class SchemaHelper {
     mapForeignKeys(fks, tableName, schemaName) {
         return fks.reduce((ret, fk) => {
             if (ret[fk.constraint_name]) {
-                ret[fk.constraint_name].columnNames.push(fk.column_name);
-                ret[fk.constraint_name].referencedColumnNames.push(fk.referenced_column_name);
+                if (!ret[fk.constraint_name].columnNames.includes(fk.column_name)) {
+                    ret[fk.constraint_name].columnNames.push(fk.column_name);
+                }
+                if (!ret[fk.constraint_name].referencedColumnNames.includes(fk.referenced_column_name)) {
+                    ret[fk.constraint_name].referencedColumnNames.push(fk.referenced_column_name);
+                }
             }
             else {
                 ret[fk.constraint_name] = {