chore(deps): update server (#6930)

* chore(deps): update server * chore: generate sql --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>
2025-11-14 17:36:12 +00:00 · 2024-02-06 22:06:02 +00:00 · 2024-02-06 22:06:02 +00:00 · d88ca5fb2a
commit d88ca5fb2a
parent 8c60c21fe0
12 changed files with 311 additions and 225 deletions
--- a/server/src/infra/sql/access.repository.sql
+++ b/server/src/infra/sql/access.repository.sql
@ -7,8 +7,8 @@ FROM
  "activity" "ActivityEntity"
 WHERE
  (
-    "ActivityEntity"."id" IN ($1)
-    AND "ActivityEntity"."userId" = $2
+    ("ActivityEntity"."id" IN ($1))
+    AND ("ActivityEntity"."userId" = $2)
  )

 -- AccessRepository.activity.checkAlbumOwnerAccess
@ -22,8 +22,14 @@ FROM
  )
 WHERE
  (
-    "ActivityEntity"."id" IN ($1)
-    AND "ActivityEntity__ActivityEntity_album"."ownerId" = $2
+    ("ActivityEntity"."id" IN ($1))
+    AND (
+      (
+        (
+          "ActivityEntity__ActivityEntity_album"."ownerId" = $2
+        )
+      )
+    )
  )

 -- AccessRepository.activity.checkCreateAccess
@ -53,8 +59,8 @@ FROM
 WHERE
  (
    (
-      "AlbumEntity"."id" IN ($1)
-      AND "AlbumEntity"."ownerId" = $2
+      ("AlbumEntity"."id" IN ($1))
+      AND ("AlbumEntity"."ownerId" = $2)
    )
  )
  AND ("AlbumEntity"."deletedAt" IS NULL)
@ -72,8 +78,12 @@ FROM
 WHERE
  (
    (
-      "AlbumEntity"."id" IN ($1)
-      AND "AlbumEntity__AlbumEntity_sharedUsers"."id" = $2
+      ("AlbumEntity"."id" IN ($1))
+      AND (
+        (
+          ("AlbumEntity__AlbumEntity_sharedUsers"."id" = $2)
+        )
+      )
    )
  )
  AND ("AlbumEntity"."deletedAt" IS NULL)
@ -86,8 +96,8 @@ FROM
  "shared_links" "SharedLinkEntity"
 WHERE
  (
-    "SharedLinkEntity"."id" = $1
-    AND "SharedLinkEntity"."albumId" IN ($2)
+    ("SharedLinkEntity"."id" = $1)
+    AND ("SharedLinkEntity"."albumId" IN ($2))
  )

 -- AccessRepository.asset.checkAlbumAccess
@ -119,8 +129,8 @@ FROM
  "assets" "AssetEntity"
 WHERE
  (
-    "AssetEntity"."id" IN ($1)
-    AND "AssetEntity"."ownerId" = $2
+    ("AssetEntity"."id" IN ($1))
+    AND ("AssetEntity"."ownerId" = $2)
  )

 -- AccessRepository.asset.checkPartnerAccess
@ -168,8 +178,8 @@ FROM
  "user_token" "UserTokenEntity"
 WHERE
  (
-    "UserTokenEntity"."userId" = $1
-    AND "UserTokenEntity"."id" IN ($2)
+    ("UserTokenEntity"."userId" = $1)
+    AND ("UserTokenEntity"."id" IN ($2))
  )

 -- AccessRepository.library.checkOwnerAccess
@ -180,8 +190,8 @@ FROM
 WHERE
  (
    (
-      "LibraryEntity"."id" IN ($1)
-      AND "LibraryEntity"."ownerId" = $2
+      ("LibraryEntity"."id" IN ($1))
+      AND ("LibraryEntity"."ownerId" = $2)
    )
  )
  AND ("LibraryEntity"."deletedAt" IS NULL)
