mirror of
https://github.com/immich-app/immich.git
synced 2025-02-18 01:24:26 -05:00
Merge branch 'main' into face-editor
This commit is contained in:
commit
b11ddbb378
2 changed files with 1 additions and 3 deletions
|
@ -174,7 +174,6 @@ from
|
|||
and "asset_faces"."personId" = $1
|
||||
and "assets"."isArchived" = $2
|
||||
and "assets"."deletedAt" is null
|
||||
and "assets"."livePhotoVideoId" is null
|
||||
where
|
||||
"asset_faces"."deletedAt" is null
|
||||
|
||||
|
|
|
@ -320,8 +320,7 @@ export class PersonRepository {
|
|||
.onRef('assets.id', '=', 'asset_faces.assetId')
|
||||
.on('asset_faces.personId', '=', personId)
|
||||
.on('assets.isArchived', '=', false)
|
||||
.on('assets.deletedAt', 'is', null)
|
||||
.on('assets.livePhotoVideoId', 'is', null),
|
||||
.on('assets.deletedAt', 'is', null),
|
||||
)
|
||||
.select((eb) => eb.fn.count(eb.fn('distinct', ['assets.id'])).as('count'))
|
||||
.where('asset_faces.deletedAt', 'is', null)
|
||||
|
|
Loading…
Add table
Reference in a new issue