fix(schema): make STI metadata discovery order independent

Closes #909
mikro-orm · Oct 8, 2020 · f477a48 · f477a48
1 parent 82e2efd
commit f477a48
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/packages/core/src/metadata/MetadataDiscovery.ts b/packages/core/src/metadata/MetadataDiscovery.ts
@@ -36,7 +36,7 @@ export class MetadataDiscovery {
     // ignore base entities (not annotated with @Entity)
     const filtered = this.discovered.filter(meta => meta.name);
     filtered.forEach(meta => Object.values(meta.properties).forEach(prop => this.initEmbeddables(meta, prop)));
-    filtered.forEach(meta => this.initSingleTableInheritance(meta));
+    filtered.forEach(meta => this.initSingleTableInheritance(meta, filtered));
     filtered.forEach(meta => this.defineBaseEntityProperties(meta));
     filtered.forEach(meta => this.metadata.set(meta.className, EntitySchema.fromMetadata(meta).init().meta));
     filtered.forEach(meta => this.defineBaseEntityProperties(meta));
@@ -570,14 +570,21 @@ export class MetadataDiscovery {
     }
   }
 
-  private initSingleTableInheritance(meta: EntityMetadata): void {
+  private initSingleTableInheritance(meta: EntityMetadata, metadata: EntityMetadata[]): void {
+    if (meta.root !== meta && !(meta as Dictionary).__processed) {
+      meta.root = metadata.find(m => m.className === meta.root.className)!;
+      (meta.root as Dictionary).__processed = true;
+    } else {
+      delete (meta.root as Dictionary).__processed;
+    }
+
     if (!meta.root.discriminatorColumn) {
       return;
     }
 
     if (!meta.root.discriminatorMap) {
       meta.root.discriminatorMap = {} as Dictionary<string>;
-      const children = Object.values(this.metadata.getAll()).filter(m => m.root === meta.root);
+      const children = metadata.filter(m => m.root === meta.root);
       children.forEach(m => {
         const name = m.discriminatorValue || this.namingStrategy.classToTableName(m.className);
         meta.root.discriminatorMap![name] = m.className;

diff --git a/packages/knex/src/schema/SchemaGenerator.ts b/packages/knex/src/schema/SchemaGenerator.ts
@@ -467,8 +467,8 @@ export class SchemaGenerator {
 
     const columnAlreadyCreated = prop.primary && prop.reference !== ReferenceType.SCALAR && !diff;
 
-    /* istanbul ignore else */
     if (!meta.pivotTable && !columnAlreadyCreated) {
+      /* istanbul ignore next */
       this.createTableColumn(table, meta, prop, diff ?? {});
     }
 

diff --git a/tests/issues/GH845.test.ts b/tests/issues/GH845.test.ts
@@ -58,7 +58,7 @@ describe('GH issue 845', () => {
 
   beforeAll(async () => {
     orm = await MikroORM.init({
-      entities: [Base, Relation1, Child1Specific, Parent, Child1, Child2],
+      entities: [Base, Relation1, Child1Specific, Child1, Child2, Parent],
       dbName: ':memory:',
       type: 'sqlite',
     });