feat: upgrade kysely (#17630)

* feat: upgrade kysely

* chore: pr feedback

server/src/repositories/asset-job.repository.ts

@@ -75,16 +75,19 @@ export class AssetJobRepository {
       .where('assets.deletedAt', 'is', null);
   }
 
+  @GenerateSql({ params: [DummyValue.UUID] })
   getForStorageTemplateJob(id: string): Promise<StorageAsset | undefined> {
     return this.storageTemplateAssetQuery().where('assets.id', '=', id).executeTakeFirst() as Promise<
       StorageAsset | undefined
     >;
   }
 
+  @GenerateSql({ params: [], stream: true })
   streamForStorageTemplateJob() {
     return this.storageTemplateAssetQuery().stream() as AsyncIterableIterator<StorageAsset>;
   }
 
+  @GenerateSql({ params: [DummyValue.DATE], stream: true })
   streamForDeletedJob(trashedBefore: Date) {
     return this.db
       .selectFrom('assets')

server/src/repositories/config.repository.ts

@@ -9,7 +9,6 @@ import { CLS_ID, ClsModuleOptions } from 'nestjs-cls';
 import { OpenTelemetryModuleOptions } from 'nestjs-otel/lib/interfaces';
 import { join, resolve } from 'node:path';
 import { parse } from 'pg-connection-string';
-import { Notice } from 'postgres';
 import { citiesFile, excludePaths, IWorker } from 'src/constants';
 import { Telemetry } from 'src/decorators';
 import { EnvDto } from 'src/dtos/env.dto';
@@ -23,23 +22,10 @@ import {
   QueueName,
 } from 'src/enum';
 import { DatabaseConnectionParams, VectorExtension } from 'src/types';
+import { isValidSsl, PostgresConnectionConfig } from 'src/utils/database';
 import { setDifference } from 'src/utils/set';
 import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions.js';
 
-type Ssl = 'require' | 'allow' | 'prefer' | 'verify-full' | boolean | object;
-type PostgresConnectionConfig = {
-  host?: string;
-  password?: string;
-  user?: string;
-  port?: number;
-  database?: string;
-  client_encoding?: string;
-  ssl?: Ssl;
-  application_name?: string;
-  fallback_application_name?: string;
-  options?: string;
-};
-
 export interface EnvData {
   host?: string;
   port: number;
@@ -144,9 +130,6 @@ const asSet = <T>(value: string | undefined, defaults: T[]) => {
   return new Set(values.length === 0 ? defaults : (values as T[]));
 };
 
-const isValidSsl = (ssl?: string | boolean | object): ssl is Ssl =>
-  typeof ssl !== 'string' || ssl === 'require' || ssl === 'allow' || ssl === 'prefer' || ssl === 'verify-full';
-
 const getEnv = (): EnvData => {
   const dto = plainToInstance(EnvDto, process.env);
   const errors = validateSync(dto);
@@ -233,33 +216,6 @@ const getEnv = (): EnvData => {
     };
   }
 
-  const driverOptions = {
-    ...parsedOptions,
-    onnotice: (notice: Notice) => {
-      if (notice['severity'] !== 'NOTICE') {
-        console.warn('Postgres notice:', notice);
-      }
-    },
-    max: 10,
-    types: {
-      date: {
-        to: 1184,
-        from: [1082, 1114, 1184],
-        serialize: (x: Date | string) => (x instanceof Date ? x.toISOString() : x),
-        parse: (x: string) => new Date(x),
-      },
-      bigint: {
-        to: 20,
-        from: [20, 1700],
-        parse: (value: string) => Number.parseInt(value),
-        serialize: (value: number) => value.toString(),
-      },
-    },
-    connection: {
-      TimeZone: 'UTC',
-    },
-  };
-
   return {
     host: dto.IMMICH_HOST,
     port: dto.IMMICH_PORT || 2283,
@@ -325,7 +281,7 @@ const getEnv = (): EnvData => {
           parseInt8: true,
           ...(databaseUrl ? { connectionType: 'url', url: databaseUrl } : parts),
         },
-        kysely: driverOptions,
+        kysely: parsedOptions,
       },
 
       skipMigrations: dto.DB_SKIP_MIGRATIONS ?? false,

server/src/repositories/search.repository.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { Kysely, OrderByDirectionExpression, sql } from 'kysely';
+import { Kysely, OrderByDirection, sql } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
 import { randomUUID } from 'node:crypto';
 import { DB } from 'src/db';
@@ -223,7 +223,7 @@ export class SearchRepository {
     ],
   })
   async searchMetadata(pagination: SearchPaginationOptions, options: AssetSearchOptions): Paginated<AssetEntity> {
-    const orderDirection = (options.orderDirection?.toLowerCase() || 'desc') as OrderByDirectionExpression;
+    const orderDirection = (options.orderDirection?.toLowerCase() || 'desc') as OrderByDirection;
     const items = await searchAssetBuilder(this.db, options)
       .orderBy('assets.fileCreatedAt', orderDirection)
       .limit(pagination.size + 1)

server/src/repositories/sync.repository.ts

@@ -3,6 +3,7 @@ import { Insertable, Kysely, SelectQueryBuilder, sql } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
 import { columns } from 'src/database';
 import { DB, SessionSyncCheckpoints } from 'src/db';
+import { DummyValue, GenerateSql } from 'src/decorators';
 import { SyncEntityType } from 'src/enum';
 import { SyncAck } from 'src/types';
 
@@ -13,6 +14,7 @@ type upsertTables = 'users' | 'partners' | 'assets' | 'exif';
 export class SyncRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
+  @GenerateSql({ params: [DummyValue.UUID] })
   getCheckpoints(sessionId: string) {
     return this.db
       .selectFrom('session_sync_checkpoints')
@@ -33,6 +35,7 @@ export class SyncRepository {
       .execute();
   }
 
+  @GenerateSql({ params: [DummyValue.UUID] })
   deleteCheckpoints(sessionId: string, types?: SyncEntityType[]) {
     return this.db
       .deleteFrom('session_sync_checkpoints')
@@ -41,6 +44,7 @@ export class SyncRepository {
       .execute();
   }
 
+  @GenerateSql({ params: [], stream: true })
   getUserUpserts(ack?: SyncAck) {
     return this.db
       .selectFrom('users')
@@ -49,6 +53,7 @@ export class SyncRepository {
       .stream();
   }
 
+  @GenerateSql({ params: [], stream: true })
   getUserDeletes(ack?: SyncAck) {
     return this.db
       .selectFrom('users_audit')
@@ -57,6 +62,7 @@ export class SyncRepository {
       .stream();
   }
 
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getPartnerUpserts(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('partners')
@@ -66,6 +72,7 @@ export class SyncRepository {
       .stream();
   }
 
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getPartnerDeletes(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('partners_audit')
@@ -75,6 +82,7 @@ export class SyncRepository {
       .stream();
   }
 
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getAssetUpserts(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('assets')
@@ -84,6 +92,7 @@ export class SyncRepository {
       .stream();
   }
 
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getPartnerAssetsUpserts(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('assets')
@@ -95,6 +104,7 @@ export class SyncRepository {
       .stream();
   }
 
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getAssetDeletes(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('assets_audit')
@@ -105,6 +115,7 @@ export class SyncRepository {
       .stream();
   }
 
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getPartnerAssetDeletes(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('assets_audit')
@@ -116,6 +127,7 @@ export class SyncRepository {
       .stream();
   }
 
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getAssetExifsUpserts(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('exif')
@@ -125,6 +137,7 @@ export class SyncRepository {
       .stream();
   }
 
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getPartnerAssetExifsUpserts(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('exif')