activegraph 11.0.0.beta.1-java → 11.0.0.beta.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def0f5ce7c7930cddaf5f825f8bd390c593acb72e9366cb62c471985d04b4c99
-  data.tar.gz: 21ba04478d0ae0d355c56ab1ca551d91b05d8e66bd26f3e164d61fede01fa8a5
+  metadata.gz: a97e2df0a3e9a49eb2ca103bfe748ddba1eda40b4f6f5e2e443d797e19294864
+  data.tar.gz: 1fff9d574b04f38dc3ea38e4ea4bc7dbd56606857ee7a413b64abf497db05ce5
 SHA512:
-  metadata.gz: 99d3b195ef17a9f0e5e74f852ef6654a98383e19bf6848660bb7bf02eb6bf22a4873f59c5024c98b1c4ecf57a46574d2db35805214c3fc2840ce503074cb6323
-  data.tar.gz: 6f11b6290d17c93d3006dec6b6ec982b7e318e945c326e1ffe56f41cff900c2f4efa6f7de834e6585934279847555eabf5be64181ba4864451fda81f3586b075
+  metadata.gz: 5f7b364eae28776c62e5c8eb360877ae2c671b53055b500701df8b3187b6bb708e09447a121149bea0a983eb533b86f5b2c924555a7230e1ebe016cd0bbafdef
+  data.tar.gz: f8aa6513ec9d35f8c041c1512391d1373ea5b68cf4a70dcde2bd19b0769a71ce28bbe9aacb661cdb7988831c7021e56c1e758fd1692e5bfbaf2bccf4dfe9489c

data/activegraph.gemspec

@@ -36,7 +36,7 @@ DESCRIPTION
   s.add_dependency('activesupport', '>= 4.0')
   s.add_dependency('i18n', '!= 1.3.0') # version 1.3.0 introduced a bug with `symbolize_key`
   s.add_dependency('orm_adapter', '~> 0.5.0')
-  s.add_dependency("neo4j-java-driver", '~> 4.1.0.beta.1')
+  s.add_dependency("neo4j-java-driver", '~> 4.1.0.beta.2')
   s.add_development_dependency('guard')
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('guard-rubocop')

data/lib/active_graph/core/label.rb

@@ -114,8 +114,9 @@ module ActiveGraph
         end
 
         def drop_constraints
