Skip to content

fix: correctly keep query.data from ormOption for commit / rollback subscribers #10151

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.

Sign up for GitHub

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

Merged
pleerock merged 1 commit into from
Jan 2, 2024
Merged

fix: correctly keep query.data from ormOption for commit / rollback subscribers #10151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/persistence/EntityPersistExecutor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ export class EntityPersistExecutor {

// save data in the query runner - this is useful functionality to share data from outside of the world
// with third classes - like subscribers and listener methods
let oldQueryRunnerData = queryRunner.data
if (this.options && this.options.data) {
queryRunner.data = this.options.data
}
let oldQueryRunnerData = queryRunner.data

try {
// collect all operate subjects
Expand Down
61 changes: 52 additions & 9 deletions test/functional/entity-subscriber/transaction-flow/entity-subscriber-transaction-flow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ import {
closeTestingConnections,
createTestingConnections,
} from "../../../utils/test-utils"
import { Example } from "../query-data/entity/Example"
import sinon from "sinon"
import { expect } from "chai"

describe("entity subscriber > transaction flow", () => {
let beforeTransactionStart = sinon.spy()
let afterTransactionStart = sinon.spy()
let afterInsert = sinon.spy()
let beforeTransactionCommit = sinon.spy()
let afterTransactionCommit = sinon.spy()
let beforeTransactionRollback = sinon.spy()
Expand All @@ -21,34 +23,39 @@ describe("entity subscriber > transaction flow", () => {
@EventSubscriber()
class PostSubscriber implements EntitySubscriberInterface {
beforeTransactionStart() {
if (beforeTransactionStart) beforeTransactionStart()
if (beforeTransactionStart) beforeTransactionStart(arguments)
}

afterTransactionStart() {
if (afterTransactionStart) afterTransactionStart()
if (afterTransactionStart) afterTransactionStart(arguments)
}

afterInsert() {
if (afterInsert) afterInsert(arguments)
}

beforeTransactionCommit() {
if (beforeTransactionCommit) beforeTransactionCommit()
if (beforeTransactionCommit) beforeTransactionCommit(arguments)
}

afterTransactionCommit() {
if (afterTransactionCommit) afterTransactionCommit()
if (afterTransactionCommit) afterTransactionCommit(arguments)
}

beforeTransactionRollback() {
if (beforeTransactionRollback) beforeTransactionRollback()
if (beforeTransactionRollback) beforeTransactionRollback(arguments)
}

afterTransactionRollback() {
if (afterTransactionRollback) afterTransactionRollback()
if (afterTransactionRollback) afterTransactionRollback(arguments)
}
}

let connections: DataSource[]
before(
async () =>
(connections = await createTestingConnections({
entities: [Example],
subscribers: [PostSubscriber],
dropSchema: true,
schemaCreate: true,
Expand All @@ -62,7 +69,7 @@ describe("entity subscriber > transaction flow", () => {
connection.driver.options.type === "mssql" ||
connection.driver.options.type === "spanner"
)
return
continue

beforeTransactionStart.resetHistory()
afterTransactionStart.resetHistory()
Expand Down Expand Up @@ -148,7 +155,7 @@ describe("entity subscriber > transaction flow", () => {
connection.driver.options.type === "mssql" ||
connection.driver.options.type === "spanner"
)
return
continue

beforeTransactionCommit.resetHistory()
afterTransactionCommit.resetHistory()
Expand Down Expand Up @@ -216,7 +223,7 @@ describe("entity subscriber > transaction flow", () => {
connection.driver.options.type === "mssql" ||
connection.driver.options.type === "spanner"
)
return
continue

beforeTransactionRollback.resetHistory()
afterTransactionRollback.resetHistory()
Expand Down Expand Up @@ -280,4 +287,40 @@ describe("entity subscriber > transaction flow", () => {
await queryRunner.release()
}
})

it("query data in subscribers", async () => {
const example = new Example()
const data = { hello: ["world"] }

for (let connection of connections) {
if (
connection.driver.options.type === "mssql" ||
connection.driver.options.type === "spanner"
)
return

beforeTransactionCommit.resetHistory()
afterTransactionCommit.resetHistory()
afterInsert.resetHistory()

const queryRunner = await connection.createQueryRunner()
await queryRunner.startTransaction()

await connection.manager.save(example, { data })

await queryRunner.commitTransaction()

expect(afterInsert.getCall(0).args[0][0].queryRunner.data).to.eql(
data,
)
expect(
beforeTransactionCommit.getCall(0).args[0][0].queryRunner.data,
).to.eql(data)
expect(
afterTransactionCommit.getCall(0).args[0][0].queryRunner.data,
).to.eql(data)

await queryRunner.release()
}
})
})