Restructure guilds table

src/commands/autocomplete.rs

@@ -24,7 +24,7 @@ pub async fn macro_name_autocomplete(ctx: Context<'_>, partial: &str) -> Vec<Str
         SELECT name
         FROM command_macro
         WHERE
-            guild_id = (SELECT id FROM guilds WHERE guild = ?)
+            guild_id = ?
             AND name LIKE CONCAT(?, '%')
         ",
         ctx.guild_id().unwrap().get(),

src/commands/command_macro/delete_macro.rs

@@ -17,12 +17,10 @@ pub async fn delete_macro(
 ) -> Result<(), Error> {
     match sqlx::query!(
         "
-        SELECT m.id
-        FROM command_macro m
-        INNER JOIN guilds
-            ON guilds.id = m.guild_id
-        WHERE guild = ?
-            AND m.name = ?
+        SELECT id
+        FROM command_macro
+        WHERE guild_id = ?
+            AND name = ?
         ",
         ctx.guild_id().unwrap().get(),
         name

src/commands/command_macro/finish_macro.rs

@@ -32,7 +32,7 @@ pub async fn finish_macro(ctx: Context<'_>) -> Result<(), Error> {
             let json = serde_json::to_string(&command_macro.commands).unwrap();
 
             sqlx::query!(
-                "INSERT INTO command_macro (guild_id, name, description, commands) VALUES ((SELECT id FROM guilds WHERE guild = ?), ?, ?, ?)",
+                "INSERT INTO command_macro (guild_id, name, description, commands) VALUES (?, ?, ?, ?)",
                 command_macro.guild_id.get(),
                 command_macro.name,
                 command_macro.description,

src/commands/command_macro/record_macro.rs

@@ -35,7 +35,7 @@ pub async fn record_macro(
         "
         SELECT 1 as _e
         FROM command_macro
-        WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?)
+        WHERE guild_id = ?
             AND name = ?
         ",
         guild_id.get(),

src/commands/todo/channel/add.rs

@@ -21,7 +21,7 @@ impl Recordable for Options {
             "
             INSERT INTO todos (guild_id, channel_id, value)
             VALUES (
-                (SELECT id FROM guilds WHERE guild = ?),
+                ?,
                 (SELECT id FROM channels WHERE channel = ?),
                 ?
             )

src/commands/todo/guild/add.rs

@@ -18,7 +18,7 @@ impl Recordable for Options {
             "
             INSERT INTO todos (guild_id, value)
             VALUES (
-                (SELECT id FROM guilds WHERE guild = ?), ?
+                ?, ?
             )
             ",
             ctx.guild_id().unwrap().get(),

src/commands/todo/guild/view.rs

@@ -13,9 +13,8 @@ impl Recordable for Options {
     async fn run(self, ctx: Context<'_>) -> Result<(), Error> {
         let values = sqlx::query!(
             "
-            SELECT todos.id, value FROM todos
-            INNER JOIN guilds ON todos.guild_id = guilds.id
-            WHERE guilds.guild = ?
+            SELECT id, value FROM todos
+            WHERE guild_id = ?
             ",
             ctx.guild_id().unwrap().get(),
         )