-          ActiveGraph::Base.transaction do |tx|
-            tx.run('CALL db.constraints').each do |record|
+          result = ActiveGraph::Base.read_transaction { |tx| tx.run('CALL db.constraints').to_a }
+          ActiveGraph::Base.write_transaction do |tx|
+            result.each do |record|
               tx.run("DROP #{record.keys.include?(:name) ? "CONSTRAINT #{record[:name]}" : record[:description]}")
             end
           end

data/lib/active_graph/core/schema.rb

@@ -20,11 +20,12 @@ module ActiveGraph
       end
 
       def constraints
-        read_transaction do
-          result = query('CALL db.indexes()', {}, skip_instrumentation: true)
-
-          result.select(&method(v4?(result) ? :v4_filter : :v3_filter)).map do |row|
-            { type: :uniqueness, label: label(result, row), properties: properties(row) }
+        session do |session|
+          session.read_transaction do |tx|
+            tx.run('CALL db.indexes()')
+                     .select(&method(v4?(tx.run('CALL db.indexes()')) ? :v4_filter : :v3_filter)).map do |row|
+              { type: :uniqueness, label: label(tx.run('CALL db.indexes()'), row), properties: properties(row) }
+            end
           end
         end
       end

data/lib/active_graph/migrations/base.rb

@@ -57,9 +57,12 @@ module ActiveGraph
       end
 
       def handle_migration_error!(e)
-        fail e unless e.message =~ /Cannot perform data updates in a transaction that has performed schema updates./
-        fail MigrationError,
-             "#{e.message}. Please add `disable_transactions!` in your migration file."
+        if e.is_a?(Neo4j::Driver::Exceptions::ClientException) &&
+          e.code == 'Neo.ClientError.Transaction.ForbiddenDueToTransactionType'
+          fail MigrationError, "#{e.message}. Please add `disable_transactions!` in your migration file."
+        else
+          fail e
+        end
       end
 
       def migration_transaction(&block)

data/lib/active_graph/tasks/migration.rake

@@ -63,50 +63,38 @@ namespace :neo4j do
 
 COMMENT
 
-    def check_neo4j_version_3
-      if ActiveGraph::Base.version > '3.0.0'
-        yield
-      else
-        puts 'WARNING: This task does not work for versions of Neo4j before 3.0.0'
-      end
-    end
-
     desc 'Creates a db/neo4j/schema.yml file which represents the indexes / constraints in the Neo4j DB'
     task dump: :environment do
-      check_neo4j_version_3 do
-        require 'active_graph/migrations/schema'
+      require 'active_graph/migrations/schema'
 
-        schema_data = ActiveGraph::Migrations::Schema.fetch_schema_data
+      schema_data = ActiveGraph::Migrations::Schema.fetch_schema_data
 
-        runner = ActiveGraph::Migrations::Runner.new
-        schema_data[:versions] = runner.complete_migration_versions.sort
+      runner = ActiveGraph::Migrations::Runner.new
+      schema_data[:versions] = runner.complete_migration_versions.sort
 
-        FileUtils.mkdir_p(File.dirname(SCHEMA_YAML_PATH))
-        File.open(SCHEMA_YAML_PATH, 'w') { |file| file << SCHEMA_YAML_COMMENT + schema_data.to_yaml }
+      FileUtils.mkdir_p(File.dirname(SCHEMA_YAML_PATH))
+      File.open(SCHEMA_YAML_PATH, 'w') { |file| file << SCHEMA_YAML_COMMENT + schema_data.to_yaml }
 
-        puts "Dumped updated schema file to #{SCHEMA_YAML_PATH}"
-      end
+      puts "Dumped updated schema file to #{SCHEMA_YAML_PATH}"
     end
 
     desc "Loads a db/neo4j/schema.yml file into the database\nOptionally removes schema elements which aren't in the schema.yml file (defaults to false)"
     task :load, [:remove_missing] => :environment do |_t, args|
-      check_neo4j_version_3 do
-        require 'active_graph/migrations/schema'
+      require 'active_graph/migrations/schema'
 
-        args.with_defaults(remove_missing: false)
+      args.with_defaults(remove_missing: false)
 
-        schema_data = YAML.safe_load(File.read(SCHEMA_YAML_PATH), [Symbol])
+      schema_data = YAML.safe_load(File.read(SCHEMA_YAML_PATH), [Symbol])
 
-        ActiveGraph::Base.subscribe_to_query(&method(:puts))
+      ActiveGraph::Base.subscribe_to_query(&method(:puts))
 
-        ActiveGraph::Base.transaction do
-          ActiveGraph::Migrations::Schema.synchronize_schema_data(schema_data, args[:remove_missing])
-        end
+      ActiveGraph::Base.transaction do
+        ActiveGraph::Migrations::Schema.synchronize_schema_data(schema_data, args[:remove_missing])
+      end
 
-        ActiveGraph::Base.transaction do
-          runner = ActiveGraph::Migrations::Runner.new
-          runner.mark_versions_as_complete(schema_data[:versions]) # Run in test mode?
-        end
+      ActiveGraph::Base.transaction do
+        runner = ActiveGraph::Migrations::Runner.new
+        runner.mark_versions_as_complete(schema_data[:versions]) # Run in test mode?
       end
     end
   end

data/lib/active_graph/transactions.rb

@@ -5,7 +5,7 @@ module ActiveGraph
     extend ActiveSupport::Concern
 
     included do
-      thread_mattr_accessor :explicit_session, :tx
+      thread_mattr_accessor :explicit_session, :tx, :last_bookmark
     end
 
     class_methods do
@@ -13,7 +13,8 @@ module ActiveGraph
         ActiveGraph::Base.driver.session(**session_config) do |session|
           self.explicit_session = session
           yield session
-          session.last_bookmark
+        ensure
+          self.last_bookmark = session.last_bookmark
         end
       end
 

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '11.0.0.beta.1'
+  VERSION = '11.0.0.beta.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 11.0.0.beta.1
+  version: 11.0.0.beta.2
 platform: java
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-16 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta.1
+        version: 4.1.0.beta.2
   name: neo4j-java-driver
   type: :runtime
   prerelease: false
@@ -79,7 +79,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta.1
+        version: 4.1.0.beta.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: