mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-24 20:01:34 +00:00
fmt
This commit is contained in:
parent
8745a6cc45
commit
ceab862021
1 changed files with 61 additions and 63 deletions
|
@ -1,74 +1,71 @@
|
|||
use crate::{
|
||||
newtypes::{CommunityId, DbUrl, PersonId},
|
||||
utils::{get_conn, DbPool, DbConn},
|
||||
utils::{get_conn, DbConn, DbPool},
|
||||
};
|
||||
use diesel::{
|
||||
associations::HasTable,
|
||||
backend::Backend,
|
||||
deserialize::{FromSqlRow, Queryable},
|
||||
dsl,
|
||||
dsl::insert_into,
|
||||
expression::{
|
||||
is_aggregate,
|
||||
is_contained_in_group_by,
|
||||
AsExpression,
|
||||
IsContainedInGroupBy,
|
||||
ValidGrouping,
|
||||
},
|
||||
expression_methods::ExpressionMethods,
|
||||
pg::Pg,
|
||||
query_builder::{AsQuery, IntoUpdateTarget, Query, QueryFragment, QueryId,Only},
|
||||
query_builder::{AsQuery, IntoUpdateTarget, Only, Query, QueryFragment, QueryId},
|
||||
query_dsl::methods::{FilterDsl, LimitDsl, SelectDsl},
|
||||
query_source::{AppearsInFromClause, Once},
|
||||
result::Error,
|
||||
sql_types::{is_nullable::NotNull, SqlType},
|
||||
AsChangeset,
|
||||
Column,
|
||||
Expression,
|
||||
Identifiable,
|
||||
Insertable,
|
||||
QuerySource,
|
||||
Table,
|
||||
query_dsl::methods::{SelectDsl,LimitDsl,FilterDsl},
|
||||
query_source::{Once,AppearsInFromClause},
|
||||
expression::{ValidGrouping,is_aggregate, IsContainedInGroupBy,is_contained_in_group_by},
|
||||
expression_methods::ExpressionMethods,
|
||||
sql_types::{SqlType,is_nullable::NotNull},
|
||||
expression::AsExpression,
|
||||
SelectableExpression,
|
||||
dsl,
|
||||
Table,
|
||||
};
|
||||
use diesel_async::{AsyncConnection, RunQueryDsl,methods::LoadQuery};
|
||||
use diesel_async::{methods::LoadQuery, AsyncConnection, RunQueryDsl};
|
||||
use std::hash::Hash;
|
||||
|
||||
#[async_trait]
|
||||
pub trait Crud
|
||||
where
|
||||
/*Self: Send + HasTable + Send + 'static + FromSqlRow<<Self::Table as AsQuery>::SqlType, Pg>,
|
||||
Self::Table: Send + FindDsl<Self::IdType>,
|
||||
<Self::Table as FindDsl<Self::IdType>>::Output: LimitDsl + Send,
|
||||
for<'conn> <<Self::Table as FindDsl<Self::IdType>>::Output as LimitDsl>::Output:
|
||||
Send + LoadQuery<'static, DbConn<'conn>, Self> /*+ 'query*/ + Send,
|
||||
<Self::Table as AsQuery>::SqlType: Send,*/
|
||||
|
||||
/*Self: Send + 'static + HasTable + Sized,
|
||||
Self::Table: Send + 'static + AppearsInFromClause<Only<Self::Table>, Count = Once> + QueryFragment<Pg> + HasTable<Table = Self::Table> + IntoUpdateTarget<WhereClause = <<Self::Table as AsQuery>::Query as IntoUpdateTarget>::WhereClause> + AppearsInFromClause<Self::Table, Count = Once>,
|
||||
<Self::Table as AsQuery>::Query: IntoUpdateTarget,
|
||||
//Only<Self::Table>: AppearsInFromClause<Only<Self::Table>, Count = Once>,
|
||||
<Self::Table as Table>::PrimaryKey: Send + 'static + QueryFragment<Pg> + ValidGrouping<(), IsAggregate = is_aggregate::No> + /*IsContainedInGroupBy<<Self::Table as Table>::PrimaryKey, Output = is_contained_in_group_by::Yes> +*/ Column<Table = Self::Table> + AppearsInFromClause<Only<Self::Table>> + SelectableExpression<Only<Self::Table>> + Expression + Sized,
|
||||
<<Self::Table as Table>::PrimaryKey as Expression>::SqlType: SqlType<IsNull = NotNull>,*/
|
||||
|
||||
Self: Send + 'static + Sized + HasTable,
|
||||
Self::Table: FilterDsl<dsl::Eq<<Self::Table as Table>::PrimaryKey, Self::IdType>> + Send + Sized + 'static,
|
||||
<Self::Table as FilterDsl<dsl::Eq<<Self::Table as Table>::PrimaryKey, Self::IdType>>>::Output: LimitDsl + Send + Sized + 'static,
|
||||
//for<'conn> diesel::helper_types::Limit<<Self::Table as FilterDsl<dsl::Eq<<Self::Table as Table>::PrimaryKey, Self::IdType>>>::Output>: LoadQuery<'static, DbConn<'conn>, Self> + Send + 'static + Sized,
|
||||
Self::Table:
|
||||
FilterDsl<dsl::Eq<<Self::Table as Table>::PrimaryKey, Self::IdType>> + Send + Sized + 'static,
|
||||
<Self::Table as FilterDsl<dsl::Eq<<Self::Table as Table>::PrimaryKey, Self::IdType>>>::Output:
|
||||
LimitDsl + Send + Sized + 'static,
|
||||
<<Self::Table as Table>::PrimaryKey as Expression>::SqlType: SqlType,
|
||||
<Self::Table as Table>::PrimaryKey: ExpressionMethods + Send + Sized + 'static,
|
||||
//<Self::Table as Table>::AllColumns: Send + Sized + 'static,
|
||||
//<Self::Table as AsQuery>::Query: Send + Sized + 'static,
|
||||
|
||||
//<Self::Table as FilterDsl<dsl::Eq<<Self::Table as Table>::PrimaryKey, Self::IdType>>>::Output:
|
||||
{
|
||||
type InsertForm;
|
||||
type UpdateForm;
|
||||
type IdType: Hash + Eq + Send + 'static + Sized + AsExpression<<<Self::Table as Table>::PrimaryKey as Expression>::SqlType>;
|
||||
async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result<Self, Error>; /*{
|
||||
let conn = &mut get_conn(pool).await?;
|
||||
insert_into(Self::table())
|
||||
.values(form)
|
||||
.get_result::<Self>(conn)
|
||||
.await
|
||||
}*/
|
||||
type IdType: Hash
|
||||
+ Eq
|
||||
+ Send
|
||||
+ 'static
|
||||
+ Sized
|
||||
+ AsExpression<<<Self::Table as Table>::PrimaryKey as Expression>::SqlType>;
|
||||
async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result<Self, Error>;
|
||||
/*{
|
||||
let conn = &mut get_conn(pool).await?;
|
||||
insert_into(Self::table())
|
||||
.values(form)
|
||||
.get_result::<Self>(conn)
|
||||
.await
|
||||
}*/
|
||||
async fn read(pool: &'async_trait mut DbPool<'_>, id: Self::IdType) -> Result<Self, Error>
|
||||
where diesel::helper_types::Limit<<Self::Table as FilterDsl<dsl::Eq<<Self::Table as Table>::PrimaryKey, Self::IdType>>>::Output>: LoadQuery<'static, DbConn<'async_trait>, Self> + Send + 'static + Sized
|
||||
where
|
||||
diesel::helper_types::Limit<
|
||||
<Self::Table as FilterDsl<dsl::Eq<<Self::Table as Table>::PrimaryKey, Self::IdType>>>::Output,
|
||||
>: LoadQuery<'static, DbConn<'async_trait>, Self> + Send + 'static + Sized,
|
||||
{
|
||||
let col = Self::table().primary_key();
|
||||
// FindDsl is not used because it uses a private trait
|
||||
|
@ -82,15 +79,15 @@ where
|
|||
pool: &mut DbPool<'_>,
|
||||
id: Self::IdType,
|
||||
form: &Self::UpdateForm,
|
||||
) -> Result<Self, Error>; /*{
|
||||
let conn = &mut get_conn(pool).await?;
|
||||
diesel::update(Self::table().find(id))
|
||||
.set(form)
|
||||
.get_result::<Self>(conn)
|
||||
.await
|
||||
}*/
|
||||
async fn delete(pool: &mut DbPool<'_>, id: Self::IdType) -> Result<usize, Error>
|
||||
{
|
||||
) -> Result<Self, Error>;
|
||||
/*{
|
||||
let conn = &mut get_conn(pool).await?;
|
||||
diesel::update(Self::table().find(id))
|
||||
.set(form)
|
||||
.get_result::<Self>(conn)
|
||||
.await
|
||||
}*/
|
||||
async fn delete(pool: &mut DbPool<'_>, id: Self::IdType) -> Result<usize, Error> {
|
||||
Err(Error::NotFound)
|
||||
/*let conn = &mut get_conn(pool).await?;
|
||||
diesel::delete(Self::table().find(id)).execute(conn).await*/
|
||||
|
@ -108,19 +105,20 @@ where
|
|||
type Form;
|
||||
async fn follow(pool: &mut DbPool<'_>, form: &Self::Form) -> Result<Self, Error>
|
||||
where
|
||||
Self: Sized; /*{
|
||||
let conn = &mut get_conn(pool).await?;
|
||||
insert_into(Self::table())
|
||||
.values(form)
|
||||
.on_conflict((
|
||||
Self::TargetColumn::default(),
|
||||
Self::FollowerColumn::default(),
|
||||
))
|
||||
.do_update()
|
||||
.set(form)
|
||||
.get_result::<Self>(conn)
|
||||
.await
|
||||
}*/
|
||||
Self: Sized;
|
||||
/*{
|
||||
let conn = &mut get_conn(pool).await?;
|
||||
insert_into(Self::table())
|
||||
.values(form)
|
||||
.on_conflict((
|
||||
Self::TargetColumn::default(),
|
||||
Self::FollowerColumn::default(),
|
||||
))
|
||||
.do_update()
|
||||
.set(form)
|
||||
.get_result::<Self>(conn)
|
||||
.await
|
||||
}*/
|
||||
async fn follow_accepted(
|
||||
pool: &mut DbPool<'_>,
|
||||
community_id: CommunityId,
|
||||
|
|
Loading…
Reference in a new issue