@ -203,8 +213,8 @@ FROM
  "person" "PersonEntity"
 WHERE
  (
-    "PersonEntity"."id" IN ($1)
-    AND "PersonEntity"."ownerId" = $2
+    ("PersonEntity"."id" IN ($1))
+    AND ("PersonEntity"."ownerId" = $2)
  )

 -- AccessRepository.person.checkFaceOwnerAccess
@ -218,8 +228,14 @@ FROM
  )
 WHERE
  (
-    "AssetFaceEntity"."id" IN ($1)
-    AND "AssetFaceEntity__AssetFaceEntity_asset"."ownerId" = $2
+    ("AssetFaceEntity"."id" IN ($1))
+    AND (
+      (
+        (
+          "AssetFaceEntity__AssetFaceEntity_asset"."ownerId" = $2
+        )
+      )
+    )
  )

 -- AccessRepository.partner.checkUpdateAccess
--- a/server/src/infra/sql/album.repository.sql
+++ b/server/src/infra/sql/album.repository.sql
@ -72,7 +72,7 @@ FROM
      )
      LEFT JOIN "shared_links" "AlbumEntity__AlbumEntity_sharedLinks" ON "AlbumEntity__AlbumEntity_sharedLinks"."albumId" = "AlbumEntity"."id"
    WHERE
-      (("AlbumEntity"."id" = $1))
+      ((("AlbumEntity"."id" = $1)))
      AND ("AlbumEntity"."deletedAt" IS NULL)
  ) "distinctAlias"
 ORDER BY
@ -135,7 +135,7 @@ FROM
    "AlbumEntity__AlbumEntity_sharedUsers"."deletedAt" IS NULL
  )
 WHERE
-  (("AlbumEntity"."id" IN ($1)))
+  ((("AlbumEntity"."id" IN ($1))))
  AND ("AlbumEntity"."deletedAt" IS NULL)

 -- AlbumRepository.getByAssetId
@ -201,12 +201,20 @@ WHERE
  (
    (
      (
-        "AlbumEntity"."ownerId" = $1
-        AND "AlbumEntity__AlbumEntity_assets"."id" = $2
+        (
+          ("AlbumEntity"."ownerId" = $1)
+          AND ((("AlbumEntity__AlbumEntity_assets"."id" = $2)))
+        )
      )
      OR (
-        "AlbumEntity__AlbumEntity_sharedUsers"."id" = $3
-        AND "AlbumEntity__AlbumEntity_assets"."id" = $4
+        (
+          (
+            (
+              ("AlbumEntity__AlbumEntity_sharedUsers"."id" = $3)
+            )
+          )
+          AND ((("AlbumEntity__AlbumEntity_assets"."id" = $4)))
+        )
      )
    )
  )
@ -328,7 +336,7 @@ FROM
    "AlbumEntity__AlbumEntity_owner"."deletedAt" IS NULL
  )
 WHERE
-  (("AlbumEntity"."ownerId" = $1))
+  ((("AlbumEntity"."ownerId" = $1)))
  AND ("AlbumEntity"."deletedAt" IS NULL)
 ORDER BY
  "AlbumEntity"."createdAt" DESC
