activegraph 10.1.1 → 10.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65cca8a21c8ecb9dff1f8fdf38ab82bcbc02fb211bc29a1b50f947e1d4126b9f
-  data.tar.gz: c64ebb3dff76ec6b66eebe3499aef2fb15a1db56cf786e2da250e0ace1e6bcb8
+  metadata.gz: c01920a2ca46982b8de50984fbd0a07210ef483a4b933f0de9f4b9c3caa9bb1e
+  data.tar.gz: 1a3c0f858a7653a1a30497b5df0ef552a297efb66d6f5ff56ec545a81b666be1
 SHA512:
-  metadata.gz: 898089b35cfcf2d101103ada41f27c1884cb00d9169b802526d4573af60cc577a8ddbb3ca71be96d9e54202a95a7a560448b6b27bdd57ff964b6d9e0b4f8b2e5
-  data.tar.gz: 3c3f46755b637e4cdc663f450dc5d247720cee609ae14fa00de87c01f9c9fe09a96d6e9a2bf9b3967f56460444946b35654061ef4cd24e36d9a7acadd20d7f89
+  metadata.gz: e63aa9728efe64bb40bd0b650d6485af7ee9e814b951ee30d6862ef2821556891d8d95cb9d637711a35f18e5d98347b8913c1d42f51c93d4ee694fee873f440e
+  data.tar.gz: 1632af7ded55530fa57b22754a0a156aa3662f61c8cbd962e87753971bf11bf6fdf345d897b80b7537bb61705c5cf5e69f50afc41b48b5c7c64ff4ebe3590f9a

data/lib/active_graph/core/schema.rb

@@ -2,28 +2,32 @@ module ActiveGraph
   module Core
     module Schema
       def version
-        result = query('CALL dbms.components()', {}, skip_instrumentation: true)
-
         # BTW: community / enterprise could be retrieved via `result.first.edition`
-        result.first[:versions][0]
+        query('CALL dbms.components()', {}, skip_instrumentation: true).first[:versions][0]
       end
 
       def indexes
-        result = query('CALL db.indexes()', {}, skip_instrumentation: true)
-
-        result.map do |row|
-          { type: row[:type].to_sym, label: label(result, row), properties: properties(row), state: row[:state].to_sym }
+        raw_indexes do |keys, result|
+          result.map do |row|
+            { type: row[:type].to_sym, label: label(keys, row), properties: properties(row),
+              state: row[:state].to_sym }
+          end
         end
       end
 
       def constraints
-        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) }
+        raw_indexes do |keys, result|
+          result.select(&method(v4?(keys) ? :v4_filter : :v3_filter)).map do |row|
+            { type: :uniqueness, label: label(keys, row), properties: properties(row) }
+          end
         end
       end
 
+      def raw_indexes
+        result = query('CALL db.indexes()', {}, skip_instrumentation: true)
+        yield result.keys, result.reject { |row| row[:type] == 'LOOKUP' }
+      end
+
       private
 
       def v4_filter(row)
@@ -34,22 +38,22 @@ module ActiveGraph
         row[:type] == 'node_unique_property'
       end
 
-      def label(result, row)
-        if v34?(result)
+      def label(keys, row)
+        if v34?(keys)
           row[:label]
         else
-          (v4?(result) ? row[:labelsOrTypes] : row[:tokenNames]).first
+          (v4?(keys) ? row[:labelsOrTypes] : row[:tokenNames]).first
         end.to_sym
       end
 
-      def v4?(result)
+      def v4?(keys)
         return @v4 unless @v4.nil?
-        @v4 = result.keys.include?(:labelsOrTypes)
+        @v4 = keys.include?(:labelsOrTypes)
       end
 
-      def v34?(result)
+      def v34?(keys)
         return @v34 unless @v34.nil?
-        @v34 = result.keys.include?(:label)
+        @v34 = keys.include?(:label)
       end
 
       def properties(row)

data/lib/active_graph/migrations/base.rb

@@ -57,9 +57,13 @@ 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' ||
+          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."
+        else
+          fail e
+        end
       end
 
       def migration_transaction(&block)

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '10.1.1'
+  VERSION = '10.2.0.beta.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 10.1.1
+  version: 10.2.0.beta.1
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -439,11 +439,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A graph database for Ruby