github-mirrors/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-02-12 20:08:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix joincolumn as primary key

Browse Source
This commit is contained in:
mgabor
2024-04-17 09:51:51 +02:00
parent 87bc244b68
commit 2154ab04e0
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/entities/album-user.entity.ts
View File

@@ -12,12 +12,16 @@ export enum AlbumUserRole {
@Index('IDX_427c350ad49bd3935a50baab73', ['album'])
@Index('IDX_f48513bf9bccefd6ff3ad30bd0', ['user'])
export class AlbumUserEntity {
@PrimaryColumn({ type: 'uuid', name: 'albumsId' })
@PrimaryColumn({ type: 'uuid' })
albumsId!: string;
@PrimaryColumn({ type: 'uuid' })
usersId!: string;
@JoinColumn({ name: 'albumsId' })
@ManyToOne(() => AlbumEntity, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: false })
album!: AlbumEntity;
@PrimaryColumn({ type: 'uuid', name: 'usersId' })
@JoinColumn({ name: 'usersId' })
@ManyToOne(() => UserEntity, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: false })
user!: UserEntity;

10
server/src/queries/access.repository.sql
View File

@@ -74,6 +74,10 @@ SELECT
FROM
"albums" "AlbumEntity"
LEFT JOIN "albums_shared_users_users" "AlbumEntity__AlbumEntity_sharedUsers" ON "AlbumEntity__AlbumEntity_sharedUsers"."albumsId" = "AlbumEntity"."id"
LEFT JOIN "users" "c20102de0f4f51a0efbaca481ef9bb2f99dd7c0a" ON "c20102de0f4f51a0efbaca481ef9bb2f99dd7c0a"."id" = "AlbumEntity__AlbumEntity_sharedUsers"."usersId"
AND (
"c20102de0f4f51a0efbaca481ef9bb2f99dd7c0a"."deletedAt" IS NULL
)
WHERE
(
(
@@ -81,7 +85,11 @@ WHERE
AND (
(
(
"AlbumEntity__AlbumEntity_sharedUsers"."usersId" = $2
(
(
"c20102de0f4f51a0efbaca481ef9bb2f99dd7c0a"."id" = $2
)
)
)
AND (
"AlbumEntity__AlbumEntity_sharedUsers"."role" IN ($3, $4)