diff --git a/Cargo.toml b/Cargo.toml index 749ce20b..8b29b743 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ thiserror = { version = "1.0.44" } fnv = { version = "1.0.7" } [features] -default = ["camel-case-field"] +default = ["field-camel-case"] with-json = ["sea-orm/with-json"] with-chrono = ["sea-orm/with-chrono", "async-graphql/chrono"] with-time = ["sea-orm/with-time", "async-graphql/time"] @@ -34,5 +34,5 @@ with-bigdecimal = ["sea-orm/with-bigdecimal", "async-graphql/bigdecimal"] with-postgres-array = ["sea-orm/postgres-array"] # with-ipnetwork = ["sea-orm/with-ipnetwork"] # with-mac_address = ["sea-orm/with-mac_address"] -snake-case-field = [] -camel-case-field = [] +field-snake-case = [] +field-camel-case = [] diff --git a/src/enumerations/active_enum.rs b/src/enumerations/active_enum.rs index 70f5e386..e156afa4 100644 --- a/src/enumerations/active_enum.rs +++ b/src/enumerations/active_enum.rs @@ -19,7 +19,7 @@ impl std::default::Default for ActiveEnumConfig { format!("{}Enum", name.to_upper_camel_case()) }), variant_name: Box::new(|_enum_name: &str, variant: &str| -> String { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { variant.to_snake_case() } else { variant.to_upper_camel_case().to_ascii_uppercase() diff --git a/src/inputs/active_enum_filter_input.rs b/src/inputs/active_enum_filter_input.rs index afdfab2c..c8060889 100644 --- a/src/inputs/active_enum_filter_input.rs +++ b/src/inputs/active_enum_filter_input.rs @@ -89,7 +89,7 @@ where let extract_variant = move |input: &str| -> String { let variant = variants.iter().find(|variant| { let variant = variant.to_string(); - let variant = if cfg!(feature = "snake-case-field") { + let variant = if cfg!(feature = "field-snake-case") { variant.to_snake_case() } else { variant.to_upper_camel_case().to_ascii_uppercase() diff --git a/src/mutation/entity_create_batch_mutation.rs b/src/mutation/entity_create_batch_mutation.rs index 08389a29..54983efb 100644 --- a/src/mutation/entity_create_batch_mutation.rs +++ b/src/mutation/entity_create_batch_mutation.rs @@ -20,7 +20,7 @@ impl std::default::Default for EntityCreateBatchMutationConfig { fn default() -> Self { EntityCreateBatchMutationConfig { mutation_suffix: { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { "_create_batch" } else { "CreateBatch" diff --git a/src/mutation/entity_create_one_mutation.rs b/src/mutation/entity_create_one_mutation.rs index 22efb99b..fae316ef 100644 --- a/src/mutation/entity_create_one_mutation.rs +++ b/src/mutation/entity_create_one_mutation.rs @@ -20,7 +20,7 @@ impl std::default::Default for EntityCreateOneMutationConfig { fn default() -> Self { EntityCreateOneMutationConfig { mutation_suffix: { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { "_create_one" } else { "CreateOne" diff --git a/src/mutation/entity_delete_mutation.rs b/src/mutation/entity_delete_mutation.rs index b2b0591b..a5a34995 100644 --- a/src/mutation/entity_delete_mutation.rs +++ b/src/mutation/entity_delete_mutation.rs @@ -21,7 +21,7 @@ impl std::default::Default for EntityDeleteMutationConfig { fn default() -> Self { Self { mutation_suffix: { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { "_delete" } else { "Delete" diff --git a/src/mutation/entity_update_mutation.rs b/src/mutation/entity_update_mutation.rs index 998944b1..5835467b 100644 --- a/src/mutation/entity_update_mutation.rs +++ b/src/mutation/entity_update_mutation.rs @@ -25,7 +25,7 @@ impl std::default::Default for EntityUpdateMutationConfig { fn default() -> Self { Self { mutation_suffix: { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { "_update" } else { "Update" diff --git a/src/outputs/connection_object.rs b/src/outputs/connection_object.rs index 684a2177..87b77e35 100644 --- a/src/outputs/connection_object.rs +++ b/src/outputs/connection_object.rs @@ -43,7 +43,7 @@ impl std::default::Default for ConnectionObjectConfig { format!("{object_name}Connection") }), page_info: { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { "page_info" } else { "pageInfo" @@ -51,7 +51,7 @@ impl std::default::Default for ConnectionObjectConfig { .into() }, pagination_info: { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { "pagination_info" } else { "paginationInfo" diff --git a/src/outputs/entity_object.rs b/src/outputs/entity_object.rs index 16b3e34a..f4c83f86 100644 --- a/src/outputs/entity_object.rs +++ b/src/outputs/entity_object.rs @@ -20,7 +20,7 @@ impl std::default::Default for EntityObjectConfig { entity_name.to_upper_camel_case() }), column_name: Box::new(|_entity_name: &str, column_name: &str| -> String { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { column_name.to_snake_case() } else { column_name.to_lower_camel_case() diff --git a/src/outputs/page_info_object.rs b/src/outputs/page_info_object.rs index 5209dafd..13f735d5 100644 --- a/src/outputs/page_info_object.rs +++ b/src/outputs/page_info_object.rs @@ -31,7 +31,7 @@ impl std::default::Default for PageInfoObjectConfig { PageInfoObjectConfig { type_name: "PageInfo".into(), has_previous_page: { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { "has_previous_page" } else { "hasPreviousPage" @@ -39,7 +39,7 @@ impl std::default::Default for PageInfoObjectConfig { .into() }, has_next_page: { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { "has_next_page" } else { "hasNextPage" @@ -47,7 +47,7 @@ impl std::default::Default for PageInfoObjectConfig { .into() }, start_cursor: { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { "start_cursor" } else { "startCursor" @@ -55,7 +55,7 @@ impl std::default::Default for PageInfoObjectConfig { .into() }, end_cursor: { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { "end_cursor" } else { "endCursor" diff --git a/src/query/entity_object_relation.rs b/src/query/entity_object_relation.rs index 8d1ddf43..37152a5a 100644 --- a/src/query/entity_object_relation.rs +++ b/src/query/entity_object_relation.rs @@ -30,7 +30,7 @@ impl EntityObjectRelationBuilder { ::Model: Sync, <::Column as std::str::FromStr>::Err: core::fmt::Debug, { - let name = if cfg!(feature = "snake-case-field") { + let name = if cfg!(feature = "field-snake-case") { name.to_snake_case() } else { name.to_lower_camel_case() diff --git a/src/query/entity_object_via_relation.rs b/src/query/entity_object_via_relation.rs index 624e8c20..1be03fa6 100644 --- a/src/query/entity_object_via_relation.rs +++ b/src/query/entity_object_via_relation.rs @@ -33,7 +33,7 @@ impl EntityObjectViaRelationBuilder { <::Column as std::str::FromStr>::Err: core::fmt::Debug, <::Column as std::str::FromStr>::Err: core::fmt::Debug, { - let name = if cfg!(feature = "snake-case-field") { + let name = if cfg!(feature = "field-snake-case") { name.to_snake_case() } else { name.to_lower_camel_case() diff --git a/src/query/entity_query_field.rs b/src/query/entity_query_field.rs index 0d2ceddb..ae0ef7a2 100644 --- a/src/query/entity_query_field.rs +++ b/src/query/entity_query_field.rs @@ -27,7 +27,7 @@ impl std::default::Default for EntityQueryFieldConfig { fn default() -> Self { EntityQueryFieldConfig { type_name: Box::new(|object_name: &str| -> String { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { object_name.to_snake_case() } else { object_name.to_lower_camel_case() @@ -35,7 +35,7 @@ impl std::default::Default for EntityQueryFieldConfig { }), filters: "filters".into(), order_by: { - if cfg!(feature = "snake-case-field") { + if cfg!(feature = "field-snake-case") { "order_by" } else { "orderBy"