@mikro-orm/knex 6.4.8-dev.9 → 6.4.9-dev.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.4.8-dev.9",
+  "version": "6.4.9-dev.0",
   "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.4.7"
+    "@mikro-orm/core": "^6.4.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.8-dev.9",
+    "@mikro-orm/core": "6.4.9-dev.0",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/schema/DatabaseTable.js

@@ -698,16 +698,28 @@ class DatabaseTable {
     }
     addIndex(meta, index, type) {
         const properties = core_1.Utils.unique(core_1.Utils.flatten(core_1.Utils.asArray(index.properties).map(prop => {
-            const root = prop.replace(/\..+$/, '');
+            const parts = prop.split('.');
+            const root = parts[0];
             if (meta.properties[prop]) {
                 if (meta.properties[prop].embeddedPath) {
                     return [meta.properties[prop].embeddedPath.join('.')];
                 }
                 return meta.properties[prop].fieldNames;
             }
+            const rootProp = meta.properties[root];
+            // inline embedded property index, we need to find the field name of the child property
+            if (rootProp?.embeddable && !rootProp.object && parts.length > 1) {
+                const expand = (p, i) => {
+                    if (parts.length === i) {
+                        return p.fieldNames[0];
+                    }
+                    return expand(p.embeddedProps[parts[i]], i + 1);
+                };
+                return [expand(rootProp, 1)];
+            }
             // json index, we need to rename the column only
-            if (meta.properties[root]) {
-                return [prop.replace(root, meta.properties[root].fieldNames[0])];
+            if (rootProp) {
+                return [prop.replace(root, rootProp.fieldNames[0])];
             }
             /* istanbul ignore next */
             return [prop];