activegraph 11.1.0 → 11.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f665b5c84fb15ec151bae2809606a3ab2ad9a5f521938c8b84c61499fdb1d24a
-  data.tar.gz: 5fae844b9ce18bee486e2b71c9aa370dff52f703608251c9927bfc4f53e84487
+  metadata.gz: 4b0ec846225c753d7a2dc2bc3923c95f52dec582324559df182f23df633f564c
+  data.tar.gz: 1205c8eaf374112629a173f55e2c9a5fae42324073b2f540815eb984cb87e324
 SHA512:
-  metadata.gz: c127dfaabbd5e864f12f15b869baf5e609953e66550e7c0c40b8ad28fb16663cf865d6189ff1f6cd0b1a8f98e570033ab624b24ca4d59d7b9322bb568ddafd3a
-  data.tar.gz: 31f99b876df02ccf43cd51c0794725df354883122a131cd14cf9c569b74a3daa01e0db5179e963e440d8bab164095a81b25b80ac627c41e52e7a51d128110562
+  metadata.gz: '07091d4bf26b0b2bfb4d6313668e358eb78f8eb6afb7244063a2293a3596963687debf7fe6e72177ba388ac008a9452a8bd580fb48064575354e0e208765f475'
+  data.tar.gz: '09dc2f6eaf0126d26b76aba057b9b7e77e0b633f0b13ab99964ed64fd64e7421f22eaa470d9abd0fca4bd896e122ca938814683bc0c618e7d37d2ded400c00de'

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/).
 
+## [11.2.0] 2023-02-06
+
+## Added
+
+- support for neo4j:schema:dump and :load for neo4j 4 and 5. No automatic migration of schema on major neo4j upgrades. Schema must be regenerated with neo4j:schema:dump or manually adjusted to new syntax on those upgrades.
+  
 ## [11.1.0] 2023-01-10
 
 ## Added

data/lib/active_graph/core/schema.rb

@@ -19,17 +19,22 @@ module ActiveGraph
       end
 
       def indexes
-        raw_indexes.map do |row|
-          definition(row).merge(type: row[:type].to_sym, state: row[:state].to_sym)
+        normalize(raw_indexes, *%i[type state])
+      end
+
+      def normalize(result, *extra)
+        result.map do |row|
+          definition(row, version?('<4') ? :index_cypher_v3 : :index_cypher)
+            .merge(extra.to_h { |key| [key, row[key].to_sym] })
         end
       end
 
       def constraints
         if version?('<4.3')
-          raw_indexes.select(&method(:filter))
+          raw_indexes.select(&method(:constraint_owned?))
         else
           raw_constraints.select(&method(:constraint_filter))
-        end.map { |row| definition(row).merge(type: :uniqueness) }
+        end.map { |row| definition(row, :constraint_cypher).merge(type: :uniqueness) }
       end
 
       private def raw_constraints
@@ -45,22 +50,39 @@ module ActiveGraph
         end
       end
 
+      def constraint_owned?(record)
+        FILTER[major]&.then { |(key, value)| record[key] == value } || record[:owningConstraint]
+      end
+
       private
 
       def major
         @major ||= version.segments.first
       end
 
-      def filter(record)
-        FILTER[major].then { |(key, value)| record[key] == value }
+      def constraint_filter(record)
+        %w[UNIQUENESS RELATIONSHIP_PROPERTY_EXISTENCE NODE_PROPERTY_EXISTENCE NODE_KEY].include?(record[:type])
       end
 
-      def constraint_filter(record)
-        record[:type] == 'UNIQUENESS'
+      def index_cypher_v3(label, properties)
+        "INDEX ON :#{label}#{com_sep(properties, nil)}"
+      end
+
+      def index_cypher(label, properties)
+        "INDEX FOR (n:#{label}) ON #{com_sep(properties)}"
+      end
+
+      def constraint_cypher(label, properties)
+        "CONSTRAINT ON (n:#{label}) ASSERT #{com_sep(properties)} IS UNIQUE"
+      end
+
+      def com_sep(properties, prefix = 'n.')
+        "(#{properties.map { |prop| "#{prefix}#{prop}" }.join(', ')})"
       end
 
