Skip to content

High performance self-hosted photo and video management solution.

chore: no sql generation for queries with side effects (#18301)

Mert709a7b70aa10
diff --git a/server/src/queries/asset.repository.sql b/server/src/queries/asset.repository.sql
index 4a3fbf0e39..4564971ac2 100644
--- a/server/src/queries/asset.repository.sql
+++ b/server/src/queries/asset.repository.sql
@@ -432,3 +432,34 @@ where
and "assets"."updatedAt" > $3
limit
$4
+
+-- AssetRepository.detectOfflineExternalAssets
+update "assets"
+set
+ "isOffline" = $1,
+ "deletedAt" = $2
+where
+ "isOffline" = $3
+ and "isExternal" = $4
+ and "libraryId" = $5::uuid
+ and (
+ not "originalPath" like $6
+ or "originalPath" like $7
+ )
+
+-- AssetRepository.filterNewExternalAssetPaths
+select
+ "path"
+from
+ unnest(array[$1]::text[]) as "path"
+where
+ not exists (
+ select
+ "originalPath"
+ from
+ "assets"
+ where
+ "assets"."originalPath" = "path"
+ and "libraryId" = $2::uuid
+ and "isExternal" = $3
+ )
diff --git a/server/src/queries/audit.repository.sql b/server/src/queries/audit.repository.sql
index 3c83d2d3e8..b1a10abf48 100644
--- a/server/src/queries/audit.repository.sql
+++ b/server/src/queries/audit.repository.sql
@@ -14,8 +14,3 @@ order by
"audit"."entityId" desc,
"audit"."entityType" desc,
"audit"."createdAt" desc
-
--- AuditRepository.removeBefore
-delete from "audit"
-where
- "createdAt" < $1
diff --git a/server/src/queries/memory.repository.sql b/server/src/queries/memory.repository.sql
index d44d017045..e9e7340bf6 100644
--- a/server/src/queries/memory.repository.sql
+++ b/server/src/queries/memory.repository.sql
@@ -1,11 +1,5 @@
-- NOTE: This file is auto generated by ./sql-generator
--- MemoryRepository.cleanup
-delete from "memories"
-where
- "createdAt" < $1
- and "isSaved" = $2
-
-- MemoryRepository.search
select
"memories".*,
diff --git a/server/src/queries/move.repository.sql b/server/src/queries/move.repository.sql
index a65c7a8b85..50c9ad7dd9 100644
--- a/server/src/queries/move.repository.sql
+++ b/server/src/queries/move.repository.sql
@@ -16,19 +16,6 @@ where
returning
*
--- MoveRepository.cleanMoveHistory
-delete from "move_history"
-where
- "move_history"."entityId" not in (
- select
- "id"
- from
- "assets"
- where
- "assets"."id" = "move_history"."entityId"
- )
- and "move_history"."pathType" = 'original'
-
-- MoveRepository.cleanMoveHistorySingle
delete from "move_history"
where
diff --git a/server/src/queries/notification.repository.sql b/server/src/queries/notification.repository.sql
index c55e00d226..f7e211d80a 100644
--- a/server/src/queries/notification.repository.sql
+++ b/server/src/queries/notification.repository.sql
@@ -1,23 +1,5 @@
-- NOTE: This file is auto generated by ./sql-generator
--- NotificationRepository.cleanup
-delete from "notifications"
-where
- (
- (
- "deletedAt" is not null
- and "deletedAt" < $1
- )
- or (
- "readAt" > $2
- and "createdAt" < $3
- )
- or (
- "readAt" = $4
- and "createdAt" < $5
- )
- )
-
-- NotificationRepository.search
select
"id",
diff --git a/server/src/queries/partner.repository.sql b/server/src/queries/partner.repository.sql
index e7170f367e..100f1bc638 100644
--- a/server/src/queries/partner.repository.sql
+++ b/server/src/queries/partner.repository.sql
@@ -100,50 +100,6 @@ where
"sharedWithId" = $1
and "sharedById" = $2
--- PartnerRepository.create
-insert into
- "partners" ("sharedWithId", "sharedById")
-values
- ($1, $2)
-returning
- *,
- (
- select
- to_json(obj)
- from
- (
- select
- "id",
- "name",
- "email",
- "avatarColor",
- "profileImagePath",
- "profileChangedAt"
- from
- "users" as "sharedBy"
- where
- "sharedBy"."id" = "partners"."sharedById"
- ) as obj
- ) as "sharedBy",
- (
- select
- to_json(obj)
- from
- (
- select
- "id",
- "name",
- "email",
- "avatarColor",
- "profileImagePath",
- "profileChangedAt"
- from
- "users" as "sharedWith"
- where
- "sharedWith"."id" = "partners"."sharedWithId"
- ) as obj
- ) as "sharedWith"
-
-- PartnerRepository.update
update "partners"
set
diff --git a/server/src/queries/person.repository.sql b/server/src/queries/person.repository.sql
index 659abbde03..fefc25ee6a 100644
--- a/server/src/queries/person.repository.sql
+++ b/server/src/queries/person.repository.sql
@@ -7,22 +7,10 @@ set
where
"asset_faces"."personId" = $2
--- PersonRepository.unassignFaces
-update "asset_faces"
-set
- "personId" = $1
-where
- "asset_faces"."sourceType" = $2
-
-- PersonRepository.delete
delete from "person"
where
- "person"."id" in $1
-
--- PersonRepository.deleteFaces
-delete from "asset_faces"
-where
- "asset_faces"."sourceType" = $1
+ "person"."id" in ($1)
-- PersonRepository.getAllWithoutFaces
select
@@ -216,21 +204,6 @@ where
"person"."ownerId" = $3
and "asset_faces"."deletedAt" is null
--- PersonRepository.refreshFaces
-with
- "added_embeddings" as (
- insert into
- "face_search" ("faceId", "embedding")
- values
- ($1, $2)
- )
-select
-from
- (
- select
- 1
- ) as "dummy"
-
-- PersonRepository.getFacesByIds
select
"asset_faces".*,
diff --git a/server/src/queries/system.metadata.repository.sql b/server/src/queries/system.metadata.repository.sql
index c4fd7b96f8..8bdf1b3ad7 100644
--- a/server/src/queries/system.metadata.repository.sql
+++ b/server/src/queries/system.metadata.repository.sql
@@ -8,15 +8,6 @@ from
where
"key" = $1
--- SystemMetadataRepository.set
-insert into
- "system_metadata" ("key", "value")
-values
- ($1, $2)
-on conflict ("key") do update
-set
- "value" = $3
-
-- SystemMetadataRepository.delete
delete from "system_metadata"
where
diff --git a/server/src/queries/tag.repository.sql b/server/src/queries/tag.repository.sql
index d728d3af88..af757d96b7 100644
--- a/server/src/queries/tag.repository.sql
+++ b/server/src/queries/tag.repository.sql
@@ -58,7 +58,7 @@ from
where
"userId" = $1
order by
- "value" asc
+ "value"
-- TagRepository.create
insert into
@@ -94,6 +94,15 @@ where
"tagsId" = $1
and "assetsId" in ($2)
+-- TagRepository.upsertAssetIds
+insert into
+ "tag_asset" ("assetId", "tagsIds")
+values
+ ($1, $2)
+on conflict do nothing
+returning
+ *
+
-- TagRepository.replaceAssetTags
begin
delete from "tag_asset"
@@ -107,17 +116,3 @@ on conflict do nothing
returning
*
rollback
-
--- TagRepository.deleteEmptyTags
-begin
-select
- "tags"."id",
- count("assets"."id") as "count"
-from
- "assets"
- inner join "tag_asset" on "tag_asset"."assetsId" = "assets"."id"
- inner join "tags_closure" on "tags_closure"."id_descendant" = "tag_asset"."tagsId"
- inner join "tags" on "tags"."id" = "tags_closure"."id_descendant"
-group by
- "tags"."id"
-commit
diff --git a/server/src/queries/version.history.repository.sql b/server/src/queries/version.history.repository.sql
index a9805e8c25..2e898cac31 100644
--- a/server/src/queries/version.history.repository.sql
+++ b/server/src/queries/version.history.repository.sql
@@ -15,11 +15,3 @@ from
"version_history"
order by
"createdAt" desc
-
--- VersionHistoryRepository.create
-insert into
- "version_history" ("version")
-values
- ($1)
-returning
- *
diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
index 9bd115089f..d49124b04b 100644
--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -817,9 +817,7 @@ export class AssetRepository {
.execute();
}
- @GenerateSql({
- params: [{ libraryId: DummyValue.UUID, importPaths: [DummyValue.STRING], exclusionPatterns: [DummyValue.STRING] }],
- })
+ @GenerateSql({ params: [DummyValue.UUID, [DummyValue.STRING], [DummyValue.STRING]] })
async detectOfflineExternalAssets(
libraryId: string,
importPaths: string[],
@@ -846,9 +844,7 @@ export class AssetRepository {
.executeTakeFirstOrThrow();
}
- @GenerateSql({
- params: [{ libraryId: DummyValue.UUID, paths: [DummyValue.STRING] }],
- })
+ @GenerateSql({ params: [DummyValue.UUID, [DummyValue.STRING]] })
async filterNewExternalAssetPaths(libraryId: string, paths: string[]): Promise<string[]> {
const result = await this.db
.selectFrom(unnest(paths).as('path'))
diff --git a/server/src/repositories/audit.repository.ts b/server/src/repositories/audit.repository.ts
index 48d7f28d12..1193e26ebe 100644
--- a/server/src/repositories/audit.repository.ts
+++ b/server/src/repositories/audit.repository.ts
@@ -38,7 +38,6 @@ export class AuditRepository {
return records.map(({ entityId }) => entityId);
}
- @GenerateSql({ params: [DummyValue.DATE] })
async removeBefore(before: Date): Promise<void> {
await this.db.deleteFrom('audit').where('createdAt', '<', before).execute();
}
diff --git a/server/src/repositories/memory.repository.ts b/server/src/repositories/memory.repository.ts
index 44c7c30857..1a1ea2827b 100644
--- a/server/src/repositories/memory.repository.ts
+++ b/server/src/repositories/memory.repository.ts
@@ -12,7 +12,6 @@ import { IBulkAsset } from 'src/types';
export class MemoryRepository implements IBulkAsset {
constructor(@InjectKysely() private db: Kysely<DB>) {}
- @GenerateSql({ params: [DummyValue.UUID] })
cleanup() {
return this.db
.deleteFrom('memories')
diff --git a/server/src/repositories/move.repository.ts b/server/src/repositories/move.repository.ts
index 21c52aec65..a21167fffd 100644
--- a/server/src/repositories/move.repository.ts
+++ b/server/src/repositories/move.repository.ts
@@ -37,7 +37,6 @@ export class MoveRepository {
return this.db.deleteFrom('move_history').where('id', '=', id).returningAll().executeTakeFirstOrThrow();
}
- @GenerateSql()
async cleanMoveHistory(): Promise<void> {
await this.db
.deleteFrom('move_history')
@@ -52,7 +51,7 @@ export class MoveRepository {
.execute();
}
- @GenerateSql()
+ @GenerateSql({ params: [DummyValue.UUID] })
async cleanMoveHistorySingle(assetId: string): Promise<void> {
await this.db
.deleteFrom('move_history')
diff --git a/server/src/repositories/notification.repository.ts b/server/src/repositories/notification.repository.ts
index 112bb97e60..b35f532094 100644
--- a/server/src/repositories/notification.repository.ts
+++ b/server/src/repositories/notification.repository.ts
@@ -9,7 +9,6 @@ import { NotificationSearchDto } from 'src/dtos/notification.dto';
export class NotificationRepository {
constructor(@InjectKysely() private db: Kysely<DB>) {}
- @GenerateSql({ params: [DummyValue.UUID] })
cleanup() {
return this.db
.deleteFrom('notifications')
diff --git a/server/src/repositories/partner.repository.ts b/server/src/repositories/partner.repository.ts
index ea762d0aaf..31350541ca 100644
--- a/server/src/repositories/partner.repository.ts
+++ b/server/src/repositories/partner.repository.ts
@@ -47,7 +47,6 @@ export class PartnerRepository {
.executeTakeFirst();
}
- @GenerateSql({ params: [{ sharedWithId: DummyValue.UUID, sharedById: DummyValue.UUID }] })
create(values: Insertable<Partners>) {
return this.db
.insertInto('partners')
diff --git a/server/src/repositories/person.repository.ts b/server/src/repositories/person.repository.ts
index 0b48e57f7a..ad18d7ed67 100644
--- a/server/src/repositories/person.repository.ts
+++ b/server/src/repositories/person.repository.ts
@@ -98,7 +98,6 @@ export class PersonRepository {
return Number(result.numChangedRows ?? 0);
}
- @GenerateSql({ params: [{ sourceType: SourceType.EXIF }] })
async unassignFaces({ sourceType }: UnassignFacesOptions): Promise<void> {
await this.db
.updateTable('asset_faces')
@@ -107,7 +106,7 @@ export class PersonRepository {
.execute();
}
- @GenerateSql({ params: [DummyValue.UUID] })
+ @GenerateSql({ params: [[DummyValue.UUID]] })
async delete(ids: string[]): Promise<void> {
if (ids.length === 0) {
return;
@@ -116,7 +115,6 @@ export class PersonRepository {
await this.db.deleteFrom('person').where('person.id', 'in', ids).execute();
}
- @GenerateSql({ params: [{ sourceType: SourceType.EXIF }] })
async deleteFaces({ sourceType }: DeleteFacesOptions): Promise<void> {
await this.db.deleteFrom('asset_faces').where('asset_faces.sourceType', '=', sourceType).execute();
}
@@ -400,7 +398,6 @@ export class PersonRepository {
return results.map(({ id }) => id);
}
- @GenerateSql({ params: [[], [], [{ faceId: DummyValue.UUID, embedding: DummyValue.VECTOR }]] })
async refreshFaces(
facesToAdd: (Insertable<AssetFaces> & { assetId: string })[],
faceIdsToRemove: string[],
diff --git a/server/src/repositories/system-metadata.repository.ts b/server/src/repositories/system-metadata.repository.ts
index 2038f204f7..fcccde6a5c 100644
--- a/server/src/repositories/system-metadata.repository.ts
+++ b/server/src/repositories/system-metadata.repository.ts
@@ -26,7 +26,6 @@ export class SystemMetadataRepository {
return metadata.value as SystemMetadata[T];
}
- @GenerateSql({ params: ['metadata_key', { foo: 'bar' }] })
async set<T extends keyof SystemMetadata>(key: T, value: SystemMetadata[T]): Promise<void> {
await this.db
.insertInto('system_metadata')
diff --git a/server/src/repositories/tag.repository.ts b/server/src/repositories/tag.repository.ts
index 9a3b33188f..a7cdc9554c 100644
--- a/server/src/repositories/tag.repository.ts
+++ b/server/src/repositories/tag.repository.ts
@@ -68,7 +68,7 @@ export class TagRepository {
@GenerateSql({ params: [DummyValue.UUID] })
getAll(userId: string) {
- return this.db.selectFrom('tags').select(columns.tag).where('userId', '=', userId).orderBy('value asc').execute();
+ return this.db.selectFrom('tags').select(columns.tag).where('userId', '=', userId).orderBy('value').execute();
}
@GenerateSql({ params: [{ userId: DummyValue.UUID, color: DummyValue.STRING, value: DummyValue.STRING }] })
@@ -126,7 +126,7 @@ export class TagRepository {
await this.db.deleteFrom('tag_asset').where('tagsId', '=', tagId).where('assetsId', 'in', assetIds).execute();
}
- @GenerateSql({ params: [{ assetId: DummyValue.UUID, tagsIds: [DummyValue.UUID] }] })
+ @GenerateSql({ params: [[{ assetId: DummyValue.UUID, tagsIds: [DummyValue.UUID] }]] })
@Chunked()
upsertAssetIds(items: Insertable<TagAsset>[]) {
if (items.length === 0) {
@@ -160,7 +160,6 @@ export class TagRepository {
});
}
- @GenerateSql()
async deleteEmptyTags() {
// TODO rewrite as a single statement
await this.db.transaction().execute(async (tx) => {
diff --git a/server/src/repositories/version-history.repository.ts b/server/src/repositories/version-history.repository.ts
index 063ee0da84..b1d2696164 100644
--- a/server/src/repositories/version-history.repository.ts
+++ b/server/src/repositories/version-history.repository.ts
@@ -18,7 +18,6 @@ export class VersionHistoryRepository {
return this.db.selectFrom('version_history').selectAll().orderBy('createdAt', 'desc').executeTakeFirst();
}
- @GenerateSql({ params: [{ version: 'v1.123.0' }] })
create(version: Insertable<VersionHistory>) {
return this.db.insertInto('version_history').values(version).returningAll().executeTakeFirstOrThrow();
}