Merge pull request #1 from billy1624/pr/1052

Escape rust keyword when generating conjunct relation impl
SeaQL · Sep 20, 2022 · 1fb8ba9 · 1fb8ba9
2 parents 750235a + 73e46b7
commit 1fb8ba9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/sea-orm-codegen/src/entity/conjunct_relation.rs b/sea-orm-codegen/src/entity/conjunct_relation.rs
@@ -2,6 +2,8 @@ use heck::{CamelCase, SnakeCase};
 use proc_macro2::Ident;
 use quote::format_ident;
 
+use crate::util::escape_rust_keyword;
+
 #[derive(Clone, Debug)]
 pub struct ConjunctRelation {
     pub(crate) via: String,
@@ -10,11 +12,11 @@ pub struct ConjunctRelation {
 
 impl ConjunctRelation {
     pub fn get_via_snake_case(&self) -> Ident {
-        format_ident!("{}", self.via.to_snake_case())
+        format_ident!("{}", escape_rust_keyword(self.via.to_snake_case()))
     }
 
     pub fn get_to_snake_case(&self) -> Ident {
-        format_ident!("{}", self.to.to_snake_case())
+        format_ident!("{}", escape_rust_keyword(self.to.to_snake_case()))
     }
 
     pub fn get_to_camel_case(&self) -> Ident {