Merge pull request #5147 from systeminit/zack/ensure-default-is-not-e…

…rased

fix: schemas should be created with lineage_id == id

lib/dal/src/schema.rs

@@ -149,9 +149,10 @@ impl Schema {
 
         let workspace_snapshot = ctx.workspace_snapshot()?;
 
-        let lineage_id = workspace_snapshot.generate_ulid().await?;
+        // Lineage id has to match id here, otherwise every new schema will be
+        // treated as a new node, even though it has the same id
         let node_weight =
-            NodeWeight::new_content(id.into(), lineage_id, ContentAddress::Schema(hash));
+            NodeWeight::new_content(id.into(), id.into(), ContentAddress::Schema(hash));
 
         workspace_snapshot.add_or_replace_node(node_weight).await?;
 

lib/dal/src/workspace_snapshot/graph/v4.rs

@@ -1631,7 +1631,7 @@ impl WorkspaceSnapshotGraphV4 {
                     if let (Some(source_idx), Some(destination_idx)) = (source_idx, destination_idx)
                     {
                         if let EdgeWeightKind::Use { is_default: true } = edge_weight.kind() {
-                            ensure_only_one_default_use_edge(self, source_idx)?;
+                            ensure_only_one_default_use_edge(self, source_idx, destination_idx)?;
                         }
 
                         self.add_edge_inner(
@@ -1781,14 +1781,15 @@ fn prop_node_indexes_for_node_index(
 fn ensure_only_one_default_use_edge(
     graph: &mut WorkspaceSnapshotGraphV4,
     source_idx: NodeIndex,
+    destination_idx: NodeIndex,
 ) -> WorkspaceSnapshotGraphResult<()> {
     let existing_default_targets: Vec<NodeIndex> = graph
         .edges_directed(source_idx, Outgoing)
         .filter(|edge_ref| {
             matches!(
                 edge_ref.weight().kind(),
                 EdgeWeightKind::Use { is_default: true }
-            )
+            ) && edge_ref.target() != destination_idx
         })
         .map(|edge_ref| edge_ref.target())
         .collect();