New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: Update child's mpath even if parentId was soft-deleted in TreeRepository #10844
Open
JoseCToscano
wants to merge
2
commits into
typeorm:master
Choose a base branch
from
JoseCToscano:fix/tree-repo-soft-deleted-parent-path
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+100
−0
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
import { | ||
TreeChildren, | ||
TreeParent, | ||
Entity, | ||
PrimaryGeneratedColumn, | ||
DeleteDateColumn, | ||
Column, | ||
Tree, | ||
JoinColumn, | ||
} from "../../../../src" | ||
|
||
@Entity("node") | ||
@Tree("materialized-path") | ||
export class Node { | ||
@PrimaryGeneratedColumn({ type: "int" }) | ||
id?: number | ||
|
||
@DeleteDateColumn() | ||
deletedAt?: Date | ||
|
||
@Column("varchar") | ||
name!: string | ||
|
||
@TreeChildren({ cascade: true }) | ||
children?: Node[] | ||
|
||
@Column({ type: "int", nullable: true, name: "parentId" }) | ||
parentId?: number | ||
|
||
@TreeParent() | ||
@JoinColumn({ | ||
name: "parentId", | ||
referencedColumnName: "id", | ||
}) | ||
parent?: Node | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
import "reflect-metadata" | ||
import { | ||
createTestingConnections, | ||
closeTestingConnections, | ||
reloadTestingDatabases, | ||
} from "../../utils/test-utils" | ||
import { DataSource } from "../../../src" | ||
import { Node } from "./entity/node" | ||
import { expect } from "chai" | ||
|
||
describe("github issues > #10843 TreeRepository does not update mpath if parentId was soft-deleted", () => { | ||
let dataSources: DataSource[] | ||
before( | ||
async () => | ||
(dataSources = await createTestingConnections({ | ||
entities: [__dirname + "/entity/*{.js,.ts}"], | ||
schemaCreate: true, | ||
dropSchema: true, | ||
relationLoadStrategy: "query", | ||
enabledDrivers: ["mysql"], | ||
})), | ||
) | ||
beforeEach(() => reloadTestingDatabases(dataSources)) | ||
after(() => closeTestingConnections(dataSources)) | ||
|
||
it("Should update mpath even if parent was soft deleted", () => | ||
Promise.all( | ||
dataSources.map(async (dataSource) => { | ||
const nodeRepository = dataSource.getTreeRepository(Node) | ||
|
||
// Entity instances setup | ||
const parent = await nodeRepository.save( | ||
nodeRepository.create({ name: "root node" }), | ||
) | ||
const child = await nodeRepository.save( | ||
nodeRepository.create({ name: "child node", parent }), | ||
) | ||
|
||
// Validate mpath | ||
let [mpath] = await dataSource.query( | ||
"SELECT mpath FROM node WHERE id = ?", | ||
[child.id], | ||
) | ||
expect(mpath?.mpath).to.be.equal(`${parent.id}.${child.id}.`) | ||
// Soft delete parent | ||
await nodeRepository.softDelete(parent) | ||
|
||
// Assign new parent | ||
const newParent = await nodeRepository.save( | ||
nodeRepository.create({ name: "root node 2" }), | ||
) | ||
child.parent = newParent | ||
await nodeRepository.save(child) | ||
|
||
;[mpath] = await dataSource.query( | ||
"SELECT mpath FROM node WHERE id = ?", | ||
[child.id], | ||
) | ||
|
||
expect(mpath?.mpath).to.be.equal(`${newParent.id}.${child.id}.`) | ||
}), | ||
)) | ||
}) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the main change of the PR