activegraph 10.0.0.pre.alpha.7 → 10.0.0.pre.alpha.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee929286df7c03716620060ba6229dae865612f295c02e02872a8a1fa329c7f
-  data.tar.gz: 7d3983fc31041476a7cc6e0b92119b6c1e6ad1207ae5d1e6293871a92f9f865a
+  metadata.gz: 6b7846af39d73f89f279284b358f2f4e5552709b6dd8812a5481944fdf479ec0
+  data.tar.gz: 71674f9403e7f9c88ab23631e138e6b901a3ae9dcfb672fbf7277ce20d26c61b
 SHA512:
-  metadata.gz: 582aedd1880e79fb5983774d2fea5456b247f8c72b57caa676de5b5272766f4e7db44c6de927c3899a23a5bc38a92ef4b71bffc782ba44facf9086d818ca9c58
-  data.tar.gz: 982dc47105a57220e1b1e09a1fb3ed18b47646dd9c7166cef754a30609e12f0487722b411b7efef2dcacc3fa5bb7ac149028b8ccb3d3c8abca4cb1b93f501d32
+  metadata.gz: a0ed7a4862b179f5b0b02a3dbccc440604ab309e744736247c2d6600848f29387e9ecd4504a6a170a4dcc287be42543d6443d52d8a12ec4544a0b1238af796d5
+  data.tar.gz: fa3b8f1d9db6aa4c5d3d3090dd74a761a9d8c8399f0c1e5fcafeac57a6402b37f3987ee99efcf7a07e9a775b9f1045a574892e340b21d504b11fc39fb663a04e

