@mikro-orm/knex 6.0.0-dev.310 → 6.0.0-dev.311

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.310",
+  "version": "6.0.0-dev.311",
   "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",
@@ -66,6 +66,6 @@
     "@mikro-orm/core": "^5.0.0"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.0-dev.310"
+    "@mikro-orm/core": "6.0.0-dev.311"
   }
 }

package/schema/DatabaseTable.js

@@ -169,7 +169,7 @@ class DatabaseTable {
             const ret = { name: index.keyName };
             // Index is for FK. Map to the FK prop and move on.
             const fkForIndex = fkIndexes.get(index);
-            if (fkForIndex) {
+            if (fkForIndex && !fkForIndex.fk.columnNames.some(col => !index.columnNames.includes(col))) {
                 ret.properties = [this.getPropertyName(namingStrategy, fkForIndex.baseName, fkForIndex.fk)];
                 const map = index.unique ? compositeFkUniques : compositeFkIndexes;
                 map[ret.properties[0]] = { keyName: index.keyName };
@@ -348,15 +348,15 @@ class DatabaseTable {
             return index.columnNames.length >= fkColumnsLength && !currentFk.columnNames.some((columnName, i) => index.columnNames[i] !== columnName);
         });
         possibleIndexes.sort((a, b) => {
+            if (a.columnNames.length !== b.columnNames.length) {
+                return a.columnNames.length < b.columnNames.length ? -1 : 1;
+            }
             if (a.primary !== b.primary) {
                 return a.primary ? -1 : 1;
             }
             if (a.unique !== b.unique) {
                 return a.unique ? -1 : 1;
             }
-            if (a.columnNames.length !== b.columnNames.length) {
-                return a.columnNames.length < b.columnNames.length ? -1 : 1;
-            }
             return a.keyName.localeCompare(b.keyName);
         });
         return possibleIndexes[0];
@@ -522,6 +522,7 @@ class DatabaseTable {
             defaultRaw: this.getPropertyDefaultValue(schemaHelper, column, type, true),
             nullable: column.nullable,
             primary: column.primary && persist,
+            autoincrement: column.autoincrement,
             fieldName: column.name,
             length: column.length,
             precision: column.precision,