@ -403,14 +411,38 @@ FROM
 WHERE
  (
    (
-      ("AlbumEntity__AlbumEntity_sharedUsers"."id" = $1)
-      OR (
-        "AlbumEntity__AlbumEntity_sharedLinks"."userId" = $2
+      (
+        (
+          (
+            (
+              ("AlbumEntity__AlbumEntity_sharedUsers"."id" = $1)
+            )
+          )
+        )
      )
      OR (
-        "AlbumEntity"."ownerId" = $3
-        AND NOT (
-          "AlbumEntity__AlbumEntity_sharedUsers"."id" IS NULL
+        (
+          (
+            (
+              (
+                "AlbumEntity__AlbumEntity_sharedLinks"."userId" = $2
+              )
+            )
+          )
+        )
+      )
+      OR (
+        (
+          ("AlbumEntity"."ownerId" = $3)
+          AND (
+            (
+              (
+                NOT (
+                  "AlbumEntity__AlbumEntity_sharedUsers"."id" IS NULL
+                )
+              )
+            )
+          )
        )
      )
    )
@ -489,9 +521,21 @@ FROM
 WHERE
  (
    (
-      "AlbumEntity"."ownerId" = $1
-      AND "AlbumEntity__AlbumEntity_sharedUsers"."id" IS NULL
-      AND "AlbumEntity__AlbumEntity_sharedLinks"."id" IS NULL
+      ("AlbumEntity"."ownerId" = $1)
+      AND (
+        (
+          (
+            "AlbumEntity__AlbumEntity_sharedUsers"."id" IS NULL
+          )
+        )
+      )
+      AND (
+        (
+          (
+            "AlbumEntity__AlbumEntity_sharedLinks"."id" IS NULL
+          )
+        )
+      )
    )
  )
  AND ("AlbumEntity"."deletedAt" IS NULL)
@ -586,8 +630,8 @@ WHERE
    WHERE
      (
        (
-          "AlbumEntity"."id" = $1
-          AND "AlbumEntity__AlbumEntity_assets"."id" = $2
+          ("AlbumEntity"."id" = $1)
+          AND ((("AlbumEntity__AlbumEntity_assets"."id" = $2)))
        )
      )
      AND ("AlbumEntity"."deletedAt" IS NULL)
--- a/server/src/infra/sql/api.key.repository.sql
+++ b/server/src/infra/sql/api.key.repository.sql
@ -32,7 +32,7 @@ FROM
        "APIKeyEntity__APIKeyEntity_user"."deletedAt" IS NULL
      )
    WHERE
-      ("APIKeyEntity"."key" = $1)
+      (("APIKeyEntity"."key" = $1))
  ) "distinctAlias"
 ORDER BY
  "APIKeyEntity_id" ASC
@ -50,8 +50,8 @@ FROM
  "api_keys" "APIKeyEntity"
 WHERE
  (
-    "APIKeyEntity"."userId" = $1
-    AND "APIKeyEntity"."id" = $2
+    ("APIKeyEntity"."userId" = $1)
+    AND ("APIKeyEntity"."id" = $2)
  )
 LIMIT
  1
@ -66,6 +66,6 @@ SELECT
 FROM
  "api_keys" "APIKeyEntity"
 WHERE
-  ("APIKeyEntity"."userId" = $1)
+  (("APIKeyEntity"."userId" = $1))
 ORDER BY
  "APIKeyEntity"."createdAt" DESC
--- a/server/src/infra/sql/asset.repository.sql
+++ b/server/src/infra/sql/asset.repository.sql
@ -65,11 +65,11 @@ FROM
 WHERE
  (
    (
-      "AssetEntity"."ownerId" = $1
-      AND "AssetEntity"."isVisible" = $2
-      AND "AssetEntity"."isArchived" = $3
-      AND NOT ("AssetEntity"."resizePath" IS NULL)
-      AND "AssetEntity"."fileCreatedAt" BETWEEN $4 AND $5
+      ("AssetEntity"."ownerId" = $1)
+      AND ("AssetEntity"."isVisible" = $2)
+      AND ("AssetEntity"."isArchived" = $3)
+      AND (NOT ("AssetEntity"."resizePath" IS NULL))
+      AND ("AssetEntity"."fileCreatedAt" BETWEEN $4 AND $5)
    )
  )
  AND ("AssetEntity"."deletedAt" IS NULL)
@ -286,7 +286,7 @@ FROM
  LEFT JOIN "asset_stack" "AssetEntity__AssetEntity_stack" ON "AssetEntity__AssetEntity_stack"."id" = "AssetEntity"."stackId"
  LEFT JOIN "assets" "bd93d5747511a4dad4923546c51365bf1a803774" ON "bd93d5747511a4dad4923546c51365bf1a803774"."stackId" = "AssetEntity__AssetEntity_stack"."id"
 WHERE
-  ("AssetEntity"."id" IN ($1))
+  (("AssetEntity"."id" IN ($1)))

 -- AssetRepository.deleteAll
 DELETE FROM "assets"
@ -331,7 +331,13 @@ FROM
    "AssetEntity__AssetEntity_library"."deletedAt" IS NULL
  )
 WHERE
