From 279a69f3b316976c82c3ec3643cdca075b65f6a3 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Mon, 16 Mar 2026 12:05:33 -0500
Subject: [PATCH] Relax migration schema a bit

Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
---
 ts/sql/migrations/1680-cleanup-empty-strings.std.ts | 1 +
 ts/test-node/sql/migration_1680_test.node.ts        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ts/sql/migrations/1680-cleanup-empty-strings.std.ts b/ts/sql/migrations/1680-cleanup-empty-strings.std.ts
index d760a8c19d..b82521045b 100644
--- a/ts/sql/migrations/1680-cleanup-empty-strings.std.ts
+++ b/ts/sql/migrations/1680-cleanup-empty-strings.std.ts
@@ -8,6 +8,7 @@ import { safeParseUnknown } from '../../util/schemas.std.js';
 
 const toNullable = z
   .string()
+  .or(z.null())
   .optional()
   .transform(value => value || undefined);
 
diff --git a/ts/test-node/sql/migration_1680_test.node.ts b/ts/test-node/sql/migration_1680_test.node.ts
index a0ad3103f3..f4bf11717e 100644
--- a/ts/test-node/sql/migration_1680_test.node.ts
+++ b/ts/test-node/sql/migration_1680_test.node.ts
@@ -88,7 +88,7 @@ describe('SQL/updateToSchemaVersion1680', () => {
           systemGivenName: '',
           systemFamilyName: '',
           systemNickname: '',
-          nicknameGivenName: '',
+          nicknameGivenName: null,
           nicknameFamilyName: '',
           username: '',