data/CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 This file should follow the standards specified on [http://keepachangelog.com/]
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [10.0.x] 2020-01-23
+
+- Executing relationship callbacks on relationship deletion.
+- When assiging relationships, preserving earlier relationships.
+- Enforcing has one constraint on relationships.
+
 ## [9.6.1] 2019-12-18
 
 ## Fixed

data/config/neo4j/config.yml

@@ -33,6 +33,3 @@ cache_class_names: true
 # class_name_property:  :_classname
 
 transform_rel_type: :upcase
-
-# Enforce has_one relationship. When same reationship is created on reverse object with another object, raise the error.
-enforce_has_one: false

data/lib/neo4j.rb

@@ -61,6 +61,7 @@ require 'neo4j/active_rel/related_node'
 require 'neo4j/active_rel/types'
 require 'neo4j/active_rel'
 
+require 'neo4j/active_node/dependent_callbacks'
 require 'neo4j/active_node/node_list_formatter'
 require 'neo4j/active_node/dependent'
 require 'neo4j/active_node/dependent/query_proxy_methods'

data/lib/neo4j/active_node.rb

@@ -45,6 +45,7 @@ module Neo4j
     include Neo4j::ActiveNode::Dependent
     include Neo4j::ActiveNode::Enum
     include Neo4j::Shared::PermittedAttributes
+    include Neo4j::ActiveNode::DependentCallbacks
 
     def initialize(args = nil)
       self.class.ensure_id_property_info! # So that we make sure all objects have an id_property

data/lib/neo4j/active_node/dependent/query_proxy_methods.rb

@@ -26,24 +26,25 @@ module Neo4j
         # @param [String, Symbol] other_node The identifier to use for the other end of the chain.
         # @param [String, Symbol] other_rel The identifier to use for the relationship in the optional match.
         # @return [Neo4j::ActiveNode::Query::QueryProxy]
-        def unique_nodes(association, self_identifer, other_node, other_rel)
+        def unique_nodes(association, self_identifer, other_node, other_rel, ids = [])
           fail 'Only supported by in QueryProxy chains started by an instance' unless source_object
           return false if send(association.name).empty?
-          unique_nodes_query(association, self_identifer, other_node, other_rel)
+          unique_nodes_query(association, self_identifer, other_node, other_rel, ids)
             .proxy_as(association.target_class, other_node)
         end
 
         private
 
-        def unique_nodes_query(association, self_identifer, other_node, other_rel)
-          query.with(identity).proxy_as_optional(source_object.class, self_identifer)
-               .send(association.name, other_node, other_rel)
-               .query
-               .with(other_node)
-               .match("()#{association.arrow_cypher(:orphan_rel)}(#{other_node})")
-               .with(other_node, count: 'count(*)')
-               .where('count = $one', one: 1)
-               .break
+        def unique_nodes_query(association, self_identifer, other_node, other_rel, ids)
+          base = query.with(identity).proxy_as_optional(source_object.class, self_identifer)
+                      .send(association.name, other_node, other_rel)
+          base = base.where(id: ids) if ids.present?
+          base.query
+              .with(other_node)
+              .match("()#{association.arrow_cypher(:orphan_rel)}(#{other_node})")
+              .with(other_node, count: 'count(*)')
+              .where('count = $one', one: 1)
+              .break
         end
       end
     end

data/lib/neo4j/active_node/dependent_callbacks.rb

@@ -0,0 +1,31 @@
+module Neo4j
+  module ActiveNode
+    module DependentCallbacks
+      extend ActiveSupport::Concern
+
+      def dependent_delete_callback(association, ids)
+        association_query_proxy(association.name).where(id: ids).delete_all
+      end
+
+      def dependent_delete_orphans_callback(association, ids)
+        unique_query = as(:self).unique_nodes(association, :self, :n, :other_rel, ids)
+        unique_query.query.optional_match('(n)-[r]-()').delete(:n, :r).exec if unique_query
+      end
+
+      def dependent_destroy_callback(association, ids)
+        unique_query = association_query_proxy(association.name).where(id: ids)
+        unique_query.each_for_destruction(self, &:destroy) if unique_query
+      end
+
+      def dependent_destroy_orphans_callback(association, ids)
+        unique_query = as(:self).unique_nodes(association, :self, :n, :other_rel, ids)
+        unique_query.each_for_destruction(self, &:destroy) if unique_query
+      end
+
+      def callbacks_from_active_rel(active_rel, direction, other_node)
+        rel = active_rel_corresponding_rel(active_rel, direction, other_node.class).try(:last)
+        public_send("dependent_#{rel.dependent}_callback", rel, [other_node.id]) if rel && rel.dependent
+      end
+    end
+  end
+end

data/lib/neo4j/active_node/has_n.rb

@@ -229,10 +229,9 @@ module Neo4j::ActiveNode
       end
     end
 
-    def validate_reverse_has_one_core_rel(association, other_node)
-      return unless Neo4j::Config[:enforce_has_one]
+    def delete_reverse_has_one_core_rel(association)
       reverse_assoc = reverse_association(association)
-      validate_has_one_rel!(reverse_assoc, other_node) if reverse_assoc && reverse_assoc.type == :has_one
+      delete_has_one_rel!(reverse_assoc) if reverse_assoc && reverse_assoc.type == :has_one
     end
 
     def reverse_association(association)
@@ -242,14 +241,14 @@ module Neo4j::ActiveNode
       reverse_assoc && reverse_assoc.last
     end
 
-    def validate_reverse_has_one_active_rel(active_rel, direction, other_node)
+    def delete_reverse_has_one_active_rel(active_rel, direction, other_node)
       rel = active_rel_corresponding_rel(active_rel, direction, other_node.class)
-      validate_has_one_rel!(rel.last, other_node) if rel && rel.last.type == :has_one
+      delete_has_one_rel!(rel.last) if rel && rel.last.type == :has_one
     end
 
-    def validate_has_one_rel!(rel, other_node)
-      raise_error = (node = send(rel.name.to_s)) && node != other_node
-      fail(HasOneConstraintError, "node #{self.class}##{neo_id} has a has_one relationship with #{other_node.class}##{other_node.neo_id}") if raise_error
+    def delete_has_one_rel!(rel)
+      send("#{rel.name}", :n, :r, chainable: true).query.delete(:r).exec
+      association_proxy_cache.clear
     end
 
     def active_rel_corresponding_rel(active_rel, direction, target_class)

data/lib/neo4j/active_node/query/query_proxy.rb

@@ -208,7 +208,7 @@ module Neo4j
           Neo4j::ActiveBase.run_transaction do
             other_nodes.each do |other_node|
               if other_node.neo_id
-                other_node.try(:validate_reverse_has_one_core_rel, association, @start_object)
+                other_node.try(:delete_reverse_has_one_core_rel, association)
               else
                 other_node.save
               end

data/lib/neo4j/active_node/query/query_proxy_methods_of_mass_updating.rb

@@ -49,13 +49,37 @@ module Neo4j
         # Deletes the relationships between all nodes for the last step in the QueryProxy chain and replaces them with relationships to the given nodes.
         # Executed in the database, callbacks will not be run.
         def replace_with(node_or_nodes)
-          nodes = Array(node_or_nodes)
+          node_hash = idify_hash(node_or_nodes)
+          original_ids = self.pluck(:id)
+          new_nodes = add_rels(node_hash, original_ids)
+          delete_rels_for_nodes(original_ids - node_hash.keys)
+          new_nodes | node_hash.values
+        end
+
+        def idify_hash(args)
+          Array(args).reject(&:blank?).flatten.each_with_object({}).with_index do |(arg, hash), inx|
+            if arg.is_a?(Integer) || arg.is_a?(String)
+              hash[arg.to_i] = @model.find(arg)
+            else
+              key = arg.persisted? ? arg.id : "tmp_#{inx}"
+              hash[key] = arg
+            end
+          end
+        end
 
-          self.delete_all_rels
-          nodes.map do |node|
-            node if _create_relation_or_defer(node)
+        def add_rels(node_hash, original_ids)
+          (node_hash.keys - original_ids).map do |id|
+            node_hash[id] if _create_relation_or_defer(node_hash[id])
           end.compact
-          # nodes.each { |node| self << node }
+        end
+
+        def delete_rels_for_nodes(ids)
+          return unless ids.present?
+          if association.dependent
+            start_object.public_send("dependent_#{association.dependent}_callback", association, ids)
+          else
+            self.where(id: ids).delete_all_rels
+          end
         end
 
         # Returns all relationships between a node and its last link in the QueryProxy chain, destroys them in Ruby. Callbacks will be run.

data/lib/neo4j/active_rel/callbacks.rb

@@ -10,6 +10,12 @@ module Neo4j
         end
         super(*args)
       end
+
+      def destroy
+        to_node.callbacks_from_active_rel(self, :in, from_node).try(:last)
+        from_node.callbacks_from_active_rel(self, :out, to_node).try(:last)
+        super
+      end
     end
   end
 end

data/lib/neo4j/active_rel/persistence.rb

@@ -45,17 +45,16 @@ module Neo4j::ActiveRel
 
     def create_model
       validate_node_classes!
-      validate_has_one_rel
+      delete_has_one_rel
       rel = _create_rel
       return self unless rel.respond_to?(:props)
       init_on_load(rel, from_node, to_node, @rel_type)
       true
     end
 
-    def validate_has_one_rel
-      return unless Neo4j::Config[:enforce_has_one]
-      to_node.validate_reverse_has_one_active_rel(self, :in, from_node) if to_node.persisted?
-      from_node.validate_reverse_has_one_active_rel(self, :out, to_node) if from_node.persisted?
+    def delete_has_one_rel
+      to_node.delete_reverse_has_one_active_rel(self, :in, from_node) if to_node.persisted?
+      from_node.delete_reverse_has_one_active_rel(self, :out, to_node) if from_node.persisted?
     end
 
     def query_as(var)

data/lib/neo4j/migrations/runner.rb

@@ -58,7 +58,7 @@ module Neo4j
 
       def mark_versions_as_complete(versions)
         Neo4j::ActiveBase.new_query
-                         .with('{versions} AS versions').params(versions: versions).break
+                         .with('$versions AS versions').params(versions: versions).break
                          .unwind(version: :versions).break
                          .merge('(:`Neo4j::Migrations::SchemaMigration` {migration_id: version})')
                          .exec

data/lib/neo4j/migrations/schema.rb

@@ -23,12 +23,32 @@ module Neo4j
         end
 
         def fetch_index_descriptions(session)
-          session.query('CALL db.indexes()').reject do |row|
+          result = session.query('CALL db.indexes()')
+          if result.columns.include?(:description)
+            v3_indexes(result)
+          else
+            v4_indexes(result)
+          end
+        end
+
+        def v3_indexes(result)
+          result.reject do |row|
             # These indexes are created automagically when the corresponding constraints are created
             row.type == 'node_unique_property'
           end.map(&:description)
         end
 
+        def v4_indexes(result)
+          result.reject do |row|
+            # These indexes are created automagically when the corresponding constraints are created
+            row.uniqueness == 'UNIQUE'
+          end.map(&method(:description))
+        end
+
+        def description(row)
+          "INDEX FOR (n:#{row.labelsOrTypes.first}) ON (#{row.properties.map{|prop| "n.#{prop}"}.join(', ')})"
+        end
+
         def drop_and_create_queries(existing, specified, remove_missing)
           [].tap do |queries|
             if remove_missing

data/lib/neo4j/tasks/migration.rake

@@ -97,11 +97,13 @@ COMMENT
 
         schema_data = YAML.safe_load(File.read(SCHEMA_YAML_PATH), [Symbol])
 
-        Neo4j::Core::CypherSession::Adaptors::Base.subscribe_to_query(&method(:puts))
+        Neo4j::Transaction.subscribe_to_query(&method(:puts))
 
         Neo4j::ActiveBase.run_transaction do
           Neo4j::Migrations::Schema.synchronize_schema_data(Neo4j::ActiveBase.transaction, schema_data, args[:remove_missing])
+        end
 
+        Neo4j::ActiveBase.run_transaction do
           runner = Neo4j::Migrations::Runner.new
           runner.mark_versions_as_complete(schema_data[:versions]) # Run in test mode?
         end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '10.0.0-alpha.7'
+  VERSION = '10.0.0-alpha.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 10.0.0.pre.alpha.7
+  version: 10.0.0.pre.alpha.8
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -259,6 +259,7 @@ files:
 - lib/neo4j/active_node/dependent.rb
 - lib/neo4j/active_node/dependent/association_methods.rb
 - lib/neo4j/active_node/dependent/query_proxy_methods.rb
+- lib/neo4j/active_node/dependent_callbacks.rb
 - lib/neo4j/active_node/enum.rb
 - lib/neo4j/active_node/has_n.rb
 - lib/neo4j/active_node/has_n/association.rb