Restructure guilds table

This commit is contained in:
jude
2025-05-23 22:04:21 +01:00
parent 19cfacffe5
commit f35c5082f1
12 changed files with 63 additions and 64 deletions

View File

@ -31,7 +31,7 @@ pub async fn get_reminder_templates(
match sqlx::query_as_unchecked!(
ReminderTemplate,
"SELECT * FROM reminder_template WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?)",
"SELECT * FROM reminder_template WHERE guild_id = ?",
id
)
.fetch_all(pool.inner())
@ -87,7 +87,7 @@ pub async fn delete_reminder_template(
check_authorization(cookies, ctx.inner(), id).await?;
match sqlx::query!(
"DELETE FROM reminder_template WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?) AND id = ?",
"DELETE FROM reminder_template WHERE guild_id = ? AND id = ?",
id, delete_reminder_template.id
)
.fetch_all(pool.inner())

View File

@ -66,7 +66,7 @@ pub async fn create_todo(
"
INSERT INTO todos (guild_id, channel_id, value)
VALUES (
(SELECT id FROM guilds WHERE guild = ?),
?,
(SELECT id FROM channels WHERE channel = ?),
?
)
@ -88,7 +88,7 @@ pub async fn create_todo(
"
INSERT INTO todos (guild_id, channel_id, value)
VALUES (
(SELECT id FROM guilds WHERE guild = ?),
?,
NULL,
?
)
@ -130,11 +130,9 @@ pub async fn get_todo(
channels.channel AS channel_id,
value
FROM todos
INNER JOIN guilds
ON guilds.id = todos.guild_id
LEFT JOIN channels
ON channels.id = todos.channel_id
WHERE guilds.guild = ?
WHERE todos.guild_id = ?
",
id
)
@ -167,7 +165,7 @@ pub async fn update_todo(
"
UPDATE todos
SET value = ?
WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?)
WHERE guild_id = ?
AND id = ?
",
todo.value,
@ -202,7 +200,7 @@ pub async fn delete_todo(
sqlx::query!(
"
DELETE FROM todos
WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?)
WHERE guild_id = ?
AND id = ?
",
guild_id,