-
Notifications
You must be signed in to change notification settings - Fork 0
refactor and add unit test #4
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
Open
LuigimonSoft
wants to merge
2
commits into
master
Choose a base branch
from
feature/LC-refactor-rquery-orm-macros
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,11 @@ use syn::{parse_macro_input, Data, DeriveInput, Fields, Lit, Meta, NestedMeta}; | |
| #[proc_macro_derive(Entity, attributes(table, column, key, relation))] | ||
| pub fn entity(input: TokenStream) -> TokenStream { | ||
| let input = parse_macro_input!(input as DeriveInput); | ||
| entity_impl(input).into() | ||
| } | ||
|
|
||
| // Core implementation extracted for testing with proc-macro2 | ||
| pub(crate) fn entity_impl(input: DeriveInput) -> proc_macro2::TokenStream { | ||
| let struct_name = input.ident; | ||
|
|
||
| // table attributes | ||
|
|
@@ -166,40 +171,61 @@ pub fn entity(input: TokenStream) -> TokenStream { | |
| for nested in list.nested.iter() { | ||
| match nested { | ||
| NestedMeta::Meta(Meta::NameValue(nv)) => { | ||
| if nv.path.is_ident("name") { | ||
| if let Lit::Str(s) = &nv.lit { col_name = s.value(); } | ||
| } else if nv.path.is_ident("max_length") { | ||
| if let Lit::Int(i) = &nv.lit { max_length = i.base10_parse().ok(); } | ||
| } else if nv.path.is_ident("min_length") { | ||
| if let Lit::Int(i) = &nv.lit { min_length = i.base10_parse().ok(); } | ||
| } else if nv.path.is_ident("regex") { | ||
| if let Lit::Str(s) = &nv.lit { regex = Some(s.value()); } | ||
| } else if nv.path.is_ident("error_max_length") { | ||
| if let Lit::Str(s) = &nv.lit { err_max_length = Some(s.value()); } | ||
| } else if nv.path.is_ident("error_min_length") { | ||
| if let Lit::Str(s) = &nv.lit { err_min_length = Some(s.value()); } | ||
| } else if nv.path.is_ident("error_required") { | ||
| if let Lit::Str(s) = &nv.lit { err_required = Some(s.value()); } | ||
| } else if nv.path.is_ident("error_allow_null") { | ||
| if let Lit::Str(s) = &nv.lit { err_allow_null = Some(s.value()); } | ||
| } else if nv.path.is_ident("error_allow_empty") { | ||
| if let Lit::Str(s) = &nv.lit { err_allow_empty = Some(s.value()); } | ||
| } else if nv.path.is_ident("error_regex") { | ||
| if let Lit::Str(s) = &nv.lit { err_regex = Some(s.value()); } | ||
| } else if nv.path.is_ident("allow_empty") { | ||
| if let Lit::Bool(b) = &nv.lit { allow_empty = b.value; } | ||
| } else if nv.path.is_ident("required") { | ||
| if let Lit::Bool(b) = &nv.lit { required = b.value; } | ||
| } else if nv.path.is_ident("allow_null") { | ||
| if let Lit::Bool(b) = &nv.lit { allow_null = b.value; } | ||
| } else if nv.path.is_ident("ignore_in_update") { | ||
| if let Lit::Bool(b) = &nv.lit { ignore_in_update = b.value; } | ||
| } else if nv.path.is_ident("ignore_in_insert") { | ||
| if let Lit::Bool(b) = &nv.lit { ignore_in_insert = b.value; } | ||
| } else if nv.path.is_ident("ignore_in_delete") { | ||
| if let Lit::Bool(b) = &nv.lit { ignore_in_delete = b.value; } | ||
| } else if nv.path.is_ident("ignore") { | ||
| if let Lit::Bool(b) = &nv.lit { ignore = b.value; } | ||
| if let Some(ident) = nv.path.get_ident().map(|i| i.to_string()) { | ||
| match ident.as_str() { | ||
| "name" => { | ||
| if let Lit::Str(s) = &nv.lit { col_name = s.value(); } | ||
| } | ||
| , "max_length" => { | ||
| if let Lit::Int(i) = &nv.lit { max_length = i.base10_parse().ok(); } | ||
| } | ||
| , "min_length" => { | ||
| if let Lit::Int(i) = &nv.lit { min_length = i.base10_parse().ok(); } | ||
| } | ||
| , "regex" => { | ||
| if let Lit::Str(s) = &nv.lit { regex = Some(s.value()); } | ||
| } | ||
| , "error_max_length" => { | ||
| if let Lit::Str(s) = &nv.lit { err_max_length = Some(s.value()); } | ||
| } | ||
| , "error_min_length" => { | ||
| if let Lit::Str(s) = &nv.lit { err_min_length = Some(s.value()); } | ||
| } | ||
| , "error_required" => { | ||
| if let Lit::Str(s) = &nv.lit { err_required = Some(s.value()); } | ||
| } | ||
| , "error_allow_null" => { | ||
| if let Lit::Str(s) = &nv.lit { err_allow_null = Some(s.value()); } | ||
| } | ||
| , "error_allow_empty" => { | ||
| if let Lit::Str(s) = &nv.lit { err_allow_empty = Some(s.value()); } | ||
| } | ||
| , "error_regex" => { | ||
| if let Lit::Str(s) = &nv.lit { err_regex = Some(s.value()); } | ||
| } | ||
| , "allow_empty" => { | ||
| if let Lit::Bool(b) = &nv.lit { allow_empty = b.value; } | ||
| } | ||
| , "required" => { | ||
| if let Lit::Bool(b) = &nv.lit { required = b.value; } | ||
| } | ||
| , "allow_null" => { | ||
| if let Lit::Bool(b) = &nv.lit { allow_null = b.value; } | ||
| } | ||
| , "ignore_in_update" => { | ||
| if let Lit::Bool(b) = &nv.lit { ignore_in_update = b.value; } | ||
| } | ||
| , "ignore_in_insert" => { | ||
| if let Lit::Bool(b) = &nv.lit { ignore_in_insert = b.value; } | ||
| } | ||
| , "ignore_in_delete" => { | ||
| if let Lit::Bool(b) = &nv.lit { ignore_in_delete = b.value; } | ||
| } | ||
| , "ignore" => { | ||
| if let Lit::Bool(b) = &nv.lit { ignore = b.value; } | ||
| } | ||
| , _ => {} | ||
|
Comment on lines
+179
to
+227
|
||
| } | ||
| } | ||
| } | ||
| NestedMeta::Meta(Meta::Path(p)) => { | ||
|
|
@@ -578,5 +604,8 @@ pub fn entity(input: TokenStream) -> TokenStream { | |
| #(#key_trait_impls)* | ||
| }; | ||
|
|
||
| TokenStream::from(expanded) | ||
| expanded | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| use quote::quote; | ||
| use syn::DeriveInput; | ||
|
|
||
| fn gen(input: DeriveInput) -> String { | ||
| crate::entity_impl(input).to_string() | ||
| } | ||
|
|
||
| #[test] | ||
| fn generates_entity_impl_and_consts() { | ||
| let input: DeriveInput = syn::parse_quote! { | ||
| #[table(name = "T1", schema = "dbo")] | ||
| struct TestEntity { | ||
| #[key(is_identity = true)] | ||
| id: i32, | ||
| #[column(name = "col_a", required, max_length = 50, min_length = 1, allow_empty, error_required = "e required", error_max_length = "too long", error_min_length = "too short", error_allow_empty = "no empty", error_allow_null = "no null", regex = "^[a-z]+$", error_regex = "bad format", ignore_in_update, ignore_in_insert, ignore_in_delete)] | ||
| a: String, | ||
| #[column] | ||
| b: i32, | ||
| #[column(allow_null = true)] | ||
| c: Option<i32>, | ||
| #[relation(foreign_key = "id", table = "Other", table_number = 2, ignore_in_update, ignore_in_insert)] | ||
| rel: i32, | ||
| } | ||
| }; | ||
|
|
||
| let s = gen(input); | ||
|
|
||
| // Core impls | ||
| assert!(s.contains("impl :: rquery_orm :: mapping :: Entity for TestEntity")); | ||
| assert!(s.contains("impl :: rquery_orm :: mapping :: Validatable for TestEntity")); | ||
| assert!(s.contains("impl :: rquery_orm :: mapping :: Persistable for TestEntity")); | ||
| assert!(s.contains("impl :: rquery_orm :: mapping :: FromRowNamed for TestEntity")); | ||
| assert!(s.contains("impl :: rquery_orm :: mapping :: FromRowWithPrefix for TestEntity")); | ||
|
|
||
| // Table meta | ||
| assert!(s.contains("static TABLE_META")); | ||
| assert!(s.contains("name : \"T1\"")); | ||
| assert!(s.contains("schema")); | ||
|
|
||
| // Associated consts block | ||
| assert!(s.contains("impl TestEntity { pub const TABLE : & 'static str = \"T1\" ;")); | ||
| assert!(s.contains("pub const id : & 'static str = \"id\" ;")); | ||
| assert!(s.contains("pub const a : & 'static str = \"col_a\" ;")); | ||
| } | ||
|
|
||
| #[test] | ||
| fn builds_sql_fragments() { | ||
| let input: DeriveInput = syn::parse_quote! { | ||
| #[table(name = "T2")] | ||
| struct E2 { | ||
| #[key(is_identity = true)] id: i32, | ||
| #[column] a: i32, | ||
| #[column(ignore_in_update)] b: i32, | ||
| #[column(ignore)] c: i32, | ||
| #[column(ignore_in_insert)] d: i32, | ||
| } | ||
| }; | ||
| let s = gen(input); | ||
| // INSERT excludes identity id and ignored fields (format string present) | ||
| assert!(s.contains("INSERT INTO {} (")); | ||
| // UPDATE has SET and WHERE | ||
| assert!(s.contains("UPDATE {} SET")); | ||
| assert!(s.contains("WHERE")); | ||
| // DELETE has WHERE by key | ||
| assert!(s.contains("DELETE FROM {} WHERE")); | ||
| } | ||
|
|
||
| #[test] | ||
| fn validates_string_rules() { | ||
| let input: DeriveInput = syn::parse_quote! { | ||
| struct EV { | ||
| #[key] id: i32, | ||
| #[column(required, min_length = 2, max_length = 4, regex = "^[a-z]+$")] name: String, | ||
| } | ||
| }; | ||
| let s = gen(input); | ||
| // Validation branches should appear | ||
| assert!(s.contains("cannot be empty")); | ||
| assert!(s.contains("exceeds max length")); | ||
| assert!(s.contains("below min length")); | ||
| assert!(s.contains("has invalid format")); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The actions-rs/toolchain action is deprecated. Use dtolnay/rust-toolchain which was already imported in the original code and is the recommended alternative.