caisin/sea-orm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Escape Rust keywords used in table names (#1052)

Browse Source 
* Escape Rust keywords used in table names

* Escape rust keyword when generating conjunct relation impl

Co-authored-by: Billy Chan <ccw.billy.123@gmail.com>
This commit is contained in:
Andrey Kutejko 2022-10-26 05:22:08 +02:00 committed by GitHub
parent a3fb8e8b0d
commit 7e92876feb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sea-orm-codegen/src/entity/base_entity.rs
View File

@ -4,7 +4,9 @@ use quote::format_ident;
use quote::quote; use quote::quote;
use sea_query::ColumnType; use sea_query::ColumnType;
use crate::{Column, ConjunctRelation, DateTimeCrate, PrimaryKey, Relation}; use crate::{
util::escape_rust_keyword, Column, ConjunctRelation, DateTimeCrate, PrimaryKey, Relation,
};
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct Entity { pub struct Entity {
@ -25,11 +27,11 @@ impl Entity {
} }
pub fn get_table_name_snake_case_ident(&self) -> Ident { pub fn get_table_name_snake_case_ident(&self) -> Ident {
format_ident!("{}", self.get_table_name_snake_case()) format_ident!("{}", escape_rust_keyword(self.get_table_name_snake_case()))
} }
pub fn get_table_name_camel_case_ident(&self) -> Ident { pub fn get_table_name_camel_case_ident(&self) -> Ident {
format_ident!("{}", self.get_table_name_camel_case()) format_ident!("{}", escape_rust_keyword(self.get_table_name_camel_case()))
} }
pub fn get_column_names_snake_case(&self) -> Vec<Ident> { pub fn get_column_names_snake_case(&self) -> Vec<Ident> {

6
sea-orm-codegen/src/entity/conjunct_relation.rs
View File

@ -2,6 +2,8 @@ use heck::{CamelCase, SnakeCase};
use proc_macro2::Ident; use proc_macro2::Ident;
use quote::format_ident; use quote::format_ident;
use crate::util::escape_rust_keyword;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct ConjunctRelation { pub struct ConjunctRelation {
pub(crate) via: String, pub(crate) via: String,
@ -10,11 +12,11 @@ pub struct ConjunctRelation {
impl ConjunctRelation { impl ConjunctRelation {
pub fn get_via_snake_case(&self) -> Ident { 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 { 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 { pub fn get_to_camel_case(&self) -> Ident {

7
sea-orm-codegen/src/entity/relation.rs
View File

@ -4,6 +4,8 @@ use proc_macro2::{Ident, TokenStream};
use quote::{format_ident, quote}; use quote::{format_ident, quote};
use sea_query::{ForeignKeyAction, TableForeignKey}; use sea_query::{ForeignKeyAction, TableForeignKey};
use crate::util::escape_rust_keyword;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum RelationType { pub enum RelationType {
HasOne, HasOne,
@ -41,7 +43,10 @@ impl Relation {
if self.self_referencing { if self.self_referencing {
None None
} else { } else {
Some(format_ident!("{}", self.ref_table.to_snake_case())) Some(format_ident!(
"{}",
escape_rust_keyword(self.ref_table.to_snake_case())
))
} }
} }

7
sea-orm-codegen/src/entity/writer.rs
View File

@ -1,4 +1,4 @@
use crate::{ActiveEnum, Entity}; use crate::{util::escape_rust_keyword, ActiveEnum, Entity};
use heck::CamelCase; use heck::CamelCase;
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
use quote::{format_ident, quote}; use quote::{format_ident, quote};
@ -544,7 +544,10 @@ impl EntityWriter {
} }
pub fn gen_mod(entity: &Entity) -> TokenStream { pub fn gen_mod(entity: &Entity) -> TokenStream {
let table_name_snake_case_ident = entity.get_table_name_snake_case_ident(); let table_name_snake_case_ident = format_ident!(
"{}",
escape_rust_keyword(entity.get_table_name_snake_case_ident())
);
quote! { quote! {
pub mod #table_name_snake_case_ident; pub mod #table_name_snake_case_ident;
} }