-  (("AssetEntity__AssetEntity_library"."id" IN ($1)))
+  (
+    (
+      (
+        (("AssetEntity__AssetEntity_library"."id" IN ($1)))
+      )
+    )
+  )
  AND ("AssetEntity"."deletedAt" IS NULL)

 -- AssetRepository.getByLibraryIdAndOriginalPath
@ -378,8 +384,8 @@ FROM
    WHERE
      (
        (
-          "AssetEntity__AssetEntity_library"."id" = $1
-          AND "AssetEntity"."originalPath" = $2
+          ((("AssetEntity__AssetEntity_library"."id" = $1)))
+          AND ("AssetEntity"."originalPath" = $2)
        )
      )
      AND ("AssetEntity"."deletedAt" IS NULL)
@ -397,9 +403,9 @@ FROM
  "assets" "AssetEntity"
 WHERE
  (
-    "AssetEntity"."ownerId" = $1
-    AND "AssetEntity"."deviceId" = $2
-    AND "AssetEntity"."isVisible" = $3
+    ("AssetEntity"."ownerId" = $1)
+    AND ("AssetEntity"."deviceId" = $2)
+    AND ("AssetEntity"."isVisible" = $3)
  )

 -- AssetRepository.getById
@ -436,7 +442,7 @@ SELECT
 FROM
  "assets" "AssetEntity"
 WHERE
-  ("AssetEntity"."id" = $1)
+  (("AssetEntity"."id" = $1))
 LIMIT
  1

@ -484,8 +490,8 @@ FROM
 WHERE
  (
    (
-      "AssetEntity"."ownerId" = $1
-      AND "AssetEntity"."checksum" = $2
+      ("AssetEntity"."ownerId" = $1)
+      AND ("AssetEntity"."checksum" = $2)
    )
  )
  AND ("AssetEntity"."deletedAt" IS NULL)
@ -529,12 +535,16 @@ WHERE
  (
    (
      (
-        "AssetEntity"."sidecarPath" IS NULL
-        AND "AssetEntity"."isVisible" = $1
+        (
+          ("AssetEntity"."sidecarPath" IS NULL)
+          AND ("AssetEntity"."isVisible" = $1)
+        )
      )
      OR (
-        "AssetEntity"."sidecarPath" = $2
-        AND "AssetEntity"."isVisible" = $3
+        (
+          ("AssetEntity"."sidecarPath" = $2)
+          AND ("AssetEntity"."isVisible" = $3)
+        )
      )
    )
  )
--- a/server/src/infra/sql/library.repository.sql
+++ b/server/src/infra/sql/library.repository.sql
@ -40,7 +40,7 @@ FROM
        "LibraryEntity__LibraryEntity_owner"."deletedAt" IS NULL
      )
    WHERE
-      (("LibraryEntity"."id" = $1))
+      ((("LibraryEntity"."id" = $1)))
      AND ("LibraryEntity"."deletedAt" IS NULL)
  ) "distinctAlias"
 ORDER BY
@ -63,7 +63,7 @@ WHERE
    FROM
      "libraries" "LibraryEntity"
    WHERE
-      (("LibraryEntity"."name" = $1))
+      ((("LibraryEntity"."name" = $1)))
      AND ("LibraryEntity"."deletedAt" IS NULL)
  )
 LIMIT
@ -75,7 +75,7 @@ SELECT
 FROM
  "libraries" "LibraryEntity"
 WHERE
-  (("LibraryEntity"."ownerId" = $1))
+  ((("LibraryEntity"."ownerId" = $1)))
  AND ("LibraryEntity"."deletedAt" IS NULL)

 -- LibraryRepository.getDefaultUploadLibrary
