archive-gh-me/typeorm
1
0
Fork 0
mirror of https://github.com/typeorm/typeorm.git synced 2025-12-08 21:26:23 +00:00
Code Issues Projects Releases Wiki Activity

Revert "fix: do not create junction table metadata when it already exists (#11114)" (#11660)

Browse Source 
This reverts commit 3c26cf18a77b5b0cd7c15c811fc3d0a43af32e47.
This commit is contained in:
Michael Bromley 2025-09-19 11:03:18 +02:00 committed by GitHub
parent 974ead202d
commit 34d87149ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/metadata-builder/EntityMetadataBuilder.ts
View File

@ -315,19 +315,7 @@ export class EntityMetadataBuilder {
junctionEntityMetadata,
entityMetadatas,
)
// check if there's already a user-defined entity with the same table name
// if so, don't add the auto-generated junction entity to avoid duplicates
const hasUserDefinedTable = entityMetadatas.some(
(metadata) =>
metadata.tableName ===
junctionEntityMetadata.tableName &&
!metadata.isJunction,
)
if (!hasUserDefinedTable) {
entityMetadatas.push(junctionEntityMetadata)
}
entityMetadatas.push(junctionEntityMetadata)
})
})

49
test/functional/entity-metadata/entity-metadata-builder.ts
View File

@ -1,49 +0,0 @@
import "reflect-metadata"
import {
closeTestingConnections,
createTestingConnections,
reloadTestingDatabases,
} from "../../utils/test-utils"
import { DataSource } from "../../../src/data-source/DataSource"
import { expect } from "chai"
import { documentRelationEntitySchema } from "./entity/junction-table/entities"
describe("entity-metadata-builder > build", () => {
let dataSources: DataSource[]
before(
async () =>
(dataSources = await createTestingConnections({
entities: [__dirname + "/entity/junction-table/*{.js,.ts}"],
enabledDrivers: ["sqlite"],
})),
)
beforeEach(() => reloadTestingDatabases(dataSources))
after(() => closeTestingConnections(dataSources))
it("repository has relations in metadata when user defined junction tables are used", () =>
Promise.all(
dataSources.map(async (dataSource) => {
const repository = dataSource.manager.getRepository(
documentRelationEntitySchema,
)
expect(repository.metadata.relations.length).to.be.eql(1)
}),
))
it("save doesn't throw with EntityPropertyNotFoundError when user defined junction tables are used", () =>
Promise.all(
dataSources.map(async (dataSource) => {
const repository = dataSource.manager.getRepository(
documentRelationEntitySchema,
)
await expect(
repository.find({
where: { userId: 2030 },
relations: ["document"],
}),
).to.not.be.rejected
}),
))
})

87
test/functional/entity-metadata/entity/junction-table/entities.ts
View File

@ -1,87 +0,0 @@
import { EntitySchema } from "../../../../../src/entity-schema/EntitySchema"
interface DocumentRelation {
documentRelationId: number
documentId: number
userId?: number
document?: Document
}
interface Document {
documentId: number
documentRelation?: DocumentRelation[]
}
interface User {
userId: number
documents?: Document[]
}
export const userEntitySchema = new EntitySchema<User>({
name: "user",
columns: {
userId: { type: Number, primary: true, name: "user_id" },
},
relations: {
documents: {
type: "many-to-many",
target: "document",
joinTable: {
name: "document_relation",
joinColumn: {
name: "user_id",
referencedColumnName: "userId",
},
inverseJoinColumn: {
name: "document_id",
referencedColumnName: "documentId",
},
},
},
},
})
export const documentEntitySchema = new EntitySchema<Document>({
name: "document",
columns: {
documentId: { type: Number, primary: true, name: "document_id" },
},
relations: {
documentRelation: {
type: "one-to-many",
target: "document_relation",
inverseSide: "document",
joinColumn: {
name: "document_id",
referencedColumnName: "documentId",
},
},
},
})
export const documentRelationEntitySchema = new EntitySchema<DocumentRelation>({
name: "document_relation",
columns: {
documentRelationId: {
type: Number,
primary: true,
name: "document_relation_id",
},
documentId: { type: Number, name: "document_id" },
userId: { type: Number, name: "user_id", nullable: true },
},
relations: {
document: {
type: "many-to-one",
target: "document",
inverseSide: "documentRelation",
joinColumn: {
name: "document_id",
referencedColumnName: "documentId",
},
},
},
})