Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-11-11 00:56:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: bad merge (#23610)

Browse Source
This commit is contained in:
Jason Rasmussen 2025-11-04 16:22:45 -05:00 committed by GitHub
parent 29c14a3f58
commit aa69d89b9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/queries/tag.repository.sql
View File

@ -96,7 +96,7 @@ where
-- TagRepository.upsertAssetIds -- TagRepository.upsertAssetIds
insert into insert into
"tag_asset" ("assetId", "tagsIds") "tag_asset" ("assetId", "tagIds")
values values
($1, $2) ($1, $2)
on conflict do nothing on conflict do nothing

2
server/src/repositories/tag.repository.ts
View File

@ -128,7 +128,7 @@ export class TagRepository {
await this.db.deleteFrom('tag_asset').where('tagId', '=', tagId).where('assetId', 'in', assetIds).execute(); await this.db.deleteFrom('tag_asset').where('tagId', '=', tagId).where('assetId', 'in', assetIds).execute();
} }
@GenerateSql({ params: [[{ assetId: DummyValue.UUID, tagsIds: [DummyValue.UUID] }]] }) @GenerateSql({ params: [[{ assetId: DummyValue.UUID, tagIds: DummyValue.UUID }]] })
@Chunked() @Chunked()
upsertAssetIds(items: Insertable<TagAssetTable>[]) { upsertAssetIds(items: Insertable<TagAssetTable>[]) {
if (items.length === 0) { if (items.length === 0) {

4
server/test/medium.factory.ts
View File

@ -351,8 +351,8 @@ export class ExifTestContext extends MediumTestContext<MetadataService> {
getTags(assetId: string) { getTags(assetId: string) {
return this.database return this.database
.selectFrom('tag') .selectFrom('tag')
.innerJoin('tag_asset', 'tag.id', 'tag_asset.tagsId') .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagId')
.where('tag_asset.assetsId', '=', assetId) .where('tag_asset.assetId', '=', assetId)
.selectAll() .selectAll()
.execute(); .execute();
} }

4
server/test/medium/specs/exif/exif-tags.spec.ts
View File

@ -27,8 +27,8 @@ describe('exif tags', () => {
await sut.handleMetadataExtraction({ id: asset.id }); await sut.handleMetadataExtraction({ id: asset.id });
await expect(ctx.getTags(asset.id)).resolves.toEqual([ await expect(ctx.getTags(asset.id)).resolves.toEqual([
expect.objectContaining({ assetsId: asset.id, value: 'Frost', parentId: null }), expect.objectContaining({ assetId: asset.id, value: 'Frost', parentId: null }),
expect.objectContaining({ assetsId: asset.id, value: 'Yard', parentId: null }), expect.objectContaining({ assetId: asset.id, value: 'Yard', parentId: null }),
]); ]);
}); });
}); });