Skip to content

Commit

Permalink
Support Vec<u8> primary key
Browse files Browse the repository at this point in the history
  • Loading branch information
billy1624 committed Nov 2, 2021
1 parent 7309f8a commit c14d35e
Show file tree
Hide file tree
Showing 5 changed files with 112 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/executor/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -539,5 +539,7 @@ macro_rules! try_from_u64_string {

try_from_u64_string!(String);

try_from_u64_err!(Vec<u8>);

#[cfg(feature = "with-uuid")]
try_from_u64_err!(uuid::Uuid);
74 changes: 74 additions & 0 deletions tests/byte_primary_key_tests.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
pub mod common;

pub use common::{features::*, setup::*, TestContext};
use pretty_assertions::assert_eq;
use sea_orm::{entity::prelude::*, entity::*, DatabaseConnection};

#[sea_orm_macros::test]
#[cfg(any(
feature = "sqlx-mysql",
feature = "sqlx-sqlite",
feature = "sqlx-postgres"
))]
async fn main() -> Result<(), DbErr> {
let ctx = TestContext::new("byte_primary_key_tests").await;
create_tables(&ctx.db).await?;
create_and_update(&ctx.db).await?;
ctx.delete().await;

Ok(())
}

pub async fn create_and_update(db: &DatabaseConnection) -> Result<(), DbErr> {
use common::features::byte_primary_key::*;

let model = Model {
id: vec![1, 2, 3],
value: "First Row".to_owned(),
};

let res = Entity::insert(model.clone().into_active_model())
.exec(db)
.await?;

assert_eq!(Entity::find().one(db).await?, Some(model.clone()));

assert_eq!(res.last_insert_id, model.id);

let updated_active_model = ActiveModel {
value: Set("First Row (Updated)".to_owned()),
..model.clone().into_active_model()
};

let update_res = Entity::update(updated_active_model.clone())
.filter(Column::Id.eq(vec![1, 2, 3, 4]))
.exec(db)
.await;

assert_eq!(
update_res,
Err(DbErr::RecordNotFound(
"None of the database rows are affected".to_owned()
))
);

let update_res = Entity::update(updated_active_model.clone())
.filter(Column::Id.eq(vec![1, 2, 3]))
.exec(db)
.await?;

assert_eq!(update_res, updated_active_model);

assert_eq!(
Entity::find()
.filter(Column::Id.eq(vec![1, 2, 3]))
.one(db)
.await?,
Some(Model {
id: vec![1, 2, 3],
value: "First Row (Updated)".to_owned(),
})
);

Ok(())
}
14 changes: 14 additions & 0 deletions tests/common/features/byte_primary_key.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
use sea_orm::entity::prelude::*;

#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
#[sea_orm(table_name = "byte_primary_key")]
pub struct Model {
#[sea_orm(primary_key, auto_increment = false)]
pub id: Vec<u8>,
pub value: String,
}

#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {}

impl ActiveModelBehavior for ActiveModel {}
2 changes: 2 additions & 0 deletions tests/common/features/mod.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
pub mod applog;
pub mod byte_primary_key;
pub mod metadata;
pub mod repository;
pub mod schema;
pub mod self_join;

pub use applog::Entity as Applog;
pub use byte_primary_key::Entity as BytePrimaryKey;
pub use metadata::Entity as Metadata;
pub use repository::Entity as Repository;
pub use schema::*;
Expand Down
20 changes: 20 additions & 0 deletions tests/common/features/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pub async fn create_tables(db: &DatabaseConnection) -> Result<(), DbErr> {
create_metadata_table(db).await?;
create_repository_table(db).await?;
create_self_join_table(db).await?;
create_byte_primary_key_table(db).await?;

Ok(())
}
Expand Down Expand Up @@ -100,3 +101,22 @@ pub async fn create_self_join_table(db: &DbConn) -> Result<ExecResult, DbErr> {

create_table(db, &stmt, SelfJoin).await
}

pub async fn create_byte_primary_key_table(db: &DbConn) -> Result<ExecResult, DbErr> {
let stmt = sea_query::Table::create()
.table(byte_primary_key::Entity)
.col(
ColumnDef::new(byte_primary_key::Column::Id)
.binary()
.not_null()
.primary_key(),
)
.col(
ColumnDef::new(byte_primary_key::Column::Value)
.string()
.not_null(),
)
.to_owned();

create_table(db, &stmt, BytePrimaryKey).await
}

0 comments on commit c14d35e

Please sign in to comment.