Merge pull request #4205 from systeminit/brit/bug-467-fix-import_pkg

fix(dal): Don't keep looping through past hashes if you find an existing schema when importing a pkg
systeminit · Jul 23, 2024 · 3cbfb70 · 3cbfb70
2 parents f674e4c + dca5f89
commit 3cbfb70
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/dal/src/pkg/import.rs b/lib/dal/src/pkg/import.rs
@@ -465,13 +465,17 @@ async fn import_schema(
                     // find if there's an existing module
                     // if there is, find the asssociated schemas
                     if let Some(found) = Module::find_by_root_hash(ctx, past_hash).await? {
-                        existing_schema =
-                            found.list_associated_schemas(ctx).await?.into_iter().next();
+                        match found.list_associated_schemas(ctx).await?.into_iter().next() {
+                            Some(existing) => {
+                                existing_schema = Some(existing);
+                                break;
+                            }
+                            None => continue,
+                        }
                     }
                 }
             }
         }
-
         let data = schema_spec
             .data()
             .ok_or(PkgError::DataNotFound("schema".into()))?;