neo4j 8.0.0.alpha.4 → 8.0.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd2973cc137423aab039e28ea9e4408447277665
-  data.tar.gz: 3d62800551e950fbdaadf39c6893f88371247d56
+  metadata.gz: 35366c5049bd09b2d9172d7f174576aacb39b3ab
+  data.tar.gz: 3e19875b85dcc4de4a7f5f1a21d9351db2a66c03
 SHA512:
-  metadata.gz: ab42853f116ac28744c2d1fba3e7753a4361c677269615e4ee54b5c828e8106220106ba951bffec8a0b13d27962c046f837c0ee68fbb097b3044ec2b07cdcf5b
-  data.tar.gz: ae0c2386e659388839510a7c9f573a922c18772455726b3ce53218f9596850b68f5fe89f183d60447a7281e0daa1b018bfbf9be6db24cf18ca7f33d082f68ff0
+  metadata.gz: 48be8c4082aa6603f6a5a09ecfd6173707f90fe228e1f7e2dd1fedd95de7e00b557a8287b4d5c375e3d1f25b745b7997c7132c919056e913fdff27ac81126596
+  data.tar.gz: d92edef01fa0175833fc0849ae67416681abd01483131100437973860453037fe0991b361d98bc22e1e9d72426cdf658f8f8d839887583df0118782b108dda00

data/lib/neo4j/active_base.rb

@@ -34,12 +34,12 @@ module Neo4j
       end
 
       def new_transaction
-        Neo4j::ModelSchema.validate_model_schema!
+        validate_model_schema!
         Neo4j::Transaction.new(current_session)
       end
 
       def new_query(options = {})
-        Neo4j::ModelSchema.validate_model_schema!
+        validate_model_schema!
         Neo4j::Core::Query.new({session: current_session}.merge(options))
       end
 
@@ -52,7 +52,7 @@ module Neo4j
       end
 
       def current_transaction
-        Neo4j::ModelSchema.validate_model_schema!
+        validate_model_schema!
         Neo4j::Transaction.current_for(current_session)
       end
 
@@ -63,6 +63,12 @@ module Neo4j
       def logger
         @logger ||= (Neo4j::Config[:logger] || ActiveSupport::Logger.new(STDOUT))
       end
+
+      private
+
+      def validate_model_schema!
+        Neo4j::ModelSchema.validate_model_schema! unless Neo4j::Migrations.currently_running_migrations
+      end
     end
   end
 end

data/lib/neo4j/migrations.rb

@@ -7,13 +7,17 @@ module Neo4j
     autoload :Runner
     autoload :SchemaMigration
 
-    def self.check_for_pending_migrations!
-      runner = Neo4j::Migrations::Runner.new
-      fail ::Neo4j::PendingMigrationError if runner.pending_migrations?
-    end
+    class << self
+      def check_for_pending_migrations!
+        runner = Neo4j::Migrations::Runner.new
+        fail ::Neo4j::PendingMigrationError if runner.pending_migrations?
+      end
+
+      attr_accessor :currently_running_migrations
 
-    def self.maintain_test_schema!
-      Neo4j::Migrations::Runner.new(silenced: true).all
+      def maintain_test_schema!
+        Neo4j::Migrations::Runner.new(silenced: true).all
+      end
     end
   end
 end

data/lib/neo4j/railtie.rb

@@ -54,7 +54,9 @@ module Neo4j
       session_types = cfg.sessions.map { |session_opts| session_opts[:type] }
 
       register_neo4j_cypher_logging(session_types)
-      Neo4j::Migrations.check_for_pending_migrations! if Rails.env.development? && Neo4j::Config.fail_on_pending_migrations
+      if Rails.env.development? && !Neo4j::Migrations.currently_running_migrations && Neo4j::Config.fail_on_pending_migrations
+        Neo4j::Migrations.check_for_pending_migrations!
+      end
     end
 
     TYPE_SUBSCRIBERS = {

data/lib/neo4j/tasks/migration.rake

@@ -10,6 +10,10 @@ unless Rake::Task.task_defined?('environment')
 end
 
 namespace :neo4j do
+  task :allow_migrations do
+    Neo4j::Migrations.currently_running_migrations = true
+  end
+
   desc 'Run a script against the database to perform system-wide changes'
   task :legacy_migrate, [:task_name, :subtask] => :environment do |_, args|
     path = Rake.original_dir
@@ -32,46 +36,46 @@ namespace :neo4j do
   end
 
   desc 'A shortcut for neo4j::migrate::all'
-  task migrate: :environment do
+  task :migrate do
     Rake::Task['neo4j:migrate:all'].invoke
   end
 
   namespace :migrate do
     desc 'Run all pending migrations'
-    task all: :environment do
+    task all: [:allow_migrations, :environment] do
       runner = Neo4j::Migrations::Runner.new
       runner.all
     end
 
     desc 'Run a migration given its VERSION'
-    task up: :environment do
+    task up: [:allow_migrations, :environment] do
       version = ENV['VERSION'] || fail(ArgumentError, 'VERSION is required')
       runner = Neo4j::Migrations::Runner.new
       runner.up version
     end
 
     desc 'Revert a migration given its VERSION'
-    task down: :environment do
+    task down: [:allow_migrations, :environment] do
       version = ENV['VERSION'] || fail(ArgumentError, 'VERSION is required')
       runner = Neo4j::Migrations::Runner.new
       runner.down version
     end
 
     desc 'Print a report of migrations status'
-    task status: :environment do
+    task status: [:allow_migrations, :environment] do
       runner = Neo4j::Migrations::Runner.new
       runner.status
     end
 
     desc 'Resolve an incomplete version state'
-    task resolve: :environment do
+    task resolve: [:allow_migrations, :environment] do
       version = ENV['VERSION'] || fail(ArgumentError, 'VERSION is required')
       runner = Neo4j::Migrations::Runner.new
       runner.resolve version
     end
 
     desc 'Resolve an incomplete version state'
-    task reset: :environment do
+    task reset: [:allow_migrations, :environment] do
       version = ENV['VERSION'] || fail(ArgumentError, 'VERSION is required')
       runner = Neo4j::Migrations::Runner.new
       runner.reset version
@@ -79,7 +83,7 @@ namespace :neo4j do
   end
 
   desc 'Rollbacks migrations given a STEP number'
-  task :rollback, :environment do
+  task :rollback, [:allow_migrations, :environment] do
     steps = (ENV['STEP'] || 1).to_i
     runner = Neo4j::Migrations::Runner.new
     runner.rollback(steps)
@@ -96,7 +100,7 @@ namespace :neo4j do
     fail 'Label must be specified' if label.blank?
     fail 'Property name must be specified' if property_name.blank?
 
-    migration_class_name = "ForceCreate#{label.camelize}#{property_name.camelize}#{index_or_constraint.capitalize}"
+    migration_class_name = "ForceCreate#{label.camelize}#{property_name.camelize}#{index_or_constraint.capitalize}".gsub('::', '')
 
     require 'fileutils'
     FileUtils.mkdir_p('db/neo4j/migrate')

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '8.0.0.alpha.4'
+  VERSION = '8.0.0.alpha.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 8.0.0.alpha.4
+  version: 8.0.0.alpha.5
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg