nexus_seed 0.2.19 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc10e398d21ca9cb8f7ba442f40789a7b6aa7974022abf0d1700a103345a1edb
-  data.tar.gz: 3ba08b3837e68ecedd36c9501b027f93fc29c8034f805a83452f6fc802c28567
+  metadata.gz: 3fe2b060a2b53d791dca15ad60703e1c27806de473696ee8e8188fbe922ffcc1
+  data.tar.gz: 03e128238d5ad9e251e7ba4e1144f01d1c0e03643b0f40796695411258b3194c
 SHA512:
-  metadata.gz: 21fc4402557c8b570cba3334644d35672bf826999cb0488a547e4b6a749206adac4ce4b3286b60060a55fe74a94aa5745e28bb9cebd418853bebb063fe1ce12d
-  data.tar.gz: d1a674650a79a54ead3ad69ad06895e23fea420b08e908f9d546724ad01922ad1e00575519710755f8e97d1feb95667d069ab4a7c09cb88f6077b6f4a5775ae0
+  metadata.gz: ce2fbccb73e0ad77c77266ae129be9f7f35b1c484223f83c208e15f7f74ee4d22e8f0e9dca5162df0fbb73b893460c9029e7935a094f7ff11ff99fa1ff6a6ec9
+  data.tar.gz: d4dbb7a83c22a14bbfd15f92e33319bd15ae30d19d744b289a8849239f80def07710cd6431739ac30f6691b5541eb688104ce61bbfad12e459a5c25caaa6e65a

data/lib/nexus_seed/builder.rb

@@ -23,6 +23,19 @@ module NexusSeed
       "NexusSeed::Builders::#{class_name.to_s.camelcase}Builder".constantize.new(options).build(params)
     end
 
+    def self.activerecord_sync_sequences
+      ActiveRecord::Base.connection.tables.each do |table_name|
+        table_seq = ActiveRecord::Base.connection.pk_and_sequence_for(table_name)
+        next unless table_seq
+        seq_id = table_seq[1].identifier
+        seq_value = ActiveRecord::Base.connection.execute("SELECT last_value from #{seq_id}")[0]['last_value']
+        reset_seq_value = ActiveRecord::Base.connection.reset_pk_sequence!(table_name)
+        if reset_seq_value != seq_value
+          logger.info('Reset sequence value.', value: reset_seq_value, sequence: seq_id, table: table_name)
+        end
+      end
+    end
+
     def self.seed_report
       if ENV['NEXUS_SEED_REPORT'] == 'true'
         total = 0

data/lib/nexus_seed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module NexusSeed
-  # Leave this as 0.2.19 in order for CI process to replace with the tagged version.
-  VERSION = '0.2.19'
+  # Leave this as 0.2.21 in order for CI process to replace with the tagged version.
+  VERSION = '0.2.21'
 end

data/lib/nexus_seed.rb

@@ -3,7 +3,6 @@ require 'nexus_seed'
 require 'nexus_seed/builder/base'
 Dir["/app/db/nexus_seed/builders/*.rb"].each { |file| require file }
 require 'nexus_seed/builder'
-require 'nexus_seed/base'
 
 module NexusSeed
   # defaults
@@ -36,8 +35,15 @@ module NexusSeed
 
       logger.info("Starting run attempt #{retries + 1}")
       if _try_requires
-        NexusSeed::Base.transaction do
-          seed
+        # Sync sequences before and after in case any manual ID changes have been made.
+        NexusSeed::Builder.activerecord_sync_sequences
+        seed
+        NexusSeed::Builder.activerecord_sync_sequences
+        NexusSeed::Builder.seed_report
+
+        if ENV['NEXUS_SEED_DESTROY'] == 'true'
+          NexusSeed::Builder.destroy_seeds
+          NexusSeed::Builder.activerecord_sync_sequences
         end
 
       elsif retries >= retry_limit && retry_limit != 0
@@ -46,15 +52,14 @@ module NexusSeed
         abort('Seed task timeout.')
 
       else
-        # sleep and increment retries
-        logger.warn('Requires failed, waiting for retry.', interval: sleep_interval, retries: retries)
-        sleep(sleep_interval)
+        # Increment retries and sleep- note the sleep back off as retries increase.
         self.retries = retries + 1
+        sleep_for = sleep_interval * retries
+        logger.warn('Requires failed, waiting for retry.', sleep: sleep_for, interval: sleep_interval, retries: retries)
+        sleep(sleep_for)
 
-        # log retry attempts
-        logger.warn("Retrying after #{sleep_interval}s. Retry #{retries} of #{retry_limit}")
-
-        # call itself
+        # Retry run after sleeping.
+        logger.warn("Retrying after #{sleep_for}s. Retry #{retries} of #{retry_limit}")
         _run_internal
       end
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexus_seed
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.21
 platform: ruby
 authors:
 - Johnathon Harris
@@ -37,7 +37,6 @@ files:
 - README.md
 - SEED_BUILDER.md
 - lib/nexus_seed.rb
-- lib/nexus_seed/base.rb
 - lib/nexus_seed/builder.rb
 - lib/nexus_seed/builder/base.rb
 - lib/nexus_seed/version.rb

data/lib/nexus_seed/base.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-module NexusSeed
-  class Base < ActiveRecord::Base
-    def self.transaction(**options, &block)
-      # Reset table sequences. Apparently rails loses track of a pk sequence if the pk value is inserted manually, e.g
-      # User.new(id: 1).save. When subsequently running User.create(), ActiveRecord should increment the id value to 2
-      # by default, but turns out it will try to insert id: 1 again which will result in an error.
-      #
-      # @todo This "fix" is not ideal and will require more investigation.
-      ActiveRecord::Base.connection.tables.each do |t|
-        ActiveRecord::Base.connection.reset_pk_sequence!(t)
-      end
-
-      super
-
-      NexusSeed::Builder.seed_report
-
-      if ENV['NEXUS_SEED_DESTROY'] == 'true'
-        NexusSeed::Builder.destroy_seeds
-      end
-    end
-  end
-end