mirror of
https://github.com/samsonjs/immich.git
synced 2026-04-27 15:07:45 +00:00
fix(mobile): filter deleted assets (#19683)
This commit is contained in:
parent
ca78bc91b6
commit
b8e67d0ef9
2 changed files with 5 additions and 5 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
import 'remote_asset.entity.dart';
|
import 'remote_asset.entity.dart';
|
||||||
import 'local_asset.entity.dart';
|
import 'local_asset.entity.dart';
|
||||||
|
|
||||||
mergedAsset: SELECT * FROM
|
mergedAsset: SELECT * FROM
|
||||||
(
|
(
|
||||||
SELECT
|
SELECT
|
||||||
rae.id as remote_id,
|
rae.id as remote_id,
|
||||||
|
|
@ -22,7 +22,7 @@ mergedAsset: SELECT * FROM
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
local_asset_entity lae ON rae.checksum = lae.checksum
|
local_asset_entity lae ON rae.checksum = lae.checksum
|
||||||
WHERE
|
WHERE
|
||||||
rae.visibility = 0 AND rae.owner_id in ?
|
rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id in ?
|
||||||
UNION ALL
|
UNION ALL
|
||||||
SELECT
|
SELECT
|
||||||
NULL as remote_id,
|
NULL as remote_id,
|
||||||
|
|
@ -48,8 +48,8 @@ mergedAsset: SELECT * FROM
|
||||||
ORDER BY created_at DESC
|
ORDER BY created_at DESC
|
||||||
LIMIT $limit;
|
LIMIT $limit;
|
||||||
|
|
||||||
mergedBucket(:group_by AS INTEGER):
|
mergedBucket(:group_by AS INTEGER):
|
||||||
SELECT
|
SELECT
|
||||||
COUNT(*) as asset_count,
|
COUNT(*) as asset_count,
|
||||||
CASE
|
CASE
|
||||||
WHEN :group_by = 0 THEN STRFTIME('%Y-%m-%d', created_at) -- day
|
WHEN :group_by = 0 THEN STRFTIME('%Y-%m-%d', created_at) -- day
|
||||||
|
|
@ -65,7 +65,7 @@ FROM
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
local_asset_entity lae ON rae.checksum = lae.checksum
|
local_asset_entity lae ON rae.checksum = lae.checksum
|
||||||
WHERE
|
WHERE
|
||||||
rae.visibility = 0 AND rae.owner_id in ?
|
rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id in ?
|
||||||
UNION ALL
|
UNION ALL
|
||||||
SELECT
|
SELECT
|
||||||
lae.name,
|
lae.name,
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Reference in a new issue