From 46bc418478ea2e9db48fd6c1102ddc990a8a5a9b Mon Sep 17 00:00:00 2001
From: Rasmus Kaj <rasmus@krats.se>
Date: Wed, 31 Jul 2024 22:38:35 +0200
Subject: [PATCH] Update `diesel` and `diesel-async`.

---
 CHANGELOG.md                |  2 +-
 Cargo.toml                  |  4 ++--
 src/adm/stats.rs            |  2 +-
 src/server/autocomplete.rs  |  4 ++--
 src/server/mod.rs           |  2 +-
 src/server/views_by_date.rs | 15 +++++++--------
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f97944c..bf4dc96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ The format is based on
 ## Unreleased
 
 * Improved item (image) sizing css.  I hope it works in safari.
-* Updated to `diesel` 2.1.0, `diesel-async` 0.3.2, `brotli` to 6.0.0,
+* Updated to `diesel` 2.2.2, `diesel-async` 0.5.0, `brotli` to 6.0.0,
   and `ructe` 0.17.0.
 * Uses std LazyLock (require rust 1.80) instead of `lazy_regex`.
 * Removed unneded db model structs.
diff --git a/Cargo.toml b/Cargo.toml
index ece61e0..7134501 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@ async-walkdir = "0.2.0"
 brotli = "6.0.0"
 chrono = "0.4.19" # Must match version used by diesel
 clap = { version = "4.0.18", features = ["derive", "wrap_help", "env"] }
-diesel-async = { version = "0.3.0", features = ["deadpool", "postgres"] }
+diesel-async = { version = "0.5.0", features = ["deadpool", "postgres"] }
 dotenv = "0.15"
 flate2 = "1.0.14"
 futures-lite = "1.12.0"
@@ -44,7 +44,7 @@ version = "1.1.1"
 [dependencies.diesel]
 default-features = false
 features = ["chrono", "postgres"]
-version = "2.1.0"
+version = "2.2.2"
 
 [dependencies.warp]
 default-features = false
diff --git a/src/adm/stats.rs b/src/adm/stats.rs
index dff0af1..e81be9e 100644
--- a/src/adm/stats.rs
+++ b/src/adm/stats.rs
@@ -8,7 +8,7 @@ use diesel::prelude::*;
 use diesel::sql_types::{Nullable, Timestamp};
 use diesel_async::{AsyncPgConnection, RunQueryDsl};
 
-sql_function! {
+define_sql_function! {
     #[aggregate]
     fn year_of_timestamp(date: Nullable<Timestamp>) -> Nullable<SmallInt>
 }
diff --git a/src/server/autocomplete.rs b/src/server/autocomplete.rs
index 88427b8..1a0c99b 100644
--- a/src/server/autocomplete.rs
+++ b/src/server/autocomplete.rs
@@ -146,8 +146,8 @@ mod tests {
     }
 }
 
-sql_function!(fn lower(string: Text) -> Text);
-sql_function!(fn strpos(string: Text, substring: Text) -> Integer);
+define_sql_function!(fn lower(string: Text) -> Text);
+define_sql_function!(fn strpos(string: Text, substring: Text) -> Integer);
 
 type NameSlugScore = (String, String, i32);
 
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 6abb842..9a959fb 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -143,7 +143,7 @@ async fn static_file(name: Tail) -> Result<Response> {
 }
 
 async fn random_image(context: Context) -> Result<Response> {
-    sql_function! { fn random() -> Integer };
+    define_sql_function! { fn random() -> Integer };
 
     let photo = Photo::query(context.is_authorized())
         .select(p::id)
diff --git a/src/server/views_by_date.rs b/src/server/views_by_date.rs
index 50b7da1..dbc632a 100644
--- a/src/server/views_by_date.rs
+++ b/src/server/views_by_date.rs
@@ -77,30 +77,29 @@ pub fn routes(s: ContextFilter) -> BoxedFilter<(Response,)> {
         .boxed()
 }
 
-sql_function! {
+define_sql_function! {
     #[aggregate]
     fn year_of_timestamp(date: Nullable<Timestamp>) -> Nullable<SmallInt>
 }
-sql_function! {
+define_sql_function! {
     #[aggregate]
     fn month_of_timestamp(date: Nullable<Timestamp>) -> Nullable<SmallInt>
 }
-sql_function! {
+define_sql_function! {
     #[aggregate]
     fn day_of_timestamp(date: Nullable<Timestamp>) -> Nullable<SmallInt>
 }
 
 mod filter {
-    use diesel::sql_function;
-    use diesel::sql_types::{Nullable, Timestamp};
+    use diesel::{define_sql_function, sql_types::{Nullable, Timestamp}};
 
-    sql_function! {
+    define_sql_function! {
         fn year_of_timestamp(date: Nullable<Timestamp>) -> Nullable<SmallInt>
     }
-    sql_function! {
+    define_sql_function! {
         fn month_of_timestamp(date: Nullable<Timestamp>) -> Nullable<SmallInt>
     }
-    sql_function! {
+    define_sql_function! {
         fn day_of_timestamp(date: Nullable<Timestamp>) -> Nullable<SmallInt>
     }
 }