active_record_data_loader 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19d357e3af1a3864a020996df4da4d1d4d710dccd15e50cc10c30f0498acb64b
-  data.tar.gz: 7a706dcaa17777c1fa93090212385fcd18742d84099663d9555e54452c046595
+  metadata.gz: ae90d445d9e578a618a7ff3858edcb00719055716647c6fec0374db385b0b935
+  data.tar.gz: cc51ca7b8093c2b43d5c8610130db5cbbd12811520a57f8cc0b4fe3e114a1eaa
 SHA512:
-  metadata.gz: 6b541ceb75b06c6152184ae4f9d66e6a1268a8a758c23ce959fb608a78a7860c8f17596fd90b5a9bbadf0853c2d2009b8b68304e6f852d4eed2a3e5ddd1b59d1
-  data.tar.gz: 509fce080286cae5770bbe6b42ace34b34f1804c8834114d7c0fbbd2e0323b2c785fde4188de6d7221666fd6489eb8229a76c47fea90cddcd96bf3628260c5e8
+  metadata.gz: be8f649f5b1240b081b20ce713c2da69596d278db2cf19009916dcaeac3e73493745114c6ec662b90b0ff18ad068f0c881fb345ff68cb15c54497cf97a5ec325
+  data.tar.gz: 490223f97f751eedcaad7de58846a01a5ff08a38762f30a9040b6dd65b05b2c2e5ac9fc71683f52ac8986a5c7c7748258904f6b380370813380a7e136581b4df

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change log
 
+## [v1.3.1] - 2021-12-10
+
+[Diff](https://github.com/abeiderman/active_record_data_loader/compare/v1.3.0...v1.3.1)
+
+### Changes:
+* Fix bug with cycling through foreign key IDs when multiple foreign keys are in a unique index/constraint. It was cycling all foreign keys in the same order which meant that if a duplicate row was generated then it will continue to be generated. By shuffling the list of foreign key IDs after each cycle, it gives it a chance at coming up with unique values during retries.
+
 ## [v1.3.0] - 2021-12-10
 
 [Diff](https://github.com/abeiderman/active_record_data_loader/compare/v1.2.0...v1.3.0)
@@ -49,3 +56,4 @@ Initial stable release
 [v1.1.0]: https://github.com/abeiderman/active_record_data_loader/releases/tag/v1.1.0
 [v1.2.0]: https://github.com/abeiderman/active_record_data_loader/releases/tag/v1.2.0
 [v1.3.0]: https://github.com/abeiderman/active_record_data_loader/releases/tag/v1.3.0
+[v1.3.1]: https://github.com/abeiderman/active_record_data_loader/releases/tag/v1.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_record_data_loader (1.3.0)
+    active_record_data_loader (1.3.1)
       activerecord (>= 5.0)
 
 GEM

data/lib/active_record_data_loader/active_record/list.rb

@@ -4,8 +4,8 @@ module ActiveRecordDataLoader
   module ActiveRecord
     class List
       def self.for(enumerable, strategy: :random)
-        if strategy == :cycle
-          Cycle.new(enumerable)
+        if strategy == :random_cycle
+          RandomCycle.new(enumerable)
         else
           Random.new(enumerable)
         end
@@ -21,13 +21,25 @@ module ActiveRecordDataLoader
         end
       end
 
-      class Cycle
+      class RandomCycle
         def initialize(enumerable)
-          @list = enumerable.cycle
+          @enumerable = enumerable
+          @count = enumerable.count
+          reset_list
         end
 
         def next
-          @list.next
+          value = @list.next
+          reset_list if (@index += 1) >= @count
+          value
+        end
+
+        private
+
+        def reset_list
+          @index = 0
+          @enumerable = @enumerable.shuffle
+          @list = @enumerable.cycle
         end
       end
     end

data/lib/active_record_data_loader/active_record/model_data_generator.rb

@@ -133,7 +133,7 @@ module ActiveRecordDataLoader
 
       def column_config_strategy(column)
         if @index_tracker.contained_in_index?(column)
-          :cycle
+          :random_cycle
         else
           :random
         end

data/lib/active_record_data_loader/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordDataLoader
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_data_loader
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Alejandro Beiderman