fedi/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-25 07:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update diesel-async (#4203)

Browse source 
* Update diesel-async

* Fix
This commit is contained in:
dullbananas 2023-11-27 02:31:19 -07:00 committed by GitHub
parent 7972dd0fcf
commit d95df3a46f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -99,7 +99,7 @@ activitypub_federation = { version = "0.5.0-beta.5", default-features = false, f
] } ] }
diesel = "2.1.4" diesel = "2.1.4"
diesel_migrations = "2.1.0" diesel_migrations = "2.1.0"
diesel-async = "0.3.2" diesel-async = "0.4.1"
serde = { version = "1.0.193", features = ["derive"] } serde = { version = "1.0.193", features = ["derive"] }
serde_with = "3.4.0" serde_with = "3.4.0"
actix-web = { version = "4.4.0", default-features = false, features = [ actix-web = { version = "4.4.0", default-features = false, features = [

5
crates/db_schema/src/utils.rs
View file

@ -24,6 +24,7 @@ use diesel_async::{
pooled_connection::{ pooled_connection::{
deadpool::{Object as PooledConnection, Pool}, deadpool::{Object as PooledConnection, Pool},
AsyncDieselConnectionManager, AsyncDieselConnectionManager,
ManagerConfig,
}, },
}; };
use diesel_migrations::EmbeddedMigrations; use diesel_migrations::EmbeddedMigrations;
@ -291,7 +292,9 @@ pub async fn build_db_pool() -> Result<ActualDbPool, LemmyError> {
let manager = if tls_enabled { let manager = if tls_enabled {
// diesel-async does not support any TLS connections out of the box, so we need to manually // diesel-async does not support any TLS connections out of the box, so we need to manually
// provide a setup function which handles creating the connection // provide a setup function which handles creating the connection
AsyncDieselConnectionManager::<AsyncPgConnection>::new_with_setup(&db_url, establish_connection) let mut config = ManagerConfig::default();
config.custom_setup = Box::new(establish_connection);
AsyncDieselConnectionManager::<AsyncPgConnection>::new_with_config(&db_url, config)
} else { } else {
AsyncDieselConnectionManager::<AsyncPgConnection>::new(&db_url) AsyncDieselConnectionManager::<AsyncPgConnection>::new(&db_url)
}; };