Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Vec<u8> primary key #287

Merged
merged 2 commits into from
Nov 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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, 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
27 changes: 25 additions & 2 deletions tests/common/features/schema.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
pub use super::super::bakery_chain::*;

use super::*;
use crate::common::setup::create_table;
use sea_orm::{error::*, sea_query, DatabaseConnection, DbConn, ExecResult};
use crate::common::setup::{create_table, create_table_without_asserts};
use sea_orm::{
error::*, sea_query, ConnectionTrait, DatabaseConnection, DbBackend, DbConn, ExecResult,
};
use sea_query::{ColumnDef, ForeignKeyCreateStatement};

pub async fn create_tables(db: &DatabaseConnection) -> Result<(), DbErr> {
create_log_table(db).await?;
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 +103,23 @@ 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 mut primary_key_col = ColumnDef::new(byte_primary_key::Column::Id);
match db.get_database_backend() {
DbBackend::MySql => primary_key_col.binary_len(3),
DbBackend::Sqlite | DbBackend::Postgres => primary_key_col.binary(),
};

let stmt = sea_query::Table::create()
.table(byte_primary_key::Entity)
.col(primary_key_col.not_null().primary_key())
.col(
ColumnDef::new(byte_primary_key::Column::Value)
.string()
.not_null(),
)
.to_owned();

create_table_without_asserts(db, &stmt).await
}
21 changes: 14 additions & 7 deletions tests/common/setup/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,19 @@ pub async fn create_table<E>(
where
E: EntityTrait,
{
let builder = db.get_database_backend();
assert_eq!(
builder.build(&Schema::create_table_from_entity(entity)),
builder.build(create)
);

create_table_without_asserts(db, create).await
}

pub async fn create_table_without_asserts(
db: &DbConn,
create: &TableCreateStatement,
) -> Result<ExecResult, DbErr> {
let builder = db.get_database_backend();
if builder != DbBackend::Sqlite {
let stmt = builder.build(
Expand All @@ -92,11 +105,5 @@ where
);
db.execute(stmt).await?;
}

let stmt = builder.build(create);
assert_eq!(
builder.build(&Schema::create_table_from_entity(entity)),
stmt
);
db.execute(stmt).await
db.execute(builder.build(create)).await
}