fix: default value in child table/entity column decorator for multiple table inheritance is ignored for inherited columns (#10563) (#10564)

mellster2012 · web-flow · commit af77a5d0acf0 · 2023-12-29T15:37:13.000+05:00
diff --git a/src/metadata-builder/EntityMetadataBuilder.ts b/src/metadata-builder/EntityMetadataBuilder.ts
@@ -542,6 +542,21 @@ export class EntityMetadataBuilder {
                         (column) => column.propertyName === args.propertyName,
                     )!
 
+                // for multiple table inheritance we can override default column values
+                if (
+                    entityMetadata.tableType === "regular" &&
+                    args.target !== entityMetadata.target
+                ) {
+                    const childArgs = this.metadataArgsStorage.columns.find(
+                        (c) =>
+                            c.propertyName === args.propertyName &&
+                            c.target === entityMetadata.target,
+                    )
+                    if (childArgs && childArgs.options.default) {
+                        args.options.default = childArgs.options.default
+                    }
+                }
+
                 const column = new ColumnMetadata({
                     connection: this.connection,
                     entityMetadata,
diff --git a/test/github-issues/10563/entity/family.ts b/test/github-issues/10563/entity/family.ts
@@ -0,0 +1,23 @@
+import { Column, Entity, PrimaryColumn } from "../../../../src"
+
+@Entity()
+export class FamilyMember {
+    @PrimaryColumn()
+    name: string
+
+    @Column({
+        default: "PERSON",
+    })
+    type: string
+}
+
+@Entity()
+export class Dog extends FamilyMember {
+    @PrimaryColumn()
+    name: string
+
+    @Column({
+        default: "PET",
+    })
+    type: string
+}
diff --git a/test/github-issues/10563/issue-10563.ts b/test/github-issues/10563/issue-10563.ts
@@ -0,0 +1,44 @@
+import "reflect-metadata"
+import {
+    createTestingConnections,
+    closeTestingConnections,
+    reloadTestingDatabases,
+} from "../../utils/test-utils"
+import { DataSource } from "../../../src/data-source/DataSource"
+import { assert } from "chai"
+import { Dog } from "./entity/family"
+
+describe("github issues > #10653 Default value in child table/entity column decorator for multiple table inheritance is ignored for inherited columns", () => {
+    let dataSources: DataSource[]
+    before(
+        async () =>
+            (dataSources = await createTestingConnections({
+                entities: [__dirname + "/entity/*{.js,.ts}"],
+                schemaCreate: true,
+                dropSchema: true,
+            })),
+    )
+    beforeEach(() => reloadTestingDatabases(dataSources))
+    after(() => closeTestingConnections(dataSources))
+
+    it("should honor distinct default value configured on inherited column of child entity", () =>
+        Promise.all(
+            dataSources.map(async (dataSource) => {
+                await Promise.all(
+                    dataSources.map(async (dataSource) => {
+                        const manager = dataSource.manager
+                        let dog: Dog = new Dog()
+                        dog.name = "Fifi"
+                        await manager.save(dog)
+                        let fifi = await manager.findOneBy(Dog, {
+                            name: "Fifi",
+                        })
+                        assert(
+                            fifi instanceof Dog && fifi["type"] == "PET",
+                            `Fifi=${JSON.stringify(fifi)}`,
+                        )
+                    }),
+                )
+            }),
+        ))
+})
