summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMathijs van Veluw <[email protected]>2024-06-19 13:06:58 +0200
committerGitHub <[email protected]>2024-06-19 13:06:58 +0200
commit55fdee3bf8f45ccc7a5a188ab17855ac9866a979 (patch)
tree8df8d5bd8cb4f821bdb456b8e48b1619e9ec6b36 /src
parent377969ea6769bccd008203c5464eb361f685b787 (diff)
downloadvaultwarden-55fdee3bf8f45ccc7a5a188ab17855ac9866a979.tar.gz
vaultwarden-55fdee3bf8f45ccc7a5a188ab17855ac9866a979.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/db/mod.rs4
1 files changed, 2 insertions, 2 deletions
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::<String>(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::<String>(conn).unwrap_or_else(|_| "Unknown".to_string())