Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(core): apply
convertToJSValueSQL on composite FKs too
Closes #4843
- Loading branch information
Showing
5 changed files
with
159 additions
and
14 deletions.
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
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
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,111 @@ | ||
| import { | ||
| Collection, | ||
| Entity, | ||
| ManyToOne, | ||
| PrimaryKey, | ||
| OneToMany, | ||
| TextType, | ||
| PrimaryKeyType, | ||
| } from '@mikro-orm/core'; | ||
| import { MikroORM } from '@mikro-orm/postgresql'; | ||
|
|
||
| class CitextType extends TextType { | ||
|
|
||
| getColumnType() { | ||
| return 'citext'; | ||
| } | ||
|
|
||
| convertToJSValueSQL(key: string): string { | ||
| return `lower(${key})`; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Entity() | ||
| class A { | ||
|
|
||
| [PrimaryKeyType]?: [string, string]; | ||
|
|
||
| @PrimaryKey({ type: CitextType }) | ||
| id1!: string; | ||
|
|
||
| @PrimaryKey({ type: CitextType }) | ||
| id2!: string; | ||
|
|
||
| @OneToMany(() => C, c => c.a) | ||
| c = new Collection<C>(this); | ||
|
|
||
| } | ||
|
|
||
| @Entity() | ||
| class B { | ||
|
|
||
| @PrimaryKey({ type: CitextType }) | ||
| id!: string; | ||
|
|
||
| @OneToMany(() => C, c => c.b) | ||
| c = new Collection<C>(this); | ||
|
|
||
| } | ||
|
|
||
| @Entity() | ||
| class C { | ||
|
|
||
| @PrimaryKey() | ||
| id!: number; | ||
|
|
||
| @ManyToOne(() => A) | ||
| a!: A; | ||
|
|
||
| @ManyToOne(() => B) | ||
| b!: B; | ||
|
|
||
| } | ||
|
|
||
| let orm: MikroORM; | ||
|
|
||
| describe('populate with citext', () => { | ||
|
|
||
| beforeAll(async () => { | ||
| orm = await MikroORM.init({ | ||
| entities: [A, B, C], | ||
| dbName: 'test-4843', | ||
| }); | ||
| await orm.schema.ensureDatabase(); | ||
| await orm.schema.execute('create extension if not exists citext;'); | ||
| await orm.schema.refreshDatabase(); | ||
|
|
||
| const knex = orm.em.getKnex(); | ||
|
|
||
| await knex.queryBuilder() | ||
| .insert([{ id1: 'test1', id2: 'test2' }, { id1: 'asDf', id2: 'teST' }]) | ||
| .into('a'); | ||
|
|
||
| await knex.queryBuilder() | ||
| .insert([{ id: 'test3' }, { id: 'TEst' }]) | ||
| .into('b'); | ||
|
|
||
| await knex.queryBuilder() | ||
| .insert([{ a_id1: 'test1', a_id2: 'test2', b_id: 'test3' }, { a_id1: 'ASdF', a_id2: 'TEst', b_id: 'TEST' }]) | ||
| .into('c'); | ||
| }); | ||
|
|
||
| afterAll(() => orm.close()); | ||
|
|
||
| test('composite FK', async () => { | ||
| const a1 = await orm.em.fork().find(A, ['test1', 'test2'], { populate: ['c'] }); | ||
| expect(a1[0].c.$.toArray()).toEqual([{ id: 1, a: { id1: 'test1', id2: 'test2' }, b: 'test3' }]); | ||
|
|
||
| const a2 = await orm.em.fork().find(A, ['asdf', 'test'], { populate: ['c'] }); | ||
| expect(a2[0].c.$.toArray()).toEqual([{ id: 2, a: { id1: 'asdf', id2: 'test' }, b: 'test' }]); | ||
| }); | ||
|
|
||
| test('simple FK', async () => { | ||
| const b1 = await orm.em.fork().find(B, 'test3', { populate: ['c'] }); | ||
| expect(b1[0].c.$.toArray()).toEqual([{ id: 1, a: { id1: 'test1', id2: 'test2' }, b: 'test3' }]); | ||
|
|
||
| const b2 = await orm.em.fork().find(B, 'test', { populate: ['c'] }); | ||
| expect(b2[0].c.$.toArray()).toEqual([{ id: 2, a: { id1: 'asdf', id2: 'test' }, b: 'test' }]); | ||
| }); | ||
|
|
||
| }); |