From 32061e30b5b072fbfa4053a0e684f00dcf9b93f7 Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Wed, 26 Oct 2022 18:19:51 +0800 Subject: [PATCH] Added check to make sure migration name is valid (#1155) Co-authored-by: Forest Anderson --- sea-orm-cli/src/commands/migrate.rs | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sea-orm-cli/src/commands/migrate.rs b/sea-orm-cli/src/commands/migrate.rs index 28d48dfd..8931ea5b 100644 --- a/sea-orm-cli/src/commands/migrate.rs +++ b/sea-orm-cli/src/commands/migrate.rs @@ -2,6 +2,7 @@ use chrono::{Local, Utc}; use regex::Regex; use std::{ error::Error, + fmt::Display, fs, io::Write, path::{Path, PathBuf}, @@ -117,6 +118,14 @@ pub fn run_migrate_generate( migration_name: &str, universal_time: bool, ) -> Result<(), Box> { + // Make sure the migration name doesn't contain any characters that + // are invalid module names in Rust. + if migration_name.contains('-') { + return Err(Box::new(MigrationCommandError::InvalidName( + "Hyphen `-` cannot be used in migration name".to_string(), + ))); + } + println!("Generating new migration..."); // build new migration filename @@ -227,6 +236,23 @@ fn update_migrator(migration_name: &str, migration_dir: &str) -> Result<(), Box< Ok(()) } +#[derive(Debug)] +enum MigrationCommandError { + InvalidName(String), +} + +impl Display for MigrationCommandError { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + MigrationCommandError::InvalidName(name) => { + write!(f, "Invalid migration name: {}", name) + } + } + } +} + +impl Error for MigrationCommandError {} + #[cfg(test)] mod tests { use super::*;