High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: bad merge (#23610)
Jason Rasmussenaa69d89b9f94
diff --git a/server/src/queries/tag.repository.sql b/server/src/queries/tag.repository.sqlindex 6d7314eab9..c3b46dd9f3 100644--- a/server/src/queries/tag.repository.sql+++ b/server/src/queries/tag.repository.sql@@ -96,7 +96,7 @@ where-- TagRepository.upsertAssetIdsinsert into- "tag_asset" ("assetId", "tagsIds")+ "tag_asset" ("assetId", "tagIds")values($1, $2)on conflict do nothingdiff --git a/server/src/repositories/tag.repository.ts b/server/src/repositories/tag.repository.tsindex 2fec0777cc..d4572886af 100644--- a/server/src/repositories/tag.repository.ts+++ b/server/src/repositories/tag.repository.ts@@ -128,7 +128,7 @@ export class TagRepository {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()upsertAssetIds(items: Insertable<TagAssetTable>[]) {if (items.length === 0) {diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.tsindex e41a1965a2..6167b6a6ff 100644--- a/server/test/medium.factory.ts+++ b/server/test/medium.factory.ts@@ -351,8 +351,8 @@ export class ExifTestContext extends MediumTestContext<MetadataService> {getTags(assetId: string) {return this.database.selectFrom('tag')- .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagsId')- .where('tag_asset.assetsId', '=', assetId)+ .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagId')+ .where('tag_asset.assetId', '=', assetId).selectAll().execute();}diff --git a/server/test/medium/specs/exif/exif-tags.spec.ts b/server/test/medium/specs/exif/exif-tags.spec.tsindex aee79f4ec1..33a81d24b6 100644--- a/server/test/medium/specs/exif/exif-tags.spec.ts+++ b/server/test/medium/specs/exif/exif-tags.spec.ts@@ -27,8 +27,8 @@ describe('exif tags', () => {await sut.handleMetadataExtraction({ id: asset.id });await expect(ctx.getTags(asset.id)).resolves.toEqual([- expect.objectContaining({ assetsId: asset.id, value: 'Frost', parentId: null }),- expect.objectContaining({ assetsId: asset.id, value: 'Yard', parentId: null }),+ expect.objectContaining({ assetId: asset.id, value: 'Frost', parentId: null }),+ expect.objectContaining({ assetId: asset.id, value: 'Yard', parentId: null }),]);});});