Merge pull request #50 from tpluscode/delete-commit-bug

delete first, check for orphans later

Author: tpluscode

RomanticWeb/EntityStore.cs

@@ -99,14 +99,7 @@ public void ReplacePredicateValues(EntityId entityId, Node propertyUri, Func<IEn
 
         public void Delete(EntityId entityId, DeleteBehaviour deleteBehaviour = DeleteBehaviour.Default)
         {
-            var deletes = from entityQuad in _entityQuads[Node.FromEntityId(entityId)].ToList()
-                          from removedQuad in RemoveTriple(entityQuad)
-                          select removedQuad;
-
-            if (entityId is BlankId)
-            {
-                deletes = deletes.Union(_entityQuads.RemoveWhereObject(Node.FromEntityId(entityId)));
-            }
+            IEnumerable<EntityQuad> deletes = DeleteQuads(entityId);
 
             var deletesGrouped = (from removedQuad in deletes 
                                   group removedQuad by removedQuad.Graph into g 
@@ -133,15 +126,6 @@ group removedQuad by removedQuad.Graph into g
                     _changesTracker.Add(new RemoveReferences(entityId));
                 }
             }
-
-            var orphanedBlankEntities = from removed in deletesGrouped 
-                                        from quad in removed
-                                        where quad.Object.IsBlank && !IsReferenced(quad.Object) 
-                                        select quad;
-            foreach (var quad in orphanedBlankEntities)
-            {
-                Delete(quad.Object.ToEntityId(), deleteBehaviour);
-            }
         }
 
         public void ResetState()
@@ -178,6 +162,28 @@ public void Dispose()
             _disposed = true;
         }
 
+        private IEnumerable<EntityQuad> DeleteQuads(EntityId entityId)
+        {
+            var deletes = (from entityQuad in _entityQuads[Node.FromEntityId(entityId)].ToList()
+                           from removedQuad in RemoveTriple(entityQuad)
+                           select removedQuad).ToList();
+
+            if (entityId is BlankId)
+            {
+                deletes.AddRange(_entityQuads.RemoveWhereObject(Node.FromEntityId(entityId)));
+            }
+
+            var orphanedBlankEntities = (from quad in deletes
+                                         where quad.Object.IsBlank && !IsReferenced(quad.Object)
+                                         select quad).ToArray();
+            foreach (var quad in orphanedBlankEntities)
+            {
+                deletes.AddRange(DeleteQuads(quad.Object.ToEntityId()));
+            }
+
+            return deletes;
+        } 
+
         private DatasetChange CreateChangeForUpdate(EntityId entityId, EntityId graphUri, EntityQuad[] removedQuads, EntityQuad[] addedQuads)
         {
             var update = new GraphUpdate(entityId, graphUri, removedQuads, addedQuads);

Tests/RomanticWeb.Tests/IntegrationTests/WritingTestsBase.cs

@@ -3,12 +3,14 @@
 using FluentAssertions;
 using NUnit.Framework;
 using RomanticWeb.Entities;
+using RomanticWeb.TestEntities;
 using RomanticWeb.TestEntities.Foaf;
 using RomanticWeb.Tests.Helpers;
 using RomanticWeb.Tests.Stubs;
 using RomanticWeb.Vocabularies;
 using VDS.RDF;
 using VDS.RDF.Query.Builder;
+using IPerson = RomanticWeb.TestEntities.Foaf.IPerson;
 
 namespace RomanticWeb.Tests.IntegrationTests
 {
@@ -353,6 +355,49 @@ public void Should_allow_modifying_retrieved_nodes_where_some_are_blank()
                 eb => eb.Str(eb.Variable("street")) == "Litzmannstadt");
         }
 
+        [Test]
+        public void Shoud_not_commit_volatile_deleted_entity()
+        {
+            // given
+            var entityId = new Uri("http://magi/people/Tomasz");
+            var tempId = new Uri("http://magi/people/TomaszTwo");
+            
+            // when
+            var person = EntityContext.Create<IPerson>(entityId);
+            var tempPerson = EntityContext.Create<IPerson>(tempId);
+            tempPerson.Name = "Tomasz";
+            person.Name = person.Name;
+            EntityContext.Delete(tempId);
+            EntityContext.Commit();
+
+            // then
+            Store.Should().NotMatchAsk(tpb => tpb.Subject(tempId).Predicate("p").Object("o"));
+            Store.Should().NotMatchAsk(tpb => tpb.Subject("s").Predicate("p").Object(tempId));
+        }
+
+        [Test]
+        public void Shoud_not_commit_volatile_deleted_entity_with_list()
+        {
+            // given
+            var tempId = new Uri("temp://magi/people/Tomasz");
+            var saved = EntityContext.Create<IEntityWithCollections>(new Uri("http://magi/people/Tomasz"));
+            var temp = EntityContext.Create<IEntityWithCollections>(tempId);
+            temp.DefaultListMapping.Add("test 1");
+            temp.DefaultListMapping.Add("test 2");
+            foreach (var val in temp.DefaultListMapping)
+            {
+                saved.DefaultListMapping.Add(val);
+            }
+            
+            // when
+            EntityContext.Delete(tempId);
+            EntityContext.Commit();
+
+            // then
+            Store.Should().NotMatchAsk(tpb => tpb.Subject(tempId).Predicate("p").Object("o"));
+            Store.Should().NotMatchAsk(tpb => tpb.Subject("s").Predicate("p").Object(tempId));
+        }
+
         protected override void ChildSetup()
         {
             Factory.WithNamedGraphSelector(new TestGraphSelector());