@ -96,8 +96,8 @@ FROM
 WHERE
  (
    (
-      "LibraryEntity"."ownerId" = $1
-      AND "LibraryEntity"."type" = $2
+      ("LibraryEntity"."ownerId" = $1)
+      AND ("LibraryEntity"."type" = $2)
    )
  )
  AND ("LibraryEntity"."deletedAt" IS NULL)
@ -114,8 +114,8 @@ FROM
 WHERE
  (
    (
-      "LibraryEntity"."ownerId" = $1
-      AND "LibraryEntity"."type" = $2
+      ("LibraryEntity"."ownerId" = $1)
+      AND ("LibraryEntity"."type" = $2)
    )
  )
  AND ("LibraryEntity"."deletedAt" IS NULL)
@ -158,8 +158,8 @@ FROM
 WHERE
  (
    (
-      "LibraryEntity"."ownerId" = $1
-      AND "LibraryEntity"."isVisible" = $2
+      ("LibraryEntity"."ownerId" = $1)
+      AND ("LibraryEntity"."isVisible" = $2)
    )
  )
  AND ("LibraryEntity"."deletedAt" IS NULL)
@ -240,8 +240,8 @@ FROM
  LEFT JOIN "users" "LibraryEntity__LibraryEntity_owner" ON "LibraryEntity__LibraryEntity_owner"."id" = "LibraryEntity"."ownerId"
 WHERE
  (
-    "LibraryEntity"."isVisible" = $1
-    AND NOT ("LibraryEntity"."deletedAt" IS NULL)
+    ("LibraryEntity"."isVisible" = $1)
+    AND (NOT ("LibraryEntity"."deletedAt" IS NULL))
  )
 ORDER BY
  "LibraryEntity"."createdAt" ASC
--- a/server/src/infra/sql/move.repository.sql
+++ b/server/src/infra/sql/move.repository.sql
@ -11,8 +11,8 @@ FROM
  "move_history" "MoveEntity"
 WHERE
  (
-    "MoveEntity"."entityId" = $1
-    AND "MoveEntity"."pathType" = $2
+    ("MoveEntity"."entityId" = $1)
+    AND ("MoveEntity"."pathType" = $2)
  )
 LIMIT
  1
--- a/server/src/infra/sql/person.repository.sql
+++ b/server/src/infra/sql/person.repository.sql
@ -83,7 +83,7 @@ FROM
  "asset_faces" "AssetFaceEntity"
  LEFT JOIN "person" "AssetFaceEntity__AssetFaceEntity_person" ON "AssetFaceEntity__AssetFaceEntity_person"."id" = "AssetFaceEntity"."personId"
 WHERE
-  ("AssetFaceEntity"."assetId" = $1)
+  (("AssetFaceEntity"."assetId" = $1))

 -- PersonRepository.getFaceById
 SELECT DISTINCT
@ -113,7 +113,7 @@ FROM
      "asset_faces" "AssetFaceEntity"
      LEFT JOIN "person" "AssetFaceEntity__AssetFaceEntity_person" ON "AssetFaceEntity__AssetFaceEntity_person"."id" = "AssetFaceEntity"."personId"
    WHERE
-      ("AssetFaceEntity"."id" = $1)
+      (("AssetFaceEntity"."id" = $1))
  ) "distinctAlias"
 ORDER BY
  "AssetFaceEntity_id" ASC
@ -181,7 +181,7 @@ FROM
        "AssetFaceEntity__AssetFaceEntity_asset"."deletedAt" IS NULL
      )
    WHERE
-      ("AssetFaceEntity"."id" = $1)
+      (("AssetFaceEntity"."id" = $1))
  ) "distinctAlias"
 ORDER BY
  "AssetFaceEntity_id" ASC
