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.

Sign up for GitHub

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

Jump to bottom

Cli serde skip deserialize for primary key option #1186

Merged
merged 8 commits into from
Dec 19, 2022
Merged

Cli serde skip deserialize for primary key option #1186

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fea009a
Add CLI option to skip primary keys with serde
Witcher01 Jul 6, 2022
7d64977
Codegen: fix tests
Witcher01 Aug 2, 2022
6ba7124
Merge remote-tracking branch 'upstream/master' into skip-serde-deseri…
Witcher01 Aug 2, 2022
0ee26b4
complete skip_deserialize cli feature
tsar-boomba Nov 3, 2022
7235089
Merge branch 'pr/2' into cli-serde-deserialize
tsar-boomba Nov 3, 2022
07e293e
run fmt
tsar-boomba Nov 3, 2022
4b99f10
Merge branch 'SeaQL:master' into cli-serde-deserialize
tsar-boomba Nov 4, 2022
f233ab5
fix tests
tsar-boomba Nov 4, 2022
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
Prev Previous commit
Next Next commit
Codegen: fix tests
  • Loading branch information
@Witcher01
Witcher01 committed Aug 2, 2022
commit 7d649776127b3acfd8dd1246e24b4f9e9c2bab35
69 changes: 44 additions & 25 deletions sea-orm-codegen/src/entity/writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ impl EntityWriter {
let mut lines = Vec::new();
Self::write_doc_comment(&mut lines);
let code_blocks = if expanded_format {
Self::gen_expanded_code_blocks(entity, with_serde)
Self::gen_expanded_code_blocks(entity, with_serde, false)
} else {
Self::gen_compact_code_blocks(
entity,
Expand Down Expand Up @@ -214,7 +214,11 @@ impl EntityWriter {
lines.push("".to_owned());
}

pub fn gen_expanded_code_blocks(entity: &Entity, with_serde: &WithSerde) -> Vec<TokenStream> {
pub fn gen_expanded_code_blocks(
entity: &Entity,
with_serde: &WithSerde,
_primary_key_auto_increment: bool,
) -> Vec<TokenStream> {
let mut imports = Self::gen_import(with_serde);
imports.extend(Self::gen_import_active_enum(entity));
let mut code_blocks = vec![
Expand Down Expand Up @@ -556,7 +560,7 @@ impl EntityWriter {
}
ts = quote! { #ts #attr };
}
return if skip_pk_deserialization {
if skip_pk_deserialization {
quote! {
#[sea_orm(#ts)]
#[serde(skip_deserialization)]
Expand All @@ -565,7 +569,7 @@ impl EntityWriter {
quote! {
#[sea_orm(#ts)]
}
};
}
} else {
TokenStream::new()
}
Expand Down Expand Up @@ -1001,13 +1005,14 @@ mod tests {
}
let content = lines.join("");
let expected: TokenStream = content.parse().unwrap();
let generated = EntityWriter::gen_expanded_code_blocks(entity, &crate::WithSerde::None)
.into_iter()
.skip(1)
.fold(TokenStream::new(), |mut acc, tok| {
acc.extend(tok);
acc
});
let generated =
EntityWriter::gen_expanded_code_blocks(entity, &crate::WithSerde::None, false)
.into_iter()
.skip(1)
.fold(TokenStream::new(), |mut acc, tok| {
acc.extend(tok);
acc
});
assert_eq!(expected.to_string(), generated.to_string());
}

Expand Down Expand Up @@ -1041,13 +1046,14 @@ mod tests {
}
let content = lines.join("");
let expected: TokenStream = content.parse().unwrap();
let generated = EntityWriter::gen_compact_code_blocks(entity, &crate::WithSerde::None)
.into_iter()
.skip(1)
.fold(TokenStream::new(), |mut acc, tok| {
acc.extend(tok);
acc
});
let generated =
EntityWriter::gen_compact_code_blocks(entity, &crate::WithSerde::None, false)
.into_iter()
.skip(1)
.fold(TokenStream::new(), |mut acc, tok| {
acc.extend(tok);
acc
});
assert_eq!(expected.to_string(), generated.to_string());
}

Expand All @@ -1067,6 +1073,7 @@ mod tests {
include_str!("../../tests/compact_with_serde/cake_none.rs").into(),
WithSerde::None,
),
false,
Box::new(EntityWriter::gen_compact_code_blocks),
)?;
assert_serde_variant_results(
Expand All @@ -1075,6 +1082,7 @@ mod tests {
include_str!("../../tests/compact_with_serde/cake_serialize.rs").into(),
WithSerde::Serialize,
),
false,
Box::new(EntityWriter::gen_compact_code_blocks),
)?;
assert_serde_variant_results(
Expand All @@ -1083,6 +1091,7 @@ mod tests {
include_str!("../../tests/compact_with_serde/cake_deserialize.rs").into(),
WithSerde::Deserialize,
),
false,
Box::new(EntityWriter::gen_compact_code_blocks),
)?;
assert_serde_variant_results(
Expand All @@ -1091,6 +1100,7 @@ mod tests {
include_str!("../../tests/compact_with_serde/cake_both.rs").into(),
WithSerde::Both,
),
false,
Box::new(EntityWriter::gen_compact_code_blocks),
)?;

Expand All @@ -1101,6 +1111,7 @@ mod tests {
include_str!("../../tests/expanded_with_serde/cake_none.rs").into(),
WithSerde::None,
),
false,
Box::new(EntityWriter::gen_expanded_code_blocks),
)?;
assert_serde_variant_results(
Expand All @@ -1109,6 +1120,7 @@ mod tests {
include_str!("../../tests/expanded_with_serde/cake_serialize.rs").into(),
WithSerde::Serialize,
),
false,
Box::new(EntityWriter::gen_expanded_code_blocks),
)?;
assert_serde_variant_results(
Expand All @@ -1117,6 +1129,7 @@ mod tests {
include_str!("../../tests/expanded_with_serde/cake_deserialize.rs").into(),
WithSerde::Deserialize,
),
false,
Box::new(EntityWriter::gen_expanded_code_blocks),
)?;
assert_serde_variant_results(
Expand All @@ -1125,6 +1138,7 @@ mod tests {
include_str!("../../tests/expanded_with_serde/cake_both.rs").into(),
WithSerde::Both,
),
false,
Box::new(EntityWriter::gen_expanded_code_blocks),
)?;

Expand All @@ -1134,7 +1148,8 @@ mod tests {
fn assert_serde_variant_results(
cake_entity: &Entity,
entity_serde_variant: &(String, WithSerde),
generator: Box<dyn Fn(&Entity, &WithSerde) -> Vec<TokenStream>>,
primary_key_auto_increment: bool,
generator: Box<dyn Fn(&Entity, &WithSerde, bool) -> Vec<TokenStream>>,
) -> io::Result<()> {
let mut reader = BufReader::new(entity_serde_variant.0.as_bytes());
let mut lines: Vec<String> = Vec::new();
Expand All @@ -1148,12 +1163,16 @@ mod tests {
}
let content = lines.join("");
let expected: TokenStream = content.parse().unwrap();
let generated = generator(cake_entity, &entity_serde_variant.1)
.into_iter()
.fold(TokenStream::new(), |mut acc, tok| {
acc.extend(tok);
acc
});
let generated = generator(
cake_entity,
&entity_serde_variant.1,
primary_key_auto_increment,
)
.into_iter()
.fold(TokenStream::new(), |mut acc, tok| {
acc.extend(tok);
acc
});

assert_eq!(expected.to_string(), generated.to_string());
Ok(())
Expand Down