Skip to content

Fix keyword issue #56

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

Merged
owjs3901 merged 1 commit into from
Jan 6, 2026
Merged

Fix keyword issue #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .changepacks/changepack_log_HH-eTMv3QIWWbQ6ECBCQT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"changes":{"crates/vespertide-naming/Cargo.toml":"Patch","crates/vespertide-planner/Cargo.toml":"Patch","crates/vespertide-macro/Cargo.toml":"Patch","crates/vespertide-core/Cargo.toml":"Patch","crates/vespertide/Cargo.toml":"Patch","crates/vespertide-cli/Cargo.toml":"Patch","crates/vespertide-loader/Cargo.toml":"Patch","crates/vespertide-exporter/Cargo.toml":"Patch","crates/vespertide-query/Cargo.toml":"Patch","crates/vespertide-config/Cargo.toml":"Patch"},"note":"Fix keyword issue","date":"2026-01-06T17:51:25.259877600Z"}
20 changes: 10 additions & 10 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions crates/vespertide-exporter/src/seaorm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,18 @@ fn render_indexes(lines: &mut Vec<String>, constraints: &[TableConstraint]) {
}
}

/// Rust reserved keywords that cannot be used as identifiers without raw identifier syntax.
/// Reference: https://doc.rust-lang.org/reference/keywords.html
const RUST_KEYWORDS: &[&str] = &[
// Strict keywords
"as", "async", "await", "break", "const", "continue", "crate", "dyn", "else", "enum", "extern",
"false", "fn", "for", "if", "impl", "in", "let", "loop", "match", "mod", "move", "mut", "pub",
"ref", "return", "self", "Self", "static", "struct", "super", "trait", "true", "type",
"unsafe", "use", "where", "while", // Reserved keywords (for future use)
"abstract", "become", "box", "do", "final", "macro", "override", "priv", "try", "typeof",
"unsized", "virtual", "yield",
];

fn sanitize_field_name(name: &str) -> String {
let mut result = String::new();

Expand All @@ -809,6 +821,8 @@ fn sanitize_field_name(name: &str) -> String {

if result.is_empty() {
"_col".into()
} else if RUST_KEYWORDS.contains(&result.as_str()) {
format!("r#{}", result)
} else {
result
}
Expand Down Expand Up @@ -1044,6 +1058,24 @@ mod helper_tests {
#[case("name_with_trailing_space ", "name_with_trailing_space_")]
#[case("", "_col")]
#[case("a", "a")]
// Reserved keywords should be prefixed with r#
#[case("type", "r#type")]
#[case("ref", "r#ref")]
#[case("mod", "r#mod")]
#[case("fn", "r#fn")]
#[case("let", "r#let")]
#[case("mut", "r#mut")]
#[case("pub", "r#pub")]
#[case("self", "r#self")]
#[case("Self", "r#Self")]
#[case("match", "r#match")]
#[case("async", "r#async")]
#[case("await", "r#await")]
#[case("abstract", "r#abstract")]
// Non-reserved words should not be prefixed
#[case("types", "types")]
#[case("reference", "reference")]
#[case("module", "module")]
fn test_sanitize_field_name(#[case] input: &str, #[case] expected: &str) {
assert_eq!(sanitize_field_name(input), expected);
}
Expand Down