Skip to content

Commit

Permalink
Merge pull request #320 from /issues/319
Browse files Browse the repository at this point in the history
`with-json` feature requires `chrono/serde`
  • Loading branch information
tyt2y3 committed Nov 16, 2021
2 parents f4008f9 + 2e55342 commit f2a7745
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
path: [86, 249, 262]
path: [86, 249, 262, 319]
steps:
- uses: actions/checkout@v2

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ default = [
]
macros = ["sea-orm-macros"]
mock = []
with-json = ["serde_json", "sea-query/with-json"]
with-json = ["serde_json", "sea-query/with-json", "chrono/serde"]
with-chrono = ["chrono", "sea-query/with-chrono"]
with-rust_decimal = ["rust_decimal", "sea-query/with-rust_decimal"]
with-uuid = ["uuid", "sea-query/with-uuid"]
Expand Down
18 changes: 18 additions & 0 deletions issues/319/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[workspace]
# A separate workspace

[package]
name = "sea-orm-issues-319"
version = "0.1.0"
edition = "2021"
publish = false

[dependencies]
async-std = { version = "^1", features = ["attributes"] }
serde = { version = "^1", features = ["derive"] }
sea-orm = { path = "../../", features = [
"sqlx-mysql",
"runtime-async-std-native-tls",
"with-json",
"macros",
], default-features = false }
14 changes: 14 additions & 0 deletions issues/319/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
mod material;
use sea_orm::*;

#[async_std::main]
pub async fn main() {
let db = Database::connect("mysql://sea:sea@localhost/bakery")
.await
.unwrap();

async_std::task::spawn(async move {
material::Entity::find().one(&db).await.unwrap();
})
.await;
}
20 changes: 20 additions & 0 deletions issues/319/src/material.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
use sea_orm::entity::prelude::*;
use serde::{Serialize, Deserialize};

#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize, Deserialize)]
#[sea_orm(table_name = "materials")]
pub struct Model {
#[sea_orm(primary_key)]
pub id: i32,
pub created_at: DateTimeWithTimeZone,
pub updated_at: DateTimeWithTimeZone,
pub name: String,
#[sea_orm(column_type = "Text", nullable)]
pub description: Option<String>,
pub tag_ids: Vec<u8>,
}

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

impl ActiveModelBehavior for ActiveModel {}

0 comments on commit f2a7745

Please sign in to comment.