1
0
mirror of https://github.com/actix/examples synced 2025-04-22 08:34:52 +02:00

chore: updated from main

This commit is contained in:
Alex Ted 2025-01-21 20:41:27 +03:00
parent 631c5f9472
commit 2b275e8ed1
4 changed files with 109 additions and 35 deletions

78
Cargo.lock generated
View File

@ -1692,6 +1692,18 @@ dependencies = [
"log",
]
[[package]]
name = "bb8"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8"
dependencies = [
"async-trait",
"futures-util",
"parking_lot",
"tokio",
]
[[package]]
name = "bigdecimal"
version = "0.3.1"
@ -2584,6 +2596,18 @@ dependencies = [
"uuid",
]
[[package]]
name = "db-diesel-async"
version = "1.0.0"
dependencies = [
"actix-web",
"diesel",
"diesel-async",
"dotenvy",
"serde",
"uuid",
]
[[package]]
name = "db-mongo"
version = "1.0.0"
@ -2811,6 +2835,21 @@ dependencies = [
"uuid",
]
[[package]]
name = "diesel-async"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51a307ac00f7c23f526a04a77761a0519b9f0eb2838ebf5b905a58580095bdcb"
dependencies = [
"async-trait",
"bb8",
"diesel",
"futures-util",
"scoped-futures",
"tokio",
"tokio-postgres",
]
[[package]]
name = "diesel_derives"
version = "2.2.3"
@ -4340,6 +4379,17 @@ dependencies = [
"libc",
]
[[package]]
name = "inotify"
version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
dependencies = [
"bitflags 1.3.2",
"inotify-sys",
"libc",
]
[[package]]
name = "inotify"
version = "0.11.0"
@ -5439,6 +5489,25 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
[[package]]
name = "notify"
version = "6.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
dependencies = [
"bitflags 2.6.0",
"crossbeam-channel",
"filetime",
"fsevent-sys",
"inotify 0.9.6",
"kqueue",
"libc",
"log",
"mio 0.8.11",
"walkdir",
"windows-sys 0.48.0",
]
[[package]]
name = "notify"
version = "6.1.1"
@ -7090,6 +7159,15 @@ dependencies = [
"parking_lot",
]
[[package]]
name = "scoped-futures"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b24aae2d0636530f359e9d5ef0c04669d11c5e756699b27a6a6d845d8329091"
dependencies = [
"pin-project-lite",
]
[[package]]
name = "scopeguard"
version = "1.2.0"

View File

@ -27,7 +27,7 @@ pub async fn find_item_by_uid(
Ok(item)
}
/// Run query using Diesel to insert a new database row and return the result.
/// Run query using Diesel to insert a new database row and return the result.
pub async fn insert_new_item(
conn: &mut AsyncPgConnection,
nm: &str, // prevent collision with `name` column imported inside the function

View File

@ -1,19 +1,16 @@
#[macro_use]
extern crate diesel;
use std::env::VarError;
use actix_web::{error, get, post, web, App, HttpResponse, HttpServer, Responder};
use diesel_async::pooled_connection::{bb8::Pool, AsyncDieselConnectionManager, PoolError};
use diesel_async::pooled_connection::{bb8::Pool, AsyncDieselConnectionManager};
use diesel_async::AsyncPgConnection;
use dotenvy::dotenv;
use std::{env, io};
use thiserror::Error as ThisError;
use uuid::Uuid;
pub mod actions;
pub mod models;
pub mod schema;
mod actions;
mod models;
mod schema;
type DbPool = Pool<AsyncPgConnection>;
@ -58,7 +55,6 @@ async fn add_item(
pool: web::Data<DbPool>,
form: web::Json<models::NewItem>,
) -> actix_web::Result<impl Responder> {
let mut conn = pool
.get()
.await
@ -88,7 +84,7 @@ async fn main() -> io::Result<()> {
.service(add_item)
.service(get_item)
})
.bind(("127.0.0.1", 5000))?
.bind(("127.0.0.1", 8080))?
.run()
.await
}

View File

@ -1,6 +1,6 @@
use super::schema::items;
use serde::{Deserialize, Serialize};
use uuid::Uuid;
use super::schema::items;
/// Item details.
#[derive(Debug, Clone, Serialize, Deserialize, Queryable, Selectable, Insertable)]
@ -20,6 +20,6 @@ impl NewItem {
/// Constructs new item details from name.
#[cfg(test)] // only needed in tests
pub fn new(name: impl Into<String>) -> Self {
Self { name: name.into(), ..Default::default() }
Self { name: name.into() }
}
}