From 55fdee3bf8f45ccc7a5a188ab17855ac9866a979 Mon Sep 17 00:00:00 2001 From: Mathijs van Veluw Date: Wed, 19 Jun 2024 13:06:58 +0200 Subject: Update crates, web-vault and GHA (#4648) - Updated all crates including Diesel and the new mysqlclient-sys - Updated the MSRV to v1.78 as that is what Diesel mandates - Added the mimalloc crate as a patch for now to fix armv6 static builds This probably makes #4606 possible - Updated web-vault to v2024.5.1 - Updated GitHub Actions Fixed an issue with the localhost images for extracting the musl binaries. --- src/db/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/db/mod.rs b/src/db/mod.rs index f59ac98d..824b3c71 100644 --- a/src/db/mod.rs +++ b/src/db/mod.rs @@ -389,13 +389,13 @@ pub async fn backup_database(conn: &mut DbConn) -> Result<(), Error> { pub async fn get_sql_server_version(conn: &mut DbConn) -> String { db_run! {@raw conn: postgresql, mysql { - sql_function!{ + define_sql_function!{ fn version() -> diesel::sql_types::Text; } diesel::select(version()).get_result::(conn).unwrap_or_else(|_| "Unknown".to_string()) } sqlite { - sql_function!{ + define_sql_function!{ fn sqlite_version() -> diesel::sql_types::Text; } diesel::select(sqlite_version()).get_result::(conn).unwrap_or_else(|_| "Unknown".to_string()) -- cgit v1.2.3