rename errors

jjcfrancisco · Jul 24, 2024 · 21b4547 · 21b4547
1 parent 84f52c6
commit 21b4547
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/src/error.rs b/src/error.rs
@@ -5,7 +5,7 @@ pub type Result<T> = core::result::Result<T, Error>;
 #[derive(Debug, From)]
 pub enum Error {
     // -- utils
-    FailedInputValidation(String),
+    FailedValidation(String),
     Mode(String),
 
     // -- pg
@@ -15,7 +15,7 @@ pub enum Error {
     // -- file_types
     UnsupportedFileExtension(String),
     UnsupportedShapeType(String),
-    ContainsMixedDataTypes(String),
+    MixedDataTypes(String),
 
     // -- Externals
     #[from]

diff --git a/src/file_types/geojson.rs b/src/file_types/geojson.rs
@@ -41,7 +41,7 @@ pub fn determine_data_types(file_path: &str) -> Result<Vec<NewTableTypes>> {
                                 } else if table_config.contains_key(&key)
                                     && table_config[&key] != Type::INT8
                                 {
-                                    return Err(Error::ContainsMixedDataTypes("Column contains mixed data types ✘".to_string()));
+                                    return Err(Error::MixedDataTypes("Column contains mixed data types ✘".to_string()));
                                 } else {
                                     table_config.insert(key, Type::FLOAT8);
                                 }
@@ -54,7 +54,7 @@ pub fn determine_data_types(file_path: &str) -> Result<Vec<NewTableTypes>> {
                                 } else if table_config.contains_key(&key)
                                     && table_config[&key] != Type::INT8
                                 {
-                                    return Err(Error::ContainsMixedDataTypes("Column contains mixed data types ✘".to_string()));
+                                    return Err(Error::MixedDataTypes("Column contains mixed data types ✘".to_string()));
                                 } else {
                                     table_config.insert(key, Type::TEXT);
                                 }
@@ -67,7 +67,7 @@ pub fn determine_data_types(file_path: &str) -> Result<Vec<NewTableTypes>> {
                                 } else if table_config.contains_key(&key)
                                     && table_config[&key] != Type::INT8
                                 {
-                                    return Err(Error::ContainsMixedDataTypes("Column contains mixed data types ✘".to_string()));
+                                    return Err(Error::MixedDataTypes("Column contains mixed data types ✘".to_string()));
                                 } else {
                                     table_config.insert(key, Type::BOOL);
                                 }

diff --git a/src/file_types/shapefile.rs b/src/file_types/shapefile.rs
@@ -24,7 +24,7 @@ pub fn determine_data_types(file_path: &str) -> Result<Vec<NewTableTypes>> {
                     } else if table_config.contains_key(&column_name)
                         && table_config[&column_name] != Type::INT8
                     {
-                        return Err(Error::ContainsMixedDataTypes("Column contains mixed data types ✘".to_string()));
+                        return Err(Error::MixedDataTypes("Column contains mixed data types ✘".to_string()));
                     } else {
                         table_config.insert(column_name, Type::FLOAT8);
                     }
@@ -37,7 +37,7 @@ pub fn determine_data_types(file_path: &str) -> Result<Vec<NewTableTypes>> {
                     } else if table_config.contains_key(&column_name)
                         && table_config[&column_name] != Type::INT8
                     {
-                        return Err(Error::ContainsMixedDataTypes("Column contains mixed data types ✘".to_string()));
+                        return Err(Error::MixedDataTypes("Column contains mixed data types ✘".to_string()));
                     } else {
                         table_config.insert(column_name, Type::FLOAT8);
                     }
@@ -50,7 +50,7 @@ pub fn determine_data_types(file_path: &str) -> Result<Vec<NewTableTypes>> {
                     } else if table_config.contains_key(&column_name)
                         && table_config[&column_name] != Type::INT8
                     {
-                        return Err(Error::ContainsMixedDataTypes("Column contains mixed data types ✘".to_string()));
+                        return Err(Error::MixedDataTypes("Column contains mixed data types ✘".to_string()));
                     } else {
                         table_config.insert(column_name, Type::FLOAT8);
                     }
@@ -63,7 +63,7 @@ pub fn determine_data_types(file_path: &str) -> Result<Vec<NewTableTypes>> {
                     } else if table_config.contains_key(&column_name)
                         && table_config[&column_name] != Type::FLOAT8
                     {
-                        return Err(Error::ContainsMixedDataTypes("Column contains mixed data types ✘".to_string()));
+                        return Err(Error::MixedDataTypes("Column contains mixed data types ✘".to_string()));
                     } else {
                         table_config.insert(column_name, Type::INT8);
                     }
@@ -76,7 +76,7 @@ pub fn determine_data_types(file_path: &str) -> Result<Vec<NewTableTypes>> {
                     } else if table_config.contains_key(&column_name)
                         && table_config[&column_name] != Type::INT8
                     {
-                        return Err(Error::ContainsMixedDataTypes("Column contains mixed data types ✘".to_string()));
+                        return Err(Error::MixedDataTypes("Column contains mixed data types ✘".to_string()));
                     } else {
                         table_config.insert(column_name, Type::TEXT);
                     }
@@ -89,7 +89,7 @@ pub fn determine_data_types(file_path: &str) -> Result<Vec<NewTableTypes>> {
                     } else if table_config.contains_key(&column_name)
                         && table_config[&column_name] != Type::INT8
                     {
-                        return Err(Error::ContainsMixedDataTypes("Column contains mixed data types ✘".to_string()));
+                        return Err(Error::MixedDataTypes("Column contains mixed data types ✘".to_string()));
                     } else {
                         table_config.insert(column_name, Type::BOOL);
                     }

diff --git a/src/utils/cli.rs b/src/utils/cli.rs
@@ -77,7 +77,7 @@ pub fn run() -> Result<()> {
             }
             _ => {
                 println!("Mode not supported ✘");
-                return Err(Error::FailedInputValidation("Mode not supported ✘".into()));
+                return Err(Error::FailedValidation("Mode not supported ✘".into()));
             }
         }
     } else {

diff --git a/src/utils/validate.rs b/src/utils/validate.rs
@@ -7,23 +7,23 @@ pub fn validate_args(args: &Cli) -> Result<()> {
 
     // Check input file exists
     if !Path::new(&args.input).exists() {
-        return Err(Error::FailedInputValidation("Input file does not exist ✘".into()));
+        return Err(Error::FailedValidation("Input file does not exist ✘".into()));
     }
 
     // Check URL is not empty
     if args.uri.is_empty() {
-        return Err(Error::FailedInputValidation("URL is empty ✘".into()));
+        return Err(Error::FailedValidation("URL is empty ✘".into()));
     }
 
     // Check table is not empty
     if args.table.is_empty() {
-        return Err(Error::FailedInputValidation("Table is empty ✘".into()));
+        return Err(Error::FailedValidation("Table is empty ✘".into()));
     }
 
     // Check if srid is 4326 or 3857
     if let Some(srid) = args.srid {
         if srid != 4326 && srid != 3857 {
-            return Err(Error::FailedInputValidation("SRID must be 4326 or 3857 ✘".into()));
+            return Err(Error::FailedValidation("SRID must be 4326 or 3857 ✘".into()));
         }
     }