From 3949a608280a8224e339aac9df6f31e39f72c9da Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 20 Feb 2025 15:04:57 +0100 Subject: [PATCH] refactor(migration): fix merge --- src/Model/Migration/Definitions.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Model/Migration/Definitions.hs b/src/Model/Migration/Definitions.hs index 6c96b7cd1..4df42a7c5 100644 --- a/src/Model/Migration/Definitions.hs +++ b/src/Model/Migration/Definitions.hs @@ -204,7 +204,8 @@ customMigrations = mapF $ \case DELETE FROM "company" WHERE avs_id = 0; ALTER TABLE "company" DROP CONSTRAINT IF EXISTS "unique_company_shorthand"; |] - Migration20240312OAuth2 -> whenM (andM [ columnNotExists "user" "password_hash", columnExists "user" "authentication", columnExists "user" "last_ldap_synchronisation", columnNotExists "user" "last_sync", columnExists "user" "ldap_primary_key" ]) $ do + + Migration20240312OAuth2 -> whenM (andM [ columnNotExists "user" "password_hash", columnExists "user" "authentication", columnExists "user" "last_ldap_synchronisation", columnNotExists "user" "last_sync", columnExists "user" "ldap_primary_key" ]) $ do [executeQQ| ALTER TABLE "user" ADD COLUMN "password_hash" VARCHAR NULL; |]