diff --git a/src/connector/select.rs b/src/connector/select.rs index 0799c518..07a4daa8 100644 --- a/src/connector/select.rs +++ b/src/connector/select.rs @@ -1,6 +1,6 @@ use crate::{Connection, Database, EntityTrait, ModelTrait, QueryErr, Select}; -impl Select<'_, E> +impl Select where E: EntityTrait, { diff --git a/src/entity/base.rs b/src/entity/base.rs index a071b99e..ac01ef87 100644 --- a/src/entity/base.rs +++ b/src/entity/base.rs @@ -27,7 +27,7 @@ pub trait EntityTrait: Iden + Default + Debug { /// "SELECT `cake`.`id`, `cake`.`name` FROM `cake`" /// ); /// ``` - fn find<'s>() -> Select<'s, Self> { + fn find() -> Select { Select::new(Self::default()) } @@ -41,7 +41,7 @@ pub trait EntityTrait: Iden + Default + Debug { /// "SELECT `cake`.`id`, `cake`.`name` FROM `cake` LIMIT 1" /// ); /// ``` - fn find_one<'s>() -> Select<'s, Self> { + fn find_one() -> Select { let mut select = Self::find(); select.query().limit(1); select @@ -57,7 +57,7 @@ pub trait EntityTrait: Iden + Default + Debug { /// "SELECT `cake`.`id`, `cake`.`name` FROM `cake` WHERE `cake`.`id` = 11 LIMIT 1" /// ); /// ``` - fn find_one_by<'s, V>(v: V) -> Select<'s, Self> + fn find_one_by(v: V) -> Select where V: Into, { diff --git a/src/query/select.rs b/src/query/select.rs index 48d37da7..d9a72abd 100644 --- a/src/query/select.rs +++ b/src/query/select.rs @@ -6,15 +6,15 @@ use sea_query::{Expr, Iden, IntoIden, Order, QueryBuilder, SelectStatement, Simp use std::rc::Rc; #[derive(Debug)] -pub struct Select<'s, E: 'static> +pub struct Select where E: EntityTrait, { select: SelectStatement, - entity: PhantomData<&'s E>, + entity: PhantomData, } -impl Select<'_, E> +impl Select where E: EntityTrait, {