Update schemas and resolve some warnings

This commit is contained in:
jude
2024-07-16 10:42:32 +01:00
parent 54ee3594eb
commit febd04c374
26 changed files with 221 additions and 164 deletions

View File

@ -85,17 +85,13 @@ impl Reminder {
reminders.enabled,
reminders.content,
reminders.embed_description,
users.user AS set_by
reminders.set_by
FROM
reminders
INNER JOIN
channels
ON
reminders.channel_id = channels.id
LEFT JOIN
users
ON
reminders.set_by = users.id
WHERE
reminders.uid = ?
",
@ -122,17 +118,13 @@ impl Reminder {
reminders.enabled,
reminders.content,
reminders.embed_description,
users.user AS set_by
reminders.set_by
FROM
reminders
INNER JOIN
channels
ON
reminders.channel_id = channels.id
LEFT JOIN
users
ON
reminders.set_by = users.id
WHERE
reminders.id = ?
",
@ -166,17 +158,13 @@ impl Reminder {
reminders.enabled,
reminders.content,
reminders.embed_description,
users.user AS set_by
reminders.set_by
FROM
reminders
INNER JOIN
channels
ON
reminders.channel_id = channels.id
LEFT JOIN
users
ON
reminders.set_by = users.id
WHERE
`status` = 'pending' AND
channels.channel = ? AND
@ -230,17 +218,13 @@ impl Reminder {
reminders.enabled,
reminders.content,
reminders.embed_description,
users.user AS set_by
reminders.set_by
FROM
reminders
LEFT JOIN
channels
ON
channels.id = reminders.channel_id
LEFT JOIN
users
ON
reminders.set_by = users.id
WHERE
`status` = 'pending' AND
FIND_IN_SET(channels.channel, ?)
@ -266,17 +250,13 @@ impl Reminder {
reminders.enabled,
reminders.content,
reminders.embed_description,
users.user AS set_by
reminders.set_by
FROM
reminders
LEFT JOIN
channels
ON
channels.id = reminders.channel_id
LEFT JOIN
users
ON
reminders.set_by = users.id
WHERE
`status` = 'pending' AND
channels.guild_id = (SELECT id FROM guilds WHERE guild = ?)
@ -303,20 +283,16 @@ impl Reminder {
reminders.enabled,
reminders.content,
reminders.embed_description,
users.user AS set_by
reminders.set_by
FROM
reminders
INNER JOIN
channels
ON
channels.id = reminders.channel_id
LEFT JOIN
users
ON
reminders.set_by = users.id
WHERE
`status` = 'pending' AND
channels.id = (SELECT dm_channel FROM users WHERE user = ?)
channels.id = (SELECT dm_channel FROM users WHERE id = ?)
",
user.get()
)