nexus_seed 0.2.20 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 036bc1fce3d2c07ca3c31e92fdcd20b6905e5ffd5bc29993236b3dcbbded5071
-  data.tar.gz: aa42cc60f7e2e19e88897a0c5ffc185f7d1c094308039946dedab5f9e88113fe
+  metadata.gz: 3fe2b060a2b53d791dca15ad60703e1c27806de473696ee8e8188fbe922ffcc1
+  data.tar.gz: 03e128238d5ad9e251e7ba4e1144f01d1c0e03643b0f40796695411258b3194c
 SHA512:
-  metadata.gz: bf765a0ee96662b85a0dbdf3d600a7935151cf1cde47adba7138a8b3b41dece0cf6b13284b18a9d39db5766038e6d50090ef3758f8b18c7c2bea61e3d42cc2c5
-  data.tar.gz: 15025c9157a7342da084057b0699dae0a579c8414c5b674dacd9df6e45cbf26235c3ed945081b9e618709df0b24550e171a441d26fbfdb059b632f3ef6cd667c
+  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.20 in order for CI process to replace with the tagged version.
-  VERSION = '0.2.20'
+  # 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexus_seed
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  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