fix: entity manager remove using entity schemas (#9221)

Currently the entity manager remove method does not recognize the first param if it is an entity schema.
typeorm · Aug 24, 2022 · f045536 · f045536
1 parent 8dcd61e
commit f045536
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/src/entity-manager/EntityManager.ts b/src/entity-manager/EntityManager.ts
@@ -478,6 +478,7 @@ export class EntityManager {
         const target =
             arguments.length > 1 &&
             (typeof targetOrEntity === "function" ||
+                InstanceChecker.isEntitySchema(targetOrEntity) ||
                 typeof targetOrEntity === "string")
                 ? (targetOrEntity as Function | string)
                 : undefined

diff --git a/test/functional/entity-schema/basic/entity-schema-basic.ts b/test/functional/entity-schema/basic/entity-schema-basic.ts
@@ -1,4 +1,5 @@
 import "reflect-metadata"
+import { expect } from "chai"
 import {
     closeTestingConnections,
     createTestingConnections,
@@ -19,7 +20,7 @@ describe("entity schemas > basic functionality", () => {
     beforeEach(() => reloadTestingDatabases(connections))
     after(() => closeTestingConnections(connections))
 
-    it("should perform basic operations with entity", () =>
+    it("should perform basic operations with entity using repository", () =>
         Promise.all(
             connections.map(async (connection) => {
                 const postRepository = connection.getRepository(PostEntity)
@@ -30,13 +31,47 @@ describe("entity schemas > basic functionality", () => {
                 })
                 await postRepository.save(post)
 
+                const loadedPost = await postRepository.findOneBy({
+                    title: "First Post",
+                })
+                loadedPost!.id.should.be.equal(post.id)
+                loadedPost!.title.should.be.equal("First Post")
+                loadedPost!.text.should.be.equal("About first post")
+
+                await postRepository.remove(loadedPost!)
+
+                const loadedPostAfterRemove = await postRepository.findOneBy({
+                    title: "First Post",
+                })
+                expect(loadedPostAfterRemove).to.be.null
+            }),
+        ))
+
+    it("should perform basic operations with entity using manager", () =>
+        Promise.all(
+            connections.map(async (connection) => {
+                const post = connection.manager.create(PostEntity, {
+                    id: 1,
+                    title: "First Post",
+                    text: "About first post",
+                })
+                await connection.manager.save(PostEntity, post)
+
                 const loadedPost = await connection.manager.findOneBy(
                     PostEntity,
                     { title: "First Post" },
                 )
                 loadedPost!.id.should.be.equal(post.id)
                 loadedPost!.title.should.be.equal("First Post")
                 loadedPost!.text.should.be.equal("About first post")
+
+                await connection.manager.remove(PostEntity, loadedPost!)
+
+                const loadedPostAfterRemove =
+                    await connection.manager.findOneBy(PostEntity, {
+                        title: "First Post",
+                    })
+                expect(loadedPostAfterRemove).to.be.null
             }),
         ))
 })
diff --git a/test/functional/entity-schema/basic/entity/PostEntity.ts b/test/functional/entity-schema/basic/entity/PostEntity.ts
@@ -19,6 +19,7 @@ export const PostEntity = new EntitySchema<Post>({
         categories: {
             type: "many-to-many",
             target: "category", // CategoryEntity
+            joinTable: true,
         },
     },
 })