actix/examples
1
0
Fork 0
mirror of https://github.com/actix/examples synced 2025-06-29 02:10:36 +02:00
Code Issues Releases Wiki Activity

Update db/basic, db/sqlx_todo and db/r2d2 to v4 (#506)

Browse Source
This commit is contained in:
Luca Palmieri
2022-01-29 16:25:46 +00:00
committed by GitHub
parent 6e3ae0fd19
commit 8b5de155bd
11 changed files with 225 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
database_interactions/basic/src/db.rs
View File

@ -1,7 +1,6 @@
use actix_web::{web, Error as AWError};
use actix_web::{error::InternalError, http::StatusCode, web};
use failure::Error;
use futures::{Future, TryFutureExt};
use rusqlite::{Statement, NO_PARAMS};
use rusqlite::Statement;
use serde::{Deserialize, Serialize};
use std::{thread::sleep, time::Duration};
@ -23,10 +22,10 @@ pub enum Queries {
GetTopTenColdestMonths,
}
pub fn execute(
pub async fn execute(
pool: &Pool,
query: Queries,
) -> impl Future<Output = Result<Vec<WeatherAgg>, AWError>> {
) -> Result<Vec<WeatherAgg>, InternalError<Error>> {
let pool = pool.clone();
web::block(move || {
// simulate an expensive query, see comments at top of main.rs
@ -40,7 +39,9 @@ pub fn execute(
};
result.map_err(Error::from)
})
.map_err(AWError::from)
.await
.unwrap()
.map_err(|e| InternalError::new(e, StatusCode::INTERNAL_SERVER_ERROR))
}
fn get_hottest_years(conn: Connection) -> WeatherAggResult {
@ -73,7 +74,7 @@ fn get_coldest_years(conn: Connection) -> WeatherAggResult {
fn get_rows_as_annual_agg(mut statement: Statement) -> WeatherAggResult {
statement
.query_map(NO_PARAMS, |row| {
.query_map([], |row| {
Ok(WeatherAgg::AnnualAgg {
year: row.get(0)?,
total: row.get(1)?,
@ -112,7 +113,7 @@ fn get_coldest_months(conn: Connection) -> WeatherAggResult {
fn get_rows_as_month_agg(mut statement: Statement) -> WeatherAggResult {
statement
.query_map(NO_PARAMS, |row| {
.query_map([], |row| {
Ok(WeatherAgg::MonthAgg {
year: row.get(0)?,
month: row.get(1)?,

2
database_interactions/basic/src/main.rs
View File

@ -61,7 +61,7 @@ async fn main() -> io::Result<()> {
HttpServer::new(move || {
App::new()
// store db pool as Data object
.data(pool.clone())
.app_data(web::Data::new(pool.clone()))
.wrap(middleware::Logger::default())
.service(
web::resource("/asyncio_weather").route(web::get().to(asyncio_weather)),