@ -325,9 +325,13 @@ FROM
    WHERE
      (
        (
-          "AssetEntity__AssetEntity_faces"."personId" = $1
-          AND "AssetEntity"."isVisible" = $2
-          AND "AssetEntity"."isArchived" = $3
+          (
+            (
+              ("AssetEntity__AssetEntity_faces"."personId" = $1)
+            )
+          )
+          AND ("AssetEntity"."isVisible" = $2)
+          AND ("AssetEntity"."isArchived" = $3)
        )
      )
      AND ("AssetEntity"."deletedAt" IS NULL)
@ -395,8 +399,10 @@ FROM
 WHERE
  (
    (
-      "AssetFaceEntity"."assetId" = $1
-      AND "AssetFaceEntity"."personId" = $2
+      (
+        ("AssetFaceEntity"."assetId" = $1)
+        AND ("AssetFaceEntity"."personId" = $2)
+      )
    )
  )

@ -414,6 +420,6 @@ SELECT
 FROM
  "asset_faces" "AssetFaceEntity"
 WHERE
-  ("AssetFaceEntity"."personId" = $1)
+  (("AssetFaceEntity"."personId" = $1))
 LIMIT
  1
--- a/server/src/infra/sql/shared.link.repository.sql
+++ b/server/src/infra/sql/shared.link.repository.sql
@ -184,8 +184,8 @@ FROM
      )
    WHERE
      (
-        "SharedLinkEntity"."id" = $1
-        AND "SharedLinkEntity"."userId" = $2
+        ("SharedLinkEntity"."id" = $1)
+        AND ("SharedLinkEntity"."userId" = $2)
      )
  ) "distinctAlias"
 ORDER BY
@ -280,7 +280,7 @@ FROM
    "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."deletedAt" IS NULL
  )
 WHERE
-  ("SharedLinkEntity"."userId" = $1)
+  (("SharedLinkEntity"."userId" = $1))
 ORDER BY
  "SharedLinkEntity"."createdAt" DESC

@ -325,7 +325,7 @@ FROM
        "SharedLinkEntity__SharedLinkEntity_user"."deletedAt" IS NULL
      )
    WHERE
-      ("SharedLinkEntity"."key" = $1)
+      (("SharedLinkEntity"."key" = $1))
  ) "distinctAlias"
 ORDER BY
  "SharedLinkEntity_id" ASC
--- a/server/src/infra/sql/user.repository.sql
+++ b/server/src/infra/sql/user.repository.sql
@ -21,7 +21,7 @@ SELECT
 FROM
  "users" "UserEntity"
 WHERE
-  (("UserEntity"."isAdmin" = $1))
+  ((("UserEntity"."isAdmin" = $1)))
  AND ("UserEntity"."deletedAt" IS NULL)
 LIMIT
  1
@ -41,7 +41,7 @@ WHERE
    FROM
      "users" "UserEntity"
    WHERE
-      (("UserEntity"."isAdmin" = $1))
+      ((("UserEntity"."isAdmin" = $1)))
      AND ("UserEntity"."deletedAt" IS NULL)
  )
 LIMIT
@ -92,7 +92,7 @@ SELECT
 FROM
  "users" "UserEntity"
 WHERE
-  (("UserEntity"."storageLabel" = $1))
+  ((("UserEntity"."storageLabel" = $1)))
  AND ("UserEntity"."deletedAt" IS NULL)
 LIMIT
  1
@ -118,7 +118,7 @@ SELECT
 FROM
  "users" "UserEntity"
 WHERE
-  (("UserEntity"."oauthId" = $1))
+  ((("UserEntity"."oauthId" = $1)))
  AND ("UserEntity"."deletedAt" IS NULL)
 LIMIT
  1
--- a/server/src/infra/sql/user.token.repository.sql
+++ b/server/src/infra/sql/user.token.repository.sql
@ -35,7 +35,7 @@ FROM
        "UserTokenEntity__UserTokenEntity_user"."deletedAt" IS NULL
      )
    WHERE
-      ("UserTokenEntity"."token" = $1)
+      (("UserTokenEntity"."token" = $1))
  ) "distinctAlias"
 ORDER BY
  "UserTokenEntity_id" ASC