@mikro-orm/entity-generator 6.4.3-dev.7 → 6.4.3-dev.9

package/EntityGenerator.js

@@ -65,11 +65,11 @@ class EntityGenerator {
             .map(table => {
             const skipColumns = options.skipColumns?.[table.getShortestName()];
             if (skipColumns) {
-                table.getColumns().forEach(col => {
+                for (const col of table.getColumns()) {
                     if (skipColumns.some(matchColumnName => this.matchName(col.name, matchColumnName))) {
                         table.removeColumn(col.name);
                     }
-                });
+                }
             }
             return table.getEntityDeclaration(this.namingStrategy, this.helper, options.scalarPropertiesForRelations);
         });
@@ -82,6 +82,13 @@ class EntityGenerator {
                     prop.runtimeType = (runtimeTypes.length === 1 ? runtimeTypes[0] : `[${runtimeTypes.join(', ')}]`);
                     prop.type = mappedTypes.length === 1 ? (core_1.Utils.entries(core_1.types).find(([k, v]) => Object.getPrototypeOf(mappedTypes[0]) === v.prototype)?.[0] ?? mappedTypes[0].name) : 'unknown';
                 }
+                const meta2 = metadata.find(meta2 => meta2.className === prop.type);
+                const targetPrimaryColumns = meta2?.getPrimaryProps().flatMap(p => p.fieldNames);
+                if (targetPrimaryColumns && targetPrimaryColumns.length !== prop.referencedColumnNames.length) {
+                    prop.ownColumns = prop.joinColumns.filter(col => {
+                        return !meta.props.find(p => p.name !== prop.name && (!p.fieldNames || p.fieldNames.includes(col)));
+                    });
+                }
             }
         }
         await options.onInitialMetadata?.(metadata, this.platform);
@@ -90,11 +97,13 @@ class EntityGenerator {
         for (const duplicate of duplicates) {
             for (const meta of metadata.filter(meta => meta.className === duplicate)) {
                 meta.className = this.namingStrategy.getEntityName(`${meta.schema ?? schema.name}_${meta.className}`);
-                metadata.forEach(relMeta => relMeta.relations.forEach(prop => {
-                    if (prop.type === duplicate && (prop.referencedTableName === meta.collection || prop.referencedTableName === `${meta.schema ?? schema.name}.${meta.collection}`)) {
-                        prop.type = meta.className;
+                for (const relMeta of metadata) {
+                    for (const prop of relMeta.relations) {
+                        if (prop.type === duplicate && (prop.referencedTableName === meta.collection || prop.referencedTableName === `${meta.schema ?? schema.name}.${meta.collection}`)) {
+                            prop.type = meta.className;
+                        }
                     }
-                }));
+                }
             }
         }
         this.detectManyToManyRelations(metadata, options.onlyPurePivotTables, options.readOnlyPivotTables, options.outputPurePivotTables);

package/SourceFile.js

@@ -692,6 +692,9 @@ class SourceFile {
                 options.fieldNames = prop.fieldNames.map(fieldName => this.quote(fieldName));
             }
         }
+        if (prop.ownColumns && prop.ownColumns.length !== prop.fieldNames.length) {
+            options.referencedColumnNames = prop.referencedColumnNames.map(fieldName => this.quote(fieldName));
+        }
         if (!['no action', 'restrict'].includes(prop.updateRule.toLowerCase())) {
             options.updateRule = this.quote(prop.updateRule);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/entity-generator",
-  "version": "6.4.3-dev.7",
+  "version": "6.4.3-dev.9",
   "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",
@@ -58,13 +58,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.4.3-dev.7",
+    "@mikro-orm/knex": "6.4.3-dev.9",
     "fs-extra": "11.2.0"
   },
   "devDependencies": {
     "@mikro-orm/core": "^6.4.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.3-dev.7"
+    "@mikro-orm/core": "6.4.3-dev.9"
   }
 }