@@ -18,8 +18,7 @@ It uses two powerful and mature java libraries: === Status * There are over 400 RSpecs. -* Has been tested with a simple rails application, used Neo4j.rb instead of ActiveRecord -* Has been load tested (loaded 18000 nodes and done queries/traversal in several threads.) +* Has been tested with rails applications, used Neo4j.rb instead of ActiveRecord === Project information * GitHub - http://github.com/andreasronge/neo4j/tree/master @@ -33,7 +32,6 @@ It uses two powerful and mature java libraries: * Ruby Manor 2008 - Jonathan Conway: http://jaikoo.com/assets/presentations/neo4j.pdf * Neo4j wiki - http://wiki.neo4j.org/content/Main_Page (check the guidelines and domain modeling gallery pages) - === Contributing Have you found a bug, need help or have a patch ? @@ -62,7 +60,7 @@ There are also some complete examples in the example folder * railway - an example of a railway network application * imdb - an example of a neo4j database consisting of movies, role and actors nodes/relationships (over 18000 nodes). * rest - an example how to expose neo4j nodes as REST resources -* Ruby on Rails - see http://github.com/andreasronge/neo4j-rails-example/tree/master +* Ruby on Rails - see http://github.com/andreasronge/neo4j-rails-example/tree/master or http://github.com/sashaagafonoff/peoplemap == Installation README.rdoc @@ -1,6 +1,19 @@ module Neo4j module NodeMixin + alias :old_ignore_incoming_cascade_delete? :ignore_incoming_cascade_delete? + + def ignore_incoming_cascade_delete? (node, relationship) + return true if old_ignore_incoming_cascade_delete?(node,relationship) + + 5.times {puts "-------------------------------"} + puts "ignore_incoming_cascade_delete" + node.print 1,:both + 5.times {puts "-------------------------------"} + + # if it's an index node relationship then it should be allowed to cascade delete the node + return relationship.other_node(node) == IndexNode.instance + end module ClassMethods lib/neo4j/extensions/reindexer.rb @@ -27,7 +27,7 @@ module Neo4j # only for testing purpose, e.g we need to redefine an existing class def self.remove_instance(clazz) - @instances.delete(clazz.root_class) unless @instances.nil? + @instances.delete(clazz.root_class) if !@instances.nil? && clazz.respond_to?(:root_class) end lib/neo4j/indexer.rb @@ -284,7 +284,7 @@ module Neo4j # check node has no outgoing relationships no_outgoing = node.relationships.outgoing.empty? # check node has only incoming relationship with cascade_delete_incoming - no_incoming = node.relationships.incoming.find{|r| !r.property?(:_cascade_delete_incoming)}.nil? + no_incoming = node.relationships.incoming.find{|r| !ignore_incoming_cascade_delete?(node, r)}.nil? # only cascade delete incoming if no outgoing and no incoming (exception cascade_delete_incoming) relationships node.delete if no_outgoing and no_incoming end @@ -294,6 +294,14 @@ module Neo4j end + # Specifies which relationships should be ignored when trying to cascade delete a node. + # If a node does not have any relationships (except those specified here to ignore) it will be cascade deleted + # + def ignore_incoming_cascade_delete?(node, relationship) + # ignore relationship with property _cascade_delete_incoming + relationship.property?(:_cascade_delete_incoming) + end + # Updates the index for this node. # This method will be automatically called when needed # (a property changed or a relationship was created/deleted) lib/neo4j/mixins/node_mixin.rb @@ -4,7 +4,6 @@ $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/..") require 'neo4j' require 'neo4j/spec_helper' - describe "Cascade Delete for raw relationships" do before(:all) do @@ -363,11 +362,10 @@ describe "Cascade Delete chained" do after(:all) do stop + undefine_class :OrderLine, :OrderStatus, :Order end it "should delete a chained relationship of cascaded objects" do - pending "Must avoid cascade delete when using the reindexer extension" - # OrderStatus ---> Order ---*>OrderLine class OrderLine include Neo4j::NodeMixin test/neo4j/cascade_delete_spec.rb @@ -22,8 +22,12 @@ describe "CustomerA,Order,Product" do # 7. What is the mark-up on a certain P&roduct + after(:all) do + undefine_class :Order, :CustomerA, :Product, :OrderLine + end + before(:all) do - undefine_class :Order, :CustomerA, :Product +# undefine_class :Order, :CustomerA, :Product class Order test/neo4j/order_spec.rb 3e20bd6063e587ea389de0541d158b288d0c8113 andreas andreas@andreas-xps16.(none) http://github.com/andreasronge/neo4j/commit/4de7d5fc2268320550b1d89499df3241f3753106 4de7d5fc2268320550b1d89499df3241f3753106 2009-10-26T13:00:54-07:00 2009-10-26T13:00:54-07:00 Fixed cascade delete - now also works on a chain of different Node classes. Also fixed cascade delete so it works together with the ReIndexer extension. [#81] eae29859d34418e829a531a11717c57ea5213ef1 andreas andreas@andreas-xps16.(none)