refactor(migration): fix merge
This commit is contained in:
parent
7bdd9b648a
commit
3949a60828
@ -204,7 +204,8 @@ customMigrations = mapF $ \case
|
|||||||
DELETE FROM "company" WHERE avs_id = 0;
|
DELETE FROM "company" WHERE avs_id = 0;
|
||||||
ALTER TABLE "company" DROP CONSTRAINT IF EXISTS "unique_company_shorthand";
|
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|
|
[executeQQ|
|
||||||
ALTER TABLE "user" ADD COLUMN "password_hash" VARCHAR NULL;
|
ALTER TABLE "user" ADD COLUMN "password_hash" VARCHAR NULL;
|
||||||
|]
|
|]
|
||||||
|
|||||||
Reference in New Issue
Block a user