From f263b6decaa5ecee0bdbfdf2df2766852e806b72 Mon Sep 17 00:00:00 2001
From: bitfl0wer <florian@pro-weber.com>
Date: Fri, 2 Aug 2024 22:32:28 +0200
Subject: [PATCH] Update sqlx syntax to 0.8.0, change MySql for sqlx:: Any

---
 src/types/config/types/guild_configuration.rs | 19 ++++++++++++-------
 src/types/entities/user.rs                    | 14 +++++++-------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/types/config/types/guild_configuration.rs b/src/types/config/types/guild_configuration.rs
index 53a2d45..0c9f1f0 100644
--- a/src/types/config/types/guild_configuration.rs
+++ b/src/types/config/types/guild_configuration.rs
@@ -162,9 +162,11 @@ impl Display for GuildFeaturesList {
 }
 
 #[cfg(feature = "sqlx")]
-impl<'r> sqlx::Decode<'r, sqlx::MySql> for GuildFeaturesList {
-    fn decode(value: <sqlx::MySql as sqlx::database::HasValueRef<'r>>::ValueRef) -> Result<Self, sqlx::error::BoxDynError> {
-        let v = <String as sqlx::Decode<sqlx::MySql>>::decode(value)?;
+impl<'r> sqlx::Decode<'r, sqlx::Any> for GuildFeaturesList {
+    fn decode(
+        value: <sqlx::Any as sqlx::Database>::ValueRef<'r>,
+    ) -> Result<Self, sqlx::error::BoxDynError> {
+        let v = <String as sqlx::Decode<sqlx::Any>>::decode(value)?;
         Ok(Self(
             v.split(',')
                 .filter(|f| !f.is_empty())
@@ -175,10 +177,13 @@ impl<'r> sqlx::Decode<'r, sqlx::MySql> for GuildFeaturesList {
 }
 
 #[cfg(feature = "sqlx")]
-impl<'q> sqlx::Encode<'q, sqlx::MySql> for GuildFeaturesList {
-    fn encode_by_ref(&self, buf: &mut <sqlx::MySql as sqlx::database::HasArguments<'q>>::ArgumentBuffer) -> sqlx::encode::IsNull {
+impl<'q> sqlx::Encode<'q, sqlx::Any> for GuildFeaturesList {
+    fn encode_by_ref(
+        &self,
+        buf: &mut <sqlx::Any as sqlx::Database>::ArgumentBuffer<'q>,
+    ) -> Result<sqlx::encode::IsNull, Box<dyn std::error::Error + Send + Sync>> {
         if self.is_empty() {
-            return sqlx::encode::IsNull::Yes;
+            return Ok(sqlx::encode::IsNull::Yes);
         }
         let features = self
             .iter()
@@ -186,7 +191,7 @@ impl<'q> sqlx::Encode<'q, sqlx::MySql> for GuildFeaturesList {
             .collect::<Vec<_>>()
             .join(",");
 
-        <String as sqlx::Encode<sqlx::MySql>>::encode_by_ref(&features, buf)
+        <String as sqlx::Encode<sqlx::Any>>::encode_by_ref(&features, buf)
     }
 }
 
diff --git a/src/types/entities/user.rs b/src/types/entities/user.rs
index 674c931..2fd2393 100644
--- a/src/types/entities/user.rs
+++ b/src/types/entities/user.rs
@@ -109,24 +109,24 @@ impl TryFrom<Vec<u8>> for ThemeColors {
 
 #[cfg(feature = "sqlx")]
 // TODO: Add tests for Encode and Decode.
-impl<'q> sqlx::Encode<'q, sqlx::MySql> for ThemeColors {
+impl<'q> sqlx::Encode<'q, sqlx::Any> for ThemeColors {
     fn encode_by_ref(
         &self,
-        buf: &mut <sqlx::MySql as sqlx::database::HasArguments<'q>>::ArgumentBuffer,
-    ) -> sqlx::encode::IsNull {
+        buf: &mut <sqlx::Any as sqlx::Database>::ArgumentBuffer<'q>,
+    ) -> Result<sqlx::encode::IsNull, Box<dyn std::error::Error + Send + Sync>> {
         let mut vec_u8 = Vec::new();
         vec_u8.extend_from_slice(&self.inner.0.to_be_bytes());
         vec_u8.extend_from_slice(&self.inner.1.to_be_bytes());
-        <Vec<u8> as sqlx::Encode<'q, sqlx::MySql>>::encode_by_ref(&vec_u8, buf)
+        <Vec<u8> as sqlx::Encode<sqlx::Any>>::encode_by_ref(&vec_u8, buf)
     }
 }
 
 #[cfg(feature = "sqlx")]
-impl<'d> sqlx::Decode<'d, sqlx::MySql> for ThemeColors {
+impl<'d> sqlx::Decode<'d, sqlx::Any> for ThemeColors {
     fn decode(
-        value: <sqlx::MySql as sqlx::database::HasValueRef<'d>>::ValueRef,
+        value: <sqlx::Any as sqlx::Database>::ValueRef<'d>,
     ) -> Result<Self, sqlx::error::BoxDynError> {
-        let value_vec = <Vec<u8> as sqlx::Decode<'d, sqlx::MySql>>::decode(value)?;
+        let value_vec = <Vec<u8> as sqlx::Decode<'d, sqlx::Any>>::decode(value)?;
         value_vec.try_into().map_err(|e: ChorusError| e.into())
     }
 }