From f79a4171503dbcd6f86187b6263e7c345bd173be Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Mon, 27 Sep 2021 18:01:38 +0800 Subject: [PATCH 01/11] Remove `ValueType: Default` --- src/entity/active_model.rs | 25 +++++++++++-------------- src/entity/base_entity.rs | 8 ++++++-- src/entity/prelude.rs | 5 +++-- src/entity/primary_key.rs | 20 +++++++++++--------- src/executor/insert.rs | 29 ++++++++++++++++++++--------- src/query/insert.rs | 23 +++++++++++++++++++++-- 6 files changed, 72 insertions(+), 38 deletions(-) diff --git a/src/entity/active_model.rs b/src/entity/active_model.rs index cfcb0bbd..c69e5b01 100644 --- a/src/entity/active_model.rs +++ b/src/entity/active_model.rs @@ -1,6 +1,6 @@ use crate::{ error::*, DatabaseConnection, DeleteResult, EntityTrait, Iterable, PrimaryKeyToColumn, - PrimaryKeyTrait, Value, + PrimaryKeyValue, Value, }; use async_trait::async_trait; use std::fmt::Debug; @@ -70,23 +70,18 @@ pub trait ActiveModelTrait: Clone + Debug { async fn insert(self, db: &DatabaseConnection) -> Result where ::Model: IntoActiveModel, + <::Entity as EntityTrait>::PrimaryKey: + PrimaryKeyValue<::Entity>, { let am = self; let exec = ::insert(am).exec(db); let res = exec.await?; - // Assume valid last_insert_id is not equals to Default::default() - if res.last_insert_id - != <::PrimaryKey as PrimaryKeyTrait>::ValueType::default() - { - let found = ::find_by_id(res.last_insert_id) - .one(db) - .await?; - match found { - Some(model) => Ok(model.into_active_model()), - None => Err(DbErr::Exec("Failed to find inserted item".to_owned())), - } - } else { - Ok(Self::default()) + let found = ::find_by_id(res.last_insert_id) + .one(db) + .await?; + match found { + Some(model) => Ok(model.into_active_model()), + None => Err(DbErr::Exec("Failed to find inserted item".to_owned())), } } @@ -101,6 +96,8 @@ pub trait ActiveModelTrait: Clone + Debug { where Self: ActiveModelBehavior, ::Model: IntoActiveModel, + <::Entity as EntityTrait>::PrimaryKey: + PrimaryKeyValue<::Entity>, { let mut am = self; am = ActiveModelBehavior::before_save(am); diff --git a/src/entity/base_entity.rs b/src/entity/base_entity.rs index 7ba1e965..0c9813f7 100644 --- a/src/entity/base_entity.rs +++ b/src/entity/base_entity.rs @@ -1,7 +1,7 @@ use crate::{ ActiveModelTrait, ColumnTrait, Delete, DeleteMany, DeleteOne, FromQueryResult, Insert, - ModelTrait, PrimaryKeyToColumn, PrimaryKeyTrait, QueryFilter, Related, RelationBuilder, - RelationTrait, RelationType, Select, Update, UpdateMany, UpdateOne, + ModelTrait, PrimaryKeyToColumn, PrimaryKeyTrait, PrimaryKeyValue, QueryFilter, Related, + RelationBuilder, RelationTrait, RelationType, Select, Update, UpdateMany, UpdateOne, }; use sea_query::{Alias, Iden, IntoIden, IntoTableRef, IntoValueTuple, TableRef}; pub use sea_strum::IntoEnumIterator as Iterable; @@ -299,6 +299,8 @@ pub trait EntityTrait: EntityName { fn insert(model: A) -> Insert where A: ActiveModelTrait, + <::Entity as EntityTrait>::PrimaryKey: + PrimaryKeyValue<::Entity>, { Insert::one(model) } @@ -352,6 +354,8 @@ pub trait EntityTrait: EntityName { where A: ActiveModelTrait, I: IntoIterator, + <::Entity as EntityTrait>::PrimaryKey: + PrimaryKeyValue<::Entity>, { Insert::many(models) } diff --git a/src/entity/prelude.rs b/src/entity/prelude.rs index 8d87a4b2..be630567 100644 --- a/src/entity/prelude.rs +++ b/src/entity/prelude.rs @@ -2,8 +2,9 @@ pub use crate::{ error::*, ActiveModelBehavior, ActiveModelTrait, ColumnDef, ColumnTrait, ColumnType, DeriveActiveModel, DeriveActiveModelBehavior, DeriveColumn, DeriveCustomColumn, DeriveEntity, DeriveEntityModel, DeriveModel, DerivePrimaryKey, DeriveRelation, EntityName, EntityTrait, - EnumIter, ForeignKeyAction, Iden, IdenStatic, Linked, ModelTrait, PrimaryKeyToColumn, - PrimaryKeyTrait, QueryFilter, QueryResult, Related, RelationDef, RelationTrait, Select, Value, + EnumIter, ForeignKeyAction, Iden, IdenStatic, IntoActiveModel, Linked, ModelTrait, + PrimaryKeyToColumn, PrimaryKeyTrait, PrimaryKeyValue, QueryFilter, QueryResult, Related, + RelationDef, RelationTrait, Select, Value, }; #[cfg(feature = "with-json")] diff --git a/src/entity/primary_key.rs b/src/entity/primary_key.rs index 463f1482..530eba30 100644 --- a/src/entity/primary_key.rs +++ b/src/entity/primary_key.rs @@ -1,18 +1,11 @@ use super::{ColumnTrait, IdenStatic, Iterable}; -use crate::{TryFromU64, TryGetableMany}; +use crate::{ActiveModelTrait, EntityTrait, TryFromU64, TryGetableMany}; use sea_query::IntoValueTuple; use std::fmt::Debug; //LINT: composite primary key cannot auto increment pub trait PrimaryKeyTrait: IdenStatic + Iterable { - type ValueType: Sized - + Send - + Default - + Debug - + PartialEq - + IntoValueTuple - + TryGetableMany - + TryFromU64; + type ValueType: Sized + Send + Debug + PartialEq + IntoValueTuple + TryGetableMany + TryFromU64; fn auto_increment() -> bool; } @@ -26,3 +19,12 @@ pub trait PrimaryKeyToColumn { where Self: Sized; } + +pub trait PrimaryKeyValue +where + E: EntityTrait, +{ + fn get_primary_key_value(active_model: A) -> ::ValueType + where + A: ActiveModelTrait; +} diff --git a/src/executor/insert.rs b/src/executor/insert.rs index 1f4936ba..cb7e5555 100644 --- a/src/executor/insert.rs +++ b/src/executor/insert.rs @@ -5,11 +5,12 @@ use crate::{ use sea_query::InsertStatement; use std::{future::Future, marker::PhantomData}; -#[derive(Clone, Debug)] +#[derive(Debug)] pub struct Inserter where A: ActiveModelTrait, { + primary_key: Option<<<::Entity as EntityTrait>::PrimaryKey as PrimaryKeyTrait>::ValueType>, query: InsertStatement, model: PhantomData, } @@ -48,7 +49,7 @@ where ); } } - Inserter::::new(query).exec(db) + Inserter::::new(self.primary_key, query).exec(db) // TODO: return primary key if extracted before, otherwise use InsertResult } } @@ -57,8 +58,12 @@ impl Inserter where A: ActiveModelTrait, { - pub fn new(query: InsertStatement) -> Self { + pub fn new( + primary_key: Option<<<::Entity as EntityTrait>::PrimaryKey as PrimaryKeyTrait>::ValueType>, + query: InsertStatement, + ) -> Self { Self { + primary_key, query, model: PhantomData, } @@ -72,12 +77,13 @@ where A: 'a, { let builder = db.get_database_backend(); - exec_insert(builder.build(&self.query), db) + exec_insert(self.primary_key, builder.build(&self.query), db) } } // Only Statement impl Send async fn exec_insert( + primary_key: Option<<<::Entity as EntityTrait>::PrimaryKey as PrimaryKeyTrait>::ValueType>, statement: Statement, db: &DatabaseConnection, ) -> Result, DbErr> @@ -86,7 +92,7 @@ where { type PrimaryKey = <::Entity as EntityTrait>::PrimaryKey; type ValueTypeOf = as PrimaryKeyTrait>::ValueType; - let last_insert_id = match db { + let last_insert_id_opt = match db { #[cfg(feature = "sqlx-postgres")] DatabaseConnection::SqlxPostgresPoolConnection(conn) => { use crate::{sea_query::Iden, Iterable}; @@ -94,14 +100,19 @@ where .map(|col| col.to_string()) .collect::>(); let res = conn.query_one(statement).await?.unwrap(); - res.try_get_many("", cols.as_ref()).unwrap_or_default() + Some(res.try_get_many("", cols.as_ref()).unwrap_or_default()) } _ => { let last_insert_id = db.execute(statement).await?.last_insert_id(); - ValueTypeOf::::try_from_u64(last_insert_id) - .ok() - .unwrap_or_default() + ValueTypeOf::::try_from_u64(last_insert_id).ok() } }; + let last_insert_id = match last_insert_id_opt { + Some(last_insert_id) => last_insert_id, + None => match primary_key { + Some(primary_key) => primary_key, + None => return Err(DbErr::Exec("Fail to unpack last_insert_id".to_owned())), + }, + }; Ok(InsertResult { last_insert_id }) } diff --git a/src/query/insert.rs b/src/query/insert.rs index a65071e1..418d2b70 100644 --- a/src/query/insert.rs +++ b/src/query/insert.rs @@ -1,14 +1,18 @@ -use crate::{ActiveModelTrait, EntityName, EntityTrait, IntoActiveModel, Iterable, QueryTrait}; +use crate::{ + ActiveModelTrait, EntityName, EntityTrait, IntoActiveModel, Iterable, PrimaryKeyTrait, + PrimaryKeyValue, QueryTrait, +}; use core::marker::PhantomData; use sea_query::InsertStatement; -#[derive(Clone, Debug)] +#[derive(Debug)] pub struct Insert where A: ActiveModelTrait, { pub(crate) query: InsertStatement, pub(crate) columns: Vec, + pub(crate) primary_key: Option<<<::Entity as EntityTrait>::PrimaryKey as PrimaryKeyTrait>::ValueType>, pub(crate) model: PhantomData, } @@ -31,6 +35,7 @@ where .into_table(A::Entity::default().table_ref()) .to_owned(), columns: Vec::new(), + primary_key: None, model: PhantomData, } } @@ -68,6 +73,8 @@ where pub fn one(m: M) -> Insert where M: IntoActiveModel, + <::Entity as EntityTrait>::PrimaryKey: + PrimaryKeyValue<::Entity>, { Self::new().add(m) } @@ -97,6 +104,8 @@ where where M: IntoActiveModel, I: IntoIterator, + <::Entity as EntityTrait>::PrimaryKey: + PrimaryKeyValue<::Entity>, { Self::new().add_many(models) } @@ -105,8 +114,16 @@ where pub fn add(mut self, m: M) -> Self where M: IntoActiveModel, + <::Entity as EntityTrait>::PrimaryKey: + PrimaryKeyValue<::Entity>, { let mut am: A = m.into_active_model(); + self.primary_key = + if !<::PrimaryKey as PrimaryKeyTrait>::auto_increment() { + Some(<::PrimaryKey as PrimaryKeyValue>::get_primary_key_value::(am.clone())) + } else { + None + }; let mut columns = Vec::new(); let mut values = Vec::new(); let columns_empty = self.columns.is_empty(); @@ -132,6 +149,8 @@ where where M: IntoActiveModel, I: IntoIterator, + <::Entity as EntityTrait>::PrimaryKey: + PrimaryKeyValue<::Entity>, { for model in models.into_iter() { self = self.add(model); From 4f090d192bf7a26024c60792cd0b9bfdddbda97b Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Mon, 27 Sep 2021 18:02:12 +0800 Subject: [PATCH 02/11] Update `DerivePrimaryKey` --- sea-orm-macros/src/derives/primary_key.rs | 30 +++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/sea-orm-macros/src/derives/primary_key.rs b/sea-orm-macros/src/derives/primary_key.rs index e677e2e6..ce7ca840 100644 --- a/sea-orm-macros/src/derives/primary_key.rs +++ b/sea-orm-macros/src/derives/primary_key.rs @@ -1,7 +1,7 @@ use heck::SnakeCase; use proc_macro2::{Ident, TokenStream}; -use quote::{quote, quote_spanned}; -use syn::{Data, DataEnum, Fields, Variant}; +use quote::{quote, quote_spanned, ToTokens}; +use syn::{punctuated::Punctuated, token::Comma, Data, DataEnum, Fields, Variant}; pub fn expand_derive_primary_key(ident: Ident, data: Data) -> syn::Result { let variants = match data { @@ -30,6 +30,21 @@ pub fn expand_derive_primary_key(ident: Ident, data: Data) -> syn::Result = + variants.iter().fold(Punctuated::new(), |mut acc, v| { + let variant = &v.ident; + acc.push( + quote! { active_model.take(#ident::#variant.into_column()).unwrap().unwrap() }, + ); + acc + }); + let mut primary_key_value = primary_key_value.to_token_stream(); + if variants.len() > 1 { + primary_key_value = quote! { + (#primary_key_value) + }; + } + Ok(quote!( impl sea_orm::Iden for #ident { fn unquoted(&self, s: &mut dyn std::fmt::Write) { @@ -61,5 +76,16 @@ pub fn expand_derive_primary_key(ident: Ident, data: Data) -> syn::Result for #ident { + fn get_primary_key_value( + mut active_model: A, + ) -> <::PrimaryKey as PrimaryKeyTrait>::ValueType + where + A: ActiveModelTrait, + { + #primary_key_value + } + } )) } From 9efaeeba8b15f8f71c2565f55976ea26d84fb651 Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Mon, 27 Sep 2021 18:02:20 +0800 Subject: [PATCH 03/11] Update test cases --- tests/crud/create_cake.rs | 6 +----- tests/crud/create_lineitem.rs | 6 +----- tests/crud/create_order.rs | 6 +----- tests/sequential_op_tests.rs | 12 ++---------- tests/uuid_tests.rs | 9 +-------- 5 files changed, 6 insertions(+), 33 deletions(-) diff --git a/tests/crud/create_cake.rs b/tests/crud/create_cake.rs index 4fa914a5..df5130aa 100644 --- a/tests/crud/create_cake.rs +++ b/tests/crud/create_cake.rs @@ -58,11 +58,7 @@ pub async fn test_create_cake(db: &DbConn) { .expect("could not insert cake_baker"); assert_eq!( cake_baker_res.last_insert_id, - if cfg!(feature = "sqlx-postgres") { - (cake_baker.cake_id.unwrap(), cake_baker.baker_id.unwrap()) - } else { - Default::default() - } + (cake_baker.cake_id.unwrap(), cake_baker.baker_id.unwrap()) ); assert!(cake.is_some()); diff --git a/tests/crud/create_lineitem.rs b/tests/crud/create_lineitem.rs index da82cc82..0ba9c7d3 100644 --- a/tests/crud/create_lineitem.rs +++ b/tests/crud/create_lineitem.rs @@ -57,11 +57,7 @@ pub async fn test_create_lineitem(db: &DbConn) { .expect("could not insert cake_baker"); assert_eq!( cake_baker_res.last_insert_id, - if cfg!(feature = "sqlx-postgres") { - (cake_baker.cake_id.unwrap(), cake_baker.baker_id.unwrap()) - } else { - Default::default() - } + (cake_baker.cake_id.unwrap(), cake_baker.baker_id.unwrap()) ); // Customer diff --git a/tests/crud/create_order.rs b/tests/crud/create_order.rs index ba8ff09b..6de3d46f 100644 --- a/tests/crud/create_order.rs +++ b/tests/crud/create_order.rs @@ -57,11 +57,7 @@ pub async fn test_create_order(db: &DbConn) { .expect("could not insert cake_baker"); assert_eq!( cake_baker_res.last_insert_id, - if cfg!(feature = "sqlx-postgres") { - (cake_baker.cake_id.unwrap(), cake_baker.baker_id.unwrap()) - } else { - Default::default() - } + (cake_baker.cake_id.unwrap(), cake_baker.baker_id.unwrap()) ); // Customer diff --git a/tests/sequential_op_tests.rs b/tests/sequential_op_tests.rs index 28333d84..286e856a 100644 --- a/tests/sequential_op_tests.rs +++ b/tests/sequential_op_tests.rs @@ -84,11 +84,7 @@ async fn init_setup(db: &DatabaseConnection) { .expect("could not insert cake_baker"); assert_eq!( cake_baker_res.last_insert_id, - if cfg!(feature = "sqlx-postgres") { - (cake_baker.cake_id.unwrap(), cake_baker.baker_id.unwrap()) - } else { - Default::default() - } + (cake_baker.cake_id.unwrap(), cake_baker.baker_id.unwrap()) ); let customer_kate = customer::ActiveModel { @@ -225,11 +221,7 @@ async fn create_cake(db: &DatabaseConnection, baker: baker::Model) -> Option Result<(), DbErr> { assert_eq!(Metadata::find().one(db).await?, Some(metadata.clone())); - assert_eq!( - res.last_insert_id, - if cfg!(feature = "sqlx-postgres") { - metadata.uuid - } else { - Default::default() - } - ); + assert_eq!(res.last_insert_id, metadata.uuid); Ok(()) } From 9bd537efe347cf3f585f673f2d01221db9cba9af Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Mon, 27 Sep 2021 18:10:45 +0800 Subject: [PATCH 04/11] Fixup --- src/executor/insert.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/executor/insert.rs b/src/executor/insert.rs index cb7e5555..aa8905be 100644 --- a/src/executor/insert.rs +++ b/src/executor/insert.rs @@ -100,7 +100,7 @@ where .map(|col| col.to_string()) .collect::>(); let res = conn.query_one(statement).await?.unwrap(); - Some(res.try_get_many("", cols.as_ref()).unwrap_or_default()) + res.try_get_many("", cols.as_ref()).ok() } _ => { let last_insert_id = db.execute(statement).await?.last_insert_id(); From a1a7a98a5c0a62af2521209e38e21fa867f9af30 Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Tue, 28 Sep 2021 18:21:00 +0800 Subject: [PATCH 05/11] Set SqlxSqlit pool max connection to 1 --- src/driver/sqlx_sqlite.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/driver/sqlx_sqlite.rs b/src/driver/sqlx_sqlite.rs index b02f4408..db3fa4e2 100644 --- a/src/driver/sqlx_sqlite.rs +++ b/src/driver/sqlx_sqlite.rs @@ -1,5 +1,5 @@ use sqlx::{ - sqlite::{SqliteArguments, SqliteQueryResult, SqliteRow}, + sqlite::{SqliteArguments, SqlitePoolOptions, SqliteQueryResult, SqliteRow}, Sqlite, SqlitePool, }; @@ -24,7 +24,11 @@ impl SqlxSqliteConnector { } pub async fn connect(string: &str) -> Result { - if let Ok(pool) = SqlitePool::connect(string).await { + if let Ok(pool) = SqlitePoolOptions::new() + .max_connections(1) + .connect(string) + .await + { Ok(DatabaseConnection::SqlxSqlitePoolConnection( SqlxSqlitePoolConnection { pool }, )) From 97b95bf61285d6ba7fef29e6d1d3599a54c22370 Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Tue, 28 Sep 2021 18:23:42 +0800 Subject: [PATCH 06/11] cargo fmt --- src/executor/insert.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/executor/insert.rs b/src/executor/insert.rs index 630ee6a7..4a7b55a2 100644 --- a/src/executor/insert.rs +++ b/src/executor/insert.rs @@ -1,6 +1,6 @@ use crate::{ - error::*, ActiveModelTrait, DatabaseConnection, DbBackend, EntityTrait, Insert, PrimaryKeyTrait, - Statement, TryFromU64, + error::*, ActiveModelTrait, DatabaseConnection, DbBackend, EntityTrait, Insert, + PrimaryKeyTrait, Statement, TryFromU64, }; use sea_query::InsertStatement; use std::{future::Future, marker::PhantomData}; From 3123a9d129964058ae81a555ad83cdc6a82eab29 Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Thu, 30 Sep 2021 11:40:27 +0800 Subject: [PATCH 07/11] Fix git merge conflict --- src/executor/insert.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/executor/insert.rs b/src/executor/insert.rs index 4a7b55a2..ed4da269 100644 --- a/src/executor/insert.rs +++ b/src/executor/insert.rs @@ -91,14 +91,13 @@ where { type PrimaryKey = <::Entity as EntityTrait>::PrimaryKey; type ValueTypeOf = as PrimaryKeyTrait>::ValueType; - let last_insert_id_opt = match db { - #[cfg(feature = "sqlx-postgres")] - DatabaseConnection::SqlxPostgresPoolConnection(conn) => { + let last_insert_id_opt = match db.get_database_backend() { + DbBackend::Postgres => { use crate::{sea_query::Iden, Iterable}; let cols = PrimaryKey::::iter() .map(|col| col.to_string()) .collect::>(); - let res = conn.query_one(statement).await?.unwrap(); + let res = db.query_one(statement).await?.unwrap(); res.try_get_many("", cols.as_ref()).ok() } _ => { From 5497810afb08b1c6bbd0ef39ac392a94ca06f52a Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Thu, 30 Sep 2021 11:49:27 +0800 Subject: [PATCH 08/11] Remove unnecessary trait bounds --- src/entity/active_model.rs | 7 +------ src/entity/base_entity.rs | 8 +++----- src/query/insert.rs | 8 -------- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/entity/active_model.rs b/src/entity/active_model.rs index c69e5b01..ab076bf0 100644 --- a/src/entity/active_model.rs +++ b/src/entity/active_model.rs @@ -1,6 +1,5 @@ use crate::{ - error::*, DatabaseConnection, DeleteResult, EntityTrait, Iterable, PrimaryKeyToColumn, - PrimaryKeyValue, Value, + error::*, DatabaseConnection, DeleteResult, EntityTrait, Iterable, PrimaryKeyToColumn, Value, }; use async_trait::async_trait; use std::fmt::Debug; @@ -70,8 +69,6 @@ pub trait ActiveModelTrait: Clone + Debug { async fn insert(self, db: &DatabaseConnection) -> Result where ::Model: IntoActiveModel, - <::Entity as EntityTrait>::PrimaryKey: - PrimaryKeyValue<::Entity>, { let am = self; let exec = ::insert(am).exec(db); @@ -96,8 +93,6 @@ pub trait ActiveModelTrait: Clone + Debug { where Self: ActiveModelBehavior, ::Model: IntoActiveModel, - <::Entity as EntityTrait>::PrimaryKey: - PrimaryKeyValue<::Entity>, { let mut am = self; am = ActiveModelBehavior::before_save(am); diff --git a/src/entity/base_entity.rs b/src/entity/base_entity.rs index 79caaf0b..d691fb3e 100644 --- a/src/entity/base_entity.rs +++ b/src/entity/base_entity.rs @@ -49,7 +49,9 @@ pub trait EntityTrait: EntityName { type Relation: RelationTrait; - type PrimaryKey: PrimaryKeyTrait + PrimaryKeyToColumn; + type PrimaryKey: PrimaryKeyTrait + + PrimaryKeyToColumn + + PrimaryKeyValue; fn belongs_to(related: R) -> RelationBuilder where @@ -299,8 +301,6 @@ pub trait EntityTrait: EntityName { fn insert(model: A) -> Insert where A: ActiveModelTrait, - <::Entity as EntityTrait>::PrimaryKey: - PrimaryKeyValue<::Entity>, { Insert::one(model) } @@ -354,8 +354,6 @@ pub trait EntityTrait: EntityName { where A: ActiveModelTrait, I: IntoIterator, - <::Entity as EntityTrait>::PrimaryKey: - PrimaryKeyValue<::Entity>, { Insert::many(models) } diff --git a/src/query/insert.rs b/src/query/insert.rs index 418d2b70..59c06b97 100644 --- a/src/query/insert.rs +++ b/src/query/insert.rs @@ -73,8 +73,6 @@ where pub fn one(m: M) -> Insert where M: IntoActiveModel, - <::Entity as EntityTrait>::PrimaryKey: - PrimaryKeyValue<::Entity>, { Self::new().add(m) } @@ -104,8 +102,6 @@ where where M: IntoActiveModel, I: IntoIterator, - <::Entity as EntityTrait>::PrimaryKey: - PrimaryKeyValue<::Entity>, { Self::new().add_many(models) } @@ -114,8 +110,6 @@ where pub fn add(mut self, m: M) -> Self where M: IntoActiveModel, - <::Entity as EntityTrait>::PrimaryKey: - PrimaryKeyValue<::Entity>, { let mut am: A = m.into_active_model(); self.primary_key = @@ -149,8 +143,6 @@ where where M: IntoActiveModel, I: IntoIterator, - <::Entity as EntityTrait>::PrimaryKey: - PrimaryKeyValue<::Entity>, { for model in models.into_iter() { self = self.add(model); From 2f90207d643f6cbc14a3f3b848a497f584627317 Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Fri, 8 Oct 2021 18:04:42 +0800 Subject: [PATCH 09/11] Remove `PrimaryKeyValue` trait --- Cargo.toml | 2 +- sea-orm-macros/src/derives/primary_key.rs | 30 ++--------------- src/entity/active_model.rs | 39 ++++++++++++++++++++++- src/entity/base_entity.rs | 8 ++--- src/entity/prelude.rs | 4 +-- src/entity/primary_key.rs | 22 ++++++------- src/executor/insert.rs | 15 +++------ src/query/insert.rs | 8 ++--- 8 files changed, 65 insertions(+), 63 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a8d7a8ca..8b813343 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ futures-util = { version = "^0.3" } log = { version = "^0.4", optional = true } rust_decimal = { version = "^1", optional = true } sea-orm-macros = { version = "^0.2.5", path = "sea-orm-macros", optional = true } -sea-query = { version = "^0.17.0", features = ["thread-safe"] } +sea-query = { version = "^0.17.0", git = "https://github.com/SeaQL/sea-query.git", branch = "from-value-tuple", features = ["thread-safe"] } sea-strum = { version = "^0.21", features = ["derive", "sea-orm"] } serde = { version = "^1.0", features = ["derive"] } serde_json = { version = "^1", optional = true } diff --git a/sea-orm-macros/src/derives/primary_key.rs b/sea-orm-macros/src/derives/primary_key.rs index ce7ca840..e677e2e6 100644 --- a/sea-orm-macros/src/derives/primary_key.rs +++ b/sea-orm-macros/src/derives/primary_key.rs @@ -1,7 +1,7 @@ use heck::SnakeCase; use proc_macro2::{Ident, TokenStream}; -use quote::{quote, quote_spanned, ToTokens}; -use syn::{punctuated::Punctuated, token::Comma, Data, DataEnum, Fields, Variant}; +use quote::{quote, quote_spanned}; +use syn::{Data, DataEnum, Fields, Variant}; pub fn expand_derive_primary_key(ident: Ident, data: Data) -> syn::Result { let variants = match data { @@ -30,21 +30,6 @@ pub fn expand_derive_primary_key(ident: Ident, data: Data) -> syn::Result = - variants.iter().fold(Punctuated::new(), |mut acc, v| { - let variant = &v.ident; - acc.push( - quote! { active_model.take(#ident::#variant.into_column()).unwrap().unwrap() }, - ); - acc - }); - let mut primary_key_value = primary_key_value.to_token_stream(); - if variants.len() > 1 { - primary_key_value = quote! { - (#primary_key_value) - }; - } - Ok(quote!( impl sea_orm::Iden for #ident { fn unquoted(&self, s: &mut dyn std::fmt::Write) { @@ -76,16 +61,5 @@ pub fn expand_derive_primary_key(ident: Ident, data: Data) -> syn::Result for #ident { - fn get_primary_key_value( - mut active_model: A, - ) -> <::PrimaryKey as PrimaryKeyTrait>::ValueType - where - A: ActiveModelTrait, - { - #primary_key_value - } - } )) } diff --git a/src/entity/active_model.rs b/src/entity/active_model.rs index ab076bf0..0243cc7d 100644 --- a/src/entity/active_model.rs +++ b/src/entity/active_model.rs @@ -2,6 +2,7 @@ use crate::{ error::*, DatabaseConnection, DeleteResult, EntityTrait, Iterable, PrimaryKeyToColumn, Value, }; use async_trait::async_trait; +use sea_query::ValueTuple; use std::fmt::Debug; #[derive(Clone, Debug, Default)] @@ -9,7 +10,8 @@ pub struct ActiveValue where V: Into, { - value: Option, + // Don't want to call ActiveValue::unwrap() and cause panic + pub(self) value: Option, state: ActiveValueState, } @@ -66,6 +68,41 @@ pub trait ActiveModelTrait: Clone + Debug { fn default() -> Self; + fn get_primary_key_value(&self) -> Option { + let mut cols = ::PrimaryKey::iter(); + macro_rules! next { + () => { + if let Some(col) = cols.next() { + if let Some(val) = self.get(col.into_column()).value { + val + } else { + return None; + } + } else { + return None; + } + }; + } + match ::PrimaryKey::iter().count() { + 1 => { + let s1 = next!(); + Some(ValueTuple::One(s1)) + } + 2 => { + let s1 = next!(); + let s2 = next!(); + Some(ValueTuple::Two(s1, s2)) + } + 3 => { + let s1 = next!(); + let s2 = next!(); + let s3 = next!(); + Some(ValueTuple::Three(s1, s2, s3)) + } + _ => panic!("The arity cannot be larger than 3"), + } + } + async fn insert(self, db: &DatabaseConnection) -> Result where ::Model: IntoActiveModel, diff --git a/src/entity/base_entity.rs b/src/entity/base_entity.rs index d691fb3e..764f2524 100644 --- a/src/entity/base_entity.rs +++ b/src/entity/base_entity.rs @@ -1,7 +1,7 @@ use crate::{ ActiveModelTrait, ColumnTrait, Delete, DeleteMany, DeleteOne, FromQueryResult, Insert, - ModelTrait, PrimaryKeyToColumn, PrimaryKeyTrait, PrimaryKeyValue, QueryFilter, Related, - RelationBuilder, RelationTrait, RelationType, Select, Update, UpdateMany, UpdateOne, + ModelTrait, PrimaryKeyToColumn, PrimaryKeyTrait, QueryFilter, Related, RelationBuilder, + RelationTrait, RelationType, Select, Update, UpdateMany, UpdateOne, }; use sea_query::{Alias, Iden, IntoIden, IntoTableRef, IntoValueTuple, TableRef}; pub use sea_strum::IntoEnumIterator as Iterable; @@ -49,9 +49,7 @@ pub trait EntityTrait: EntityName { type Relation: RelationTrait; - type PrimaryKey: PrimaryKeyTrait - + PrimaryKeyToColumn - + PrimaryKeyValue; + type PrimaryKey: PrimaryKeyTrait + PrimaryKeyToColumn; fn belongs_to(related: R) -> RelationBuilder where diff --git a/src/entity/prelude.rs b/src/entity/prelude.rs index 1fecfa96..fd61613b 100644 --- a/src/entity/prelude.rs +++ b/src/entity/prelude.rs @@ -1,8 +1,8 @@ pub use crate::{ error::*, ActiveModelBehavior, ActiveModelTrait, ColumnDef, ColumnTrait, ColumnType, EntityName, EntityTrait, EnumIter, ForeignKeyAction, Iden, IdenStatic, Linked, ModelTrait, - PrimaryKeyToColumn, PrimaryKeyTrait, PrimaryKeyValue, QueryFilter, QueryResult, Related, - RelationDef, RelationTrait, Select, Value, + PrimaryKeyToColumn, PrimaryKeyTrait, QueryFilter, QueryResult, Related, RelationDef, + RelationTrait, Select, Value, }; #[cfg(feature = "macros")] diff --git a/src/entity/primary_key.rs b/src/entity/primary_key.rs index 530eba30..a5e4cde0 100644 --- a/src/entity/primary_key.rs +++ b/src/entity/primary_key.rs @@ -1,11 +1,18 @@ use super::{ColumnTrait, IdenStatic, Iterable}; -use crate::{ActiveModelTrait, EntityTrait, TryFromU64, TryGetableMany}; -use sea_query::IntoValueTuple; +use crate::{TryFromU64, TryGetableMany}; +use sea_query::{FromValueTuple, IntoValueTuple}; use std::fmt::Debug; //LINT: composite primary key cannot auto increment pub trait PrimaryKeyTrait: IdenStatic + Iterable { - type ValueType: Sized + Send + Debug + PartialEq + IntoValueTuple + TryGetableMany + TryFromU64; + type ValueType: Sized + + Send + + Debug + + PartialEq + + IntoValueTuple + + FromValueTuple + + TryGetableMany + + TryFromU64; fn auto_increment() -> bool; } @@ -19,12 +26,3 @@ pub trait PrimaryKeyToColumn { where Self: Sized; } - -pub trait PrimaryKeyValue -where - E: EntityTrait, -{ - fn get_primary_key_value(active_model: A) -> ::ValueType - where - A: ActiveModelTrait; -} diff --git a/src/executor/insert.rs b/src/executor/insert.rs index ed4da269..02d02c0b 100644 --- a/src/executor/insert.rs +++ b/src/executor/insert.rs @@ -2,7 +2,7 @@ use crate::{ error::*, ActiveModelTrait, DatabaseConnection, DbBackend, EntityTrait, Insert, PrimaryKeyTrait, Statement, TryFromU64, }; -use sea_query::InsertStatement; +use sea_query::{FromValueTuple, InsertStatement, ValueTuple}; use std::{future::Future, marker::PhantomData}; #[derive(Debug)] @@ -10,7 +10,7 @@ pub struct Inserter where A: ActiveModelTrait, { - primary_key: Option<<<::Entity as EntityTrait>::PrimaryKey as PrimaryKeyTrait>::ValueType>, + primary_key: Option, query: InsertStatement, model: PhantomData, } @@ -35,7 +35,6 @@ where where A: 'a, { - // TODO: extract primary key's value from query // so that self is dropped before entering await let mut query = self.query; if db.get_database_backend() == DbBackend::Postgres { @@ -49,7 +48,6 @@ where } } Inserter::::new(self.primary_key, query).exec(db) - // TODO: return primary key if extracted before, otherwise use InsertResult } } @@ -57,10 +55,7 @@ impl Inserter where A: ActiveModelTrait, { - pub fn new( - primary_key: Option<<<::Entity as EntityTrait>::PrimaryKey as PrimaryKeyTrait>::ValueType>, - query: InsertStatement, - ) -> Self { + pub fn new(primary_key: Option, query: InsertStatement) -> Self { Self { primary_key, query, @@ -82,7 +77,7 @@ where // Only Statement impl Send async fn exec_insert( - primary_key: Option<<<::Entity as EntityTrait>::PrimaryKey as PrimaryKeyTrait>::ValueType>, + primary_key: Option, statement: Statement, db: &DatabaseConnection, ) -> Result, DbErr> @@ -108,7 +103,7 @@ where let last_insert_id = match last_insert_id_opt { Some(last_insert_id) => last_insert_id, None => match primary_key { - Some(primary_key) => primary_key, + Some(value_tuple) => FromValueTuple::from_value_tuple(value_tuple), None => return Err(DbErr::Exec("Fail to unpack last_insert_id".to_owned())), }, }; diff --git a/src/query/insert.rs b/src/query/insert.rs index 59c06b97..615ce06e 100644 --- a/src/query/insert.rs +++ b/src/query/insert.rs @@ -1,9 +1,9 @@ use crate::{ ActiveModelTrait, EntityName, EntityTrait, IntoActiveModel, Iterable, PrimaryKeyTrait, - PrimaryKeyValue, QueryTrait, + QueryTrait, }; use core::marker::PhantomData; -use sea_query::InsertStatement; +use sea_query::{InsertStatement, ValueTuple}; #[derive(Debug)] pub struct Insert @@ -12,7 +12,7 @@ where { pub(crate) query: InsertStatement, pub(crate) columns: Vec, - pub(crate) primary_key: Option<<<::Entity as EntityTrait>::PrimaryKey as PrimaryKeyTrait>::ValueType>, + pub(crate) primary_key: Option, pub(crate) model: PhantomData, } @@ -114,7 +114,7 @@ where let mut am: A = m.into_active_model(); self.primary_key = if !<::PrimaryKey as PrimaryKeyTrait>::auto_increment() { - Some(<::PrimaryKey as PrimaryKeyValue>::get_primary_key_value::(am.clone())) + am.get_primary_key_value() } else { None }; From 23215c8dd53000b3d7eca75be1bf842ab7d1842a Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Fri, 8 Oct 2021 18:22:25 +0800 Subject: [PATCH 10/11] fix clippy warnings --- src/entity/active_model.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/entity/active_model.rs b/src/entity/active_model.rs index 0243cc7d..5b4289f9 100644 --- a/src/entity/active_model.rs +++ b/src/entity/active_model.rs @@ -68,6 +68,7 @@ pub trait ActiveModelTrait: Clone + Debug { fn default() -> Self; + #[allow(clippy::question_mark)] fn get_primary_key_value(&self) -> Option { let mut cols = ::PrimaryKey::iter(); macro_rules! next { From 92795a022adf3c94e42275f1387ce3dc3076ef22 Mon Sep 17 00:00:00 2001 From: Chris Tsang Date: Tue, 12 Oct 2021 13:58:26 +0800 Subject: [PATCH 11/11] Bump SeaQuery --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 8b813343..588658e8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ futures-util = { version = "^0.3" } log = { version = "^0.4", optional = true } rust_decimal = { version = "^1", optional = true } sea-orm-macros = { version = "^0.2.5", path = "sea-orm-macros", optional = true } -sea-query = { version = "^0.17.0", git = "https://github.com/SeaQL/sea-query.git", branch = "from-value-tuple", features = ["thread-safe"] } +sea-query = { version = "^0.17.1", features = ["thread-safe"] } sea-strum = { version = "^0.21", features = ["derive", "sea-orm"] } serde = { version = "^1.0", features = ["derive"] } serde_json = { version = "^1", optional = true }