@mikro-orm/knex 6.0.0-dev.180 → 6.0.0-dev.182

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.180",
+  "version": "6.0.0-dev.182",
   "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.9.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.0-dev.180"
+    "@mikro-orm/core": "6.0.0-dev.182"
   }
 }

package/schema/DatabaseTable.js

@@ -162,7 +162,9 @@ class DatabaseTable {
             && (index.columnNames.length > 1 // All composite indexes are to be mapped to entity decorators or FK props.
                 || !(index.columnNames[0] in columnFks) // Non-composite indexes for scalar props are to be mapped to the column.
                 || skippedColumnNames.includes(index.columnNames[0]) // Non-composite indexes for skipped columns are to be mapped as entity decorators.
-            ));
+            )
+            // ignore indexes that don't have all column names (this can happen in sqlite where there is no way to infer this for expressions)
+            && !index.columnNames.some(col => col === null));
         for (const index of potentiallyUnmappedIndexes) {
             const ret = { name: index.keyName };
             // Index is for FK. Map to the FK prop and move on.
@@ -375,9 +377,7 @@ class DatabaseTable {
             // If the prop named after the column has a FK and the FK's columns are a subset of this index,
             // include this prop and move on.
             const columnPropFk = fksOnColumnProps.get(columnName);
-            if (columnPropFk && !columnPropFk.columnNames.some(fkColumnName => {
-                return !columnNames.includes(fkColumnName);
-            })) {
+            if (columnPropFk && !columnPropFk.columnNames.some(fkColumnName => !columnNames.includes(fkColumnName))) {
                 propBaseNames.add(columnName);
                 continue;
             }
@@ -389,9 +389,7 @@ class DatabaseTable {
                 if (!columnFks[columnName].includes(fk)) {
                     continue;
                 }
-                if (!fk.columnNames.some(fkColumnName => {
-                    return !columnNames.includes(fkColumnName);
-                })) {
+                if (!fk.columnNames.some(fkColumnName => !columnNames.includes(fkColumnName))) {
                     propBaseNames.add(propName);
                     propAdded = true;
                 }