High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: schema check (#26543)
Daniel Dietzler9f9569c15247
diff --git a/server/src/repositories/database.repository.ts b/server/src/repositories/database.repository.tsindex 06bdef5abf..4ffb37c79c 100644--- a/server/src/repositories/database.repository.ts+++ b/server/src/repositories/database.repository.ts@@ -22,6 +22,7 @@ import { ConfigRepository } from 'src/repositories/config.repository';import { LoggingRepository } from 'src/repositories/logging.repository';import 'src/schema'; // make sure all schema definitions are imported for schemaFromCodeimport { DB } from 'src/schema';+import { immich_uuid_v7 } from 'src/schema/functions';import { ExtensionVersion, VectorExtension, VectorUpdateResult } from 'src/types';import { vectorIndexQuery } from 'src/utils/database';import { isValidInteger } from 'src/validation';@@ -288,7 +289,11 @@ export class DatabaseRepository {}async getSchemaDrift() {- const source = schemaFromCode({ overrides: true, namingStrategy: 'default' });+ const source = schemaFromCode({+ overrides: true,+ namingStrategy: 'default',+ uuidFunction: (version) => (version === 7 ? `${immich_uuid_v7.name}()` : 'uuid_generate_v4()'),+ });const { database } = this.configRepository.getEnv();const target = await schemaFromDatabase({ connection: database.config });diff --git a/server/src/schema/functions.ts b/server/src/schema/functions.tsindex d143e582ca..6dbbd28b1a 100644--- a/server/src/schema/functions.ts+++ b/server/src/schema/functions.ts@@ -280,7 +280,7 @@ export const asset_edit_delete = registerFunction({UPDATE assetSET "isEdited" = falseFROM deleted_edit- WHERE asset.id = deleted_edit."assetId" AND asset."isEdited"+ WHERE asset.id = deleted_edit."assetId" AND asset."isEdited"AND NOT EXISTS (SELECT FROM asset_edit edit WHERE edit."assetId" = asset.id);RETURN NULL;ENDdiff --git a/server/src/schema/migrations/1772129818245-FixStupidWhiteSpace.ts b/server/src/schema/migrations/1772129818245-FixStupidWhiteSpace.tsnew file mode 100644index 0000000000..7dc2c5c72f--- /dev/null+++ b/server/src/schema/migrations/1772129818245-FixStupidWhiteSpace.ts@@ -0,0 +1,36 @@+import { Kysely, sql } from 'kysely';++export async function up(db: Kysely<any>): Promise<void> {+ await sql`CREATE OR REPLACE FUNCTION asset_edit_delete()+ RETURNS TRIGGER+ LANGUAGE PLPGSQL+ AS $$+ BEGIN+ UPDATE asset+ SET "isEdited" = false+ FROM deleted_edit+ WHERE asset.id = deleted_edit."assetId" AND asset."isEdited"+ AND NOT EXISTS (SELECT FROM asset_edit edit WHERE edit."assetId" = asset.id);+ RETURN NULL;+ END+ $$;`.execute(db);+ await sql`UPDATE "migration_overrides" SET "value" = '{"type":"function","name":"asset_edit_delete","sql":"CREATE OR REPLACE FUNCTION asset_edit_delete()\\n RETURNS TRIGGER\\n LANGUAGE PLPGSQL\\n AS $$\\n BEGIN\\n UPDATE asset\\n SET \\"isEdited\\" = false\\n FROM deleted_edit\\n WHERE asset.id = deleted_edit.\\"assetId\\" AND asset.\\"isEdited\\"\\n AND NOT EXISTS (SELECT FROM asset_edit edit WHERE edit.\\"assetId\\" = asset.id);\\n RETURN NULL;\\n END\\n $$;"}'::jsonb WHERE "name" = 'function_asset_edit_delete';`.execute(db);+}++export async function down(db: Kysely<any>): Promise<void> {+ await sql`CREATE OR REPLACE FUNCTION public.asset_edit_delete()+ RETURNS trigger+ LANGUAGE plpgsql+AS $function$+ BEGIN+ UPDATE asset+ SET "isEdited" = false+ FROM deleted_edit+ WHERE asset.id = deleted_edit."assetId" AND asset."isEdited"+ AND NOT EXISTS (SELECT FROM asset_edit edit WHERE edit."assetId" = asset.id);+ RETURN NULL;+ END+ $function$+`.execute(db);+ await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE OR REPLACE FUNCTION asset_edit_delete()\\n RETURNS TRIGGER\\n LANGUAGE PLPGSQL\\n AS $$\\n BEGIN\\n UPDATE asset\\n SET \\"isEdited\\" = false\\n FROM deleted_edit\\n WHERE asset.id = deleted_edit.\\"assetId\\" AND asset.\\"isEdited\\" \\n AND NOT EXISTS (SELECT FROM asset_edit edit WHERE edit.\\"assetId\\" = asset.id);\\n RETURN NULL;\\n END\\n $$;","name":"asset_edit_delete","type":"function"}'::jsonb WHERE "name" = 'function_asset_edit_delete';`.execute(db);+}