akulij/gongbotrs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete comments of code :/

Browse Source
This commit is contained in:
Akulij 2025-04-03 23:16:28 +09:00
parent 66cf414350
commit b2a27e3330
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/db.rs
View File

@ -5,8 +5,6 @@ use crate::Config;
use self::models::*; use self::models::*;
use diesel::prelude::*; use diesel::prelude::*;
//use diesel::query_dsl::methods::FilterDsl;
//use diesel::{prelude::*, r2d2::{ConnectionManager, Pool}};
use diesel_async::AsyncPgConnection; use diesel_async::AsyncPgConnection;
use diesel_async::RunQueryDsl; use diesel_async::RunQueryDsl;
use diesel_async::pooled_connection::AsyncDieselConnectionManager; use diesel_async::pooled_connection::AsyncDieselConnectionManager;
@ -14,7 +12,6 @@ use diesel_async::pooled_connection::bb8::Pool;
#[derive(Clone)] #[derive(Clone)]
pub struct DB { pub struct DB {
//pool: Pool<ConnectionManager<AsyncPgConnection>>
pool: diesel_async::pooled_connection::bb8::Pool<AsyncPgConnection>, pool: diesel_async::pooled_connection::bb8::Pool<AsyncPgConnection>,
} }
@ -22,18 +19,12 @@ impl DB {
pub async fn new<S: Into<String>>(db_url: S) -> Self { pub async fn new<S: Into<String>>(db_url: S) -> Self {
let config = AsyncDieselConnectionManager::<diesel_async::AsyncPgConnection>::new(db_url); let config = AsyncDieselConnectionManager::<diesel_async::AsyncPgConnection>::new(db_url);
let pool = Pool::builder().build(config).await.unwrap(); let pool = Pool::builder().build(config).await.unwrap();
//let mg = diesel::r2d2::ConnectionManager::new(db_url);
//let pool = diesel::r2d2::Pool::builder()
// .max_size(15)
// .build(mg)
// .unwrap();
DB { pool } DB { pool }
} }
pub async fn get_users(&mut self) -> Vec<User> { pub async fn get_users(&mut self) -> Vec<User> {
use self::schema::users::dsl::*; use self::schema::users::dsl::*;
let mut conn = self.pool.get().await.unwrap(); let mut conn = self.pool.get().await.unwrap();
//let mut conn = AsyncPgConnection::establish(&std::env::var("DATABASE_URL").unwrap()).await.unwrap();
users users
.filter(id.gt(0)) .filter(id.gt(0))
.load::<User>(&mut conn) .load::<User>(&mut conn)
@ -44,8 +35,6 @@ impl DB {
pub async fn set_admin(&mut self, userid: i64, isadmin: bool) { pub async fn set_admin(&mut self, userid: i64, isadmin: bool) {
use self::schema::users::dsl::*; use self::schema::users::dsl::*;
let connection = &mut self.pool.get().await.unwrap(); let connection = &mut self.pool.get().await.unwrap();
//diesel::update(users).filter(id.eq(userid)).set(is_admin.eq(true)).execute(connection);
//diesel::update(users).filter(id.eq(userid)).set(is_admin.eq(true)).load(connection).await.unwrap();
diesel::update(users) diesel::update(users)
.filter(id.eq(userid)) .filter(id.eq(userid))
.set(is_admin.eq(isadmin)) .set(is_admin.eq(isadmin))