-      def definition(row)
-        { label: label(row), properties: properties(row), name: row[:name] }
+      def definition(row, template)
+        { label: label(row), properties: properties(row), name: row[:name],
+          create_statement: row[:createStatement] || send(template,label(row), row[:properties]) }
       end
 
       def label(row)

data/lib/active_graph/core.rb

@@ -5,7 +5,7 @@ require 'active_graph/core/query'
 require 'active_graph/core/record'
 require 'active_graph/core/wrappable'
 require 'active_graph/transaction'
-require 'neo4j_ruby_driver'
+require 'neo4j/driver'
 
 Neo4j::Driver::Types::Entity.include ActiveGraph::Core::Wrappable
 Neo4j::Driver::Types::Entity.prepend ActiveGraph::Core::Entity

data/lib/active_graph/migrations/schema.rb

@@ -3,15 +3,15 @@ module ActiveGraph
     module Schema
       class << self
         def fetch_schema_data
-          { constraints: fetch_constraint_descriptions.sort, indexes: fetch_index_descriptions.sort }
+          %i[constraints indexes].to_h { |schema_elem| [schema_elem, send("fetch_#{schema_elem}_descriptions").keys] }
         end
 
         def synchronize_schema_data(schema_data, remove_missing)
-          queries = []
-          ActiveGraph::Base.read_transaction do
-            queries += drop_and_create_queries(fetch_constraint_descriptions, schema_data[:constraints], remove_missing)
-            queries += drop_and_create_queries(fetch_index_descriptions, schema_data[:indexes], remove_missing)
-          end
+          queries =
+            ActiveGraph::Base.read_transaction do
+              drop_and_create_queries(fetch_constraints_descriptions, schema_data[:constraints], 'CONSTRAINT', remove_missing) +
+                drop_and_create_queries(fetch_indexes_descriptions, schema_data[:indexes], 'INDEX', remove_missing)
+            end
           ActiveGraph::Base.write_transaction do
             queries.each(&ActiveGraph::Base.method(:query))
           end
@@ -19,46 +19,30 @@ module ActiveGraph
 
         private
 
-        def fetch_constraint_descriptions
-          ActiveGraph::Base.query('CALL db.constraints() YIELD description').map(&:first)
+        def fetch_indexes_descriptions
+            ActiveGraph::Base.raw_indexes.reject(&ActiveGraph::Base.method(:constraint_owned?))
+                             .then(&ActiveGraph::Base.method(:normalize)).then(&method(:fetch_descriptions))
         end
 
-        def fetch_index_descriptions
-          ActiveGraph::Base.raw_indexes do |keys, result|
-            if keys.include?(:description)
-              v3_indexes(result)
-            else
-              v4_indexes(result)
-            end
-          end
+        def fetch_constraints_descriptions
+          fetch_descriptions(ActiveGraph::Base.constraints)
         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 { |row| row[:description] }
+        def fetch_descriptions(results)
+          results.map { |definition| definition.values_at(:create_statement, :name) }.sort.to_h
         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))
+        def drop_and_create_queries(existing, specified, schema_elem, remove_missing)
+          (remove_missing ? existing.except(*specified).map { |stmt, name| drop_statement(schema_elem, stmt, name) } : []) +
+            (specified - existing.keys).map(&method(:create_statement))
         end
 
-        def description(row)
-          "INDEX FOR (n:#{row[:labelsOrTypes].first}) ON (#{row[:properties].map { |prop| "n.#{prop}" }.join(', ')})"
+        def drop_statement(schema_elem, create_statement, name)
+          "DROP #{name&.then { |name| "#{schema_elem} #{name}" } || create_statement}"
         end
 
-        def drop_and_create_queries(existing, specified, remove_missing)
-          [].tap do |queries|
-            if remove_missing
-              (existing - specified).each { |description| queries << "DROP #{description}" }
-            end
-
-            (specified - existing).each { |description| queries << "CREATE #{description}" }
-          end
+        def create_statement(stmt)
+          stmt.start_with?('CREATE ') ? stmt : "CREATE #{stmt}"
         end
       end
     end

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '11.1.0'
+  VERSION = '11.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 11.1.0
+  version: 11.2.0
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -444,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: A graph database for Ruby