From d3fbecc57b5d6fa3223b945a45fe21eb78ffd49b Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Fri, 18 Oct 2024 23:25:21 -0400
Subject: Switch to blanking tombstoned data with null, not empty string.

This accomplishes two things:

* It removes the need for an additional `channel_name_reservation` table, since `channel.name` now only contains non-null values for active channels, and
* It nicely dovetails with the idea that `null` means an unknown value in SQL-land.
---
 src/message/repo.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/message')

diff --git a/src/message/repo.rs b/src/message/repo.rs
index 14ff7bf..85a69fc 100644
--- a/src/message/repo.rs
+++ b/src/message/repo.rs
@@ -57,7 +57,7 @@ impl<'c> Messages<'c> {
                 channel: row.channel,
                 sender: row.sender,
                 id: row.id,
-                body: row.body,
+                body: row.body.unwrap_or_default(),
                 deleted_at: None,
             },
             deleted: None,
@@ -95,7 +95,7 @@ impl<'c> Messages<'c> {
                 channel: row.channel,
                 sender: row.sender,
                 id: row.id,
-                body: row.body,
+                body: row.body.unwrap_or_default(),
                 deleted_at: row.deleted_at,
             },
             deleted: Instant::optional(row.deleted_at, row.deleted_sequence),
@@ -132,7 +132,7 @@ impl<'c> Messages<'c> {
                 channel: row.channel,
                 sender: row.sender,
                 id: row.id,
-                body: row.body,
+                body: row.body.unwrap_or_default(),
                 deleted_at: row.deleted_at,
             },
             deleted: Instant::optional(row.deleted_at, row.deleted_sequence),
@@ -153,8 +153,8 @@ impl<'c> Messages<'c> {
                     message.body,
                     message.sent_at as "sent_at: DateTime",
                     message.sent_sequence as "sent_sequence: Sequence",
-                    deleted.deleted_at as "deleted_at: DateTime",
-                    deleted.deleted_sequence as "deleted_sequence: Sequence"
+                    deleted.deleted_at as "deleted_at?: DateTime",
+                    deleted.deleted_sequence as "deleted_sequence?: Sequence"
                 from message
                 left join message_deleted as deleted
                     using (id)
@@ -168,7 +168,7 @@ impl<'c> Messages<'c> {
                 channel: row.channel,
                 sender: row.sender,
                 id: row.id,
-                body: row.body,
+                body: row.body.unwrap_or_default(),
                 deleted_at: row.deleted_at,
             },
             deleted: Instant::optional(row.deleted_at, row.deleted_sequence),
@@ -257,8 +257,8 @@ impl<'c> Messages<'c> {
                     message.sent_at as "sent_at: DateTime",
                     message.sent_sequence as "sent_sequence: Sequence",
                     message.body,
-                    deleted.deleted_at as "deleted_at: DateTime",
-                    deleted.deleted_sequence as "deleted_sequence: Sequence"
+                    deleted.deleted_at as "deleted_at?: DateTime",
+                    deleted.deleted_sequence as "deleted_sequence?: Sequence"
                 from message
                 left join message_deleted as deleted
                     using (id)
@@ -273,7 +273,7 @@ impl<'c> Messages<'c> {
                 id: row.id,
                 channel: row.channel,
                 sender: row.sender,
-                body: row.body,
+                body: row.body.unwrap_or_default(),
                 deleted_at: row.deleted_at,
             },
             deleted: Instant::optional(row.deleted_at, row.deleted_sequence),
@@ -309,7 +309,7 @@ impl<'c> Messages<'c> {
                 channel: row.channel,
                 sender: row.sender,
                 id: row.id,
-                body: row.body,
+                body: row.body.unwrap_or_default(),
                 deleted_at: row.deleted_at,
             },
             deleted: Instant::optional(row.deleted_at, row.deleted_sequence),
-- 
cgit v1.2.3