Rename "channel" to "conversation" in the database.

I've - somewhat arbitrarily - started renaming column aliases, as well, though the corresponding Rust data model, API fields and nouns, and client code still references them as "channel" (or as derived terms).

As with so many schema changes, this entails a complete rebuild of a substantial portion of the schema. sqlite3 still doesn't have very many `alter table` primitives, for renaming columns in particular.

1 files changed, 14 insertions, 14 deletions

diff --git a/src/message/repo.rs b/src/message/repo.rs
index e753134..159ce8e 100644
--- a/src/message/repo.rs
+++ b/src/message/repo.rs
@@ -33,11 +33,11 @@ impl Messages<'_> {
         let message = sqlx::query!(
             r#"
                 insert into message
-                    (id, channel, sender, sent_at, sent_sequence, body, last_sequence)
+                    (id, conversation, sender, sent_at, sent_sequence, body, last_sequence)
                 values ($1, $2, $3, $4, $5, $6, $7)
                 returning
                     id as "id: Id",
-                    channel as "channel: channel::Id",
+                    conversation as "conversation: channel::Id",
                     sender as "sender: user::Id",
                     sent_at as "sent_at: DateTime",
                     sent_sequence as "sent_sequence: Sequence",
@@ -54,7 +54,7 @@ impl Messages<'_> {
         .map(|row| History {
             message: Message {
                 sent: Instant::new(row.sent_at, row.sent_sequence),
-                channel: row.channel,
+                channel: row.conversation,
                 sender: row.sender,
                 id: row.id,
                 body: row.body.unwrap_or_default(),
@@ -73,7 +73,7 @@ impl Messages<'_> {
         let messages = sqlx::query!(
             r#"
                 select
-                    message.channel as "channel: channel::Id",
+                    message.conversation as "conversation: channel::Id",
                     message.sender as "sender: user::Id",
                     id as "id: Id",
                     message.body as "body: Body",
@@ -84,7 +84,7 @@ impl Messages<'_> {
                 from message
                 left join message_deleted as deleted
                     using (id)
-                where message.channel = $1
+                where message.conversation = $1
                     and deleted.id is null
             "#,
             channel_id,
@@ -92,7 +92,7 @@ impl Messages<'_> {
         .map(|row| History {
             message: Message {
                 sent: Instant::new(row.sent_at, row.sent_sequence),
-                channel: row.channel,
+                channel: row.conversation,
                 sender: row.sender,
                 id: row.id,
                 body: row.body.unwrap_or_default(),
@@ -110,7 +110,7 @@ impl Messages<'_> {
         let messages = sqlx::query!(
             r#"
                 select
-                    message.channel as "channel: channel::Id",
+                    message.conversation as "conversation: channel::Id",
                     message.sender as "sender: user::Id",
                     message.id as "id: Id",
                     message.body as "body: Body",
@@ -129,7 +129,7 @@ impl Messages<'_> {
         .map(|row| History {
             message: Message {
                 sent: Instant::new(row.sent_at, row.sent_sequence),
-                channel: row.channel,
+                channel: row.conversation,
                 sender: row.sender,
                 id: row.id,
                 body: row.body.unwrap_or_default(),
@@ -147,7 +147,7 @@ impl Messages<'_> {
         let message = sqlx::query!(
             r#"
                 select
-                    message.channel as "channel: channel::Id",
+                    message.conversation as "conversation: channel::Id",
                     message.sender as "sender: user::Id",
                     id as "id: Id",
                     message.body as "body: Body",
@@ -165,7 +165,7 @@ impl Messages<'_> {
         .map(|row| History {
             message: Message {
                 sent: Instant::new(row.sent_at, row.sent_sequence),
-                channel: row.channel,
+                channel: row.conversation,
                 sender: row.sender,
                 id: row.id,
                 body: row.body.unwrap_or_default(),
@@ -252,7 +252,7 @@ impl Messages<'_> {
             r#"
                 select
                     id as "id: Id",
-                    message.channel as "channel: channel::Id",
+                    message.conversation as "conversation: channel::Id",
                     message.sender as "sender: user::Id",
                     message.sent_at as "sent_at: DateTime",
                     message.sent_sequence as "sent_sequence: Sequence",
@@ -271,7 +271,7 @@ impl Messages<'_> {
             message: Message {
                 sent: Instant::new(row.sent_at, row.sent_sequence),
                 id: row.id,
-                channel: row.channel,
+                channel: row.conversation,
                 sender: row.sender,
                 body: row.body.unwrap_or_default(),
                 deleted_at: row.deleted_at,
@@ -289,7 +289,7 @@ impl Messages<'_> {
             r#"
                 select
                     id as "id: Id",
-                    message.channel as "channel: channel::Id",
+                    message.conversation as "conversation: channel::Id",
                     message.sender as "sender: user::Id",
                     message.sent_at as "sent_at: DateTime",
                     message.sent_sequence as "sent_sequence: Sequence",
@@ -306,7 +306,7 @@ impl Messages<'_> {
         .map(|row| History {
             message: Message {
                 sent: Instant::new(row.sent_at, row.sent_sequence),
-                channel: row.channel,
+                channel: row.conversation,
                 sender: row.sender,
                 id: row.id,
                 body: row.body.unwrap_or_default(),