luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Backend: Optimize photos search query (#871)

Browse source
This commit is contained in:
Alexander Konovalov 2021-01-10 14:38:51 +03:00 committed by GitHub
parent 7b15806e50
commit dcf94e26a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/query/photo_search.go
View file

@ -37,9 +37,9 @@ func PhotoSearch(f form.PhotoSearch) (results PhotoResults, count int, err error
lenses.lens_make, lenses.lens_model, lenses.lens_make, lenses.lens_model,
places.place_label, places.place_city, places.place_state, places.place_country`). places.place_label, places.place_city, places.place_state, places.place_country`).
Joins("JOIN files ON photos.id = files.photo_id AND files.file_missing = 0 AND files.deleted_at IS NULL"). Joins("JOIN files ON photos.id = files.photo_id AND files.file_missing = 0 AND files.deleted_at IS NULL").
Joins("JOIN cameras ON photos.camera_id = cameras.id"). Joins("LEFT JOIN cameras ON photos.camera_id = cameras.id").
Joins("JOIN lenses ON photos.lens_id = lenses.id"). Joins("LEFT JOIN lenses ON photos.lens_id = lenses.id").
Joins("JOIN places ON photos.place_id = places.id") Joins("LEFT JOIN places ON photos.place_id = places.id")
if !f.Hidden { if !f.Hidden {
s = s.Where("files.file_type = 'jpg' OR files.file_video = 1") s = s.Where("files.file_type = 'jpg' OR files.file_video = 1")