Merge pull request #66 from chaindexing/optimize-filter-maps

Optimize filter maps
chaindexing · Mar 8, 2024 · d470e39 · d470e39
2 parents 64cecb2 + 22844da
commit d470e39
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/chaindexing/src/contract_states/migrations.rs b/chaindexing/src/contract_states/migrations.rs
@@ -73,11 +73,14 @@ pub trait ContractStateMigrations: Send + Sync {
     fn get_reset_migrations(&self) -> Vec<String> {
         self.get_migrations()
             .iter()
-            .filter(|m| m.starts_with("CREATE TABLE IF NOT EXISTS"))
-            .map(|create_migration| {
-                let table_name = extract_table_name(create_migration);
+            .filter_map(|migration| {
+                if migration.starts_with("CREATE TABLE IF NOT EXISTS") {
+                    let table_name = extract_table_name(migration);
 
-                format!("DROP TABLE IF EXISTS {table_name}")
+                    Some(format!("DROP TABLE IF EXISTS {table_name}"))
+                } else {
+                    None
+                }
             })
             .collect()
     }
@@ -102,14 +105,19 @@ fn extract_table_fields(migration: &str, remove_json_fields: bool) -> Vec<String
         .last()
         .unwrap()
         .split(',')
-        .filter(|field| remove_json_fields && !(field.contains("JSON") || field.contains("JSONB")))
-        .map(|field| {
-            field
-                .split_ascii_whitespace()
-                .collect::<Vec<&str>>()
-                .first()
-                .unwrap()
-                .to_string()
+        .filter_map(|field| {
+            if remove_json_fields && !(field.contains("JSON") || field.contains("JSONB")) {
+                Some(
+                    field
+                        .split_ascii_whitespace()
+                        .collect::<Vec<&str>>()
+                        .first()
+                        .unwrap()
+                        .to_string(),
+                )
+            } else {
+                None
+            }
         })
         .collect()
 }