composite_primary_keys 10.0.4 → 10.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89c1bd9183cbf26dfed31a862493f5760bd3e1892f3c8b39bed62b2605d4b241
-  data.tar.gz: 0c2e627e3e9b7b9fc27410967f400496c2fc5cc90c81c20528374ee4024033ea
+  metadata.gz: f506d34f44d88354550c10d7b79f38c206dfa739c9c903e59c888252db3ae9ed
+  data.tar.gz: 06e5788af10e07e0dbe785338aa35c8cce99df310a7e43d3605b1cefb0eaa0ac
 SHA512:
-  metadata.gz: d1c56f5c4ce9c03c604d3d8b3df31ea4c8d652cd310d15af11ed3cd6d72c9b44c9fcb12065ba0ba225ddd918fa9655d75bb1e5fabf5b4923de2a0c8535ecca3e
-  data.tar.gz: ad9c9d9a3b5df644fa5accc5b2cb9db0465b9254a26912f4cc66ba76a0e44666df1c47cc00a87b891fbdfce1f8bbc516ba05043f3d59fb1e51f82a37e527ef21
+  metadata.gz: 83ec3b8f8f42e7a5c92f11c60cb86fdb8fd4bdc9e6a58f1f3305ffb5c9b6af9b2abaabcaa43eeaa2e40e19cddab4cad5d7e5501905643e7b4fad0749525ac0b7
+  data.tar.gz: d1a8bad2cdea8ff1eab3ba7d5c456d68f008583b26b6000a930f58d319842aa6b2a24e66d7d509bd531cce4852f062797b96e53c0f929ed8aa0c6a19d40621c2

data/History.rdoc

@@ -1,3 +1,6 @@
+== 10.0.5 (2018-06-24)
+* Fix in_batches (Urmo Rae)
+
 == 10.0.4 (2018-06-17)
 
 * Lock mysql2 gem to 0.4.x (Le Trung Kien)
@@ -25,6 +28,10 @@
 * Fix typo in Readme (Mike Gunderloy)
 * Improved sql server support (Artyom Nikolaev)
 
+== 9.0.10 (2018-06-24)
+
+* Fix AR 5.0.7 (Jordan Owens)
+
 == 9.0.8 (2017-10-11)
 
 * Fix Paper Trail compatibility (Sean Linsley)

data/lib/composite_primary_keys/relation/batches.rb

@@ -7,11 +7,17 @@ module CompositePrimaryKeys
           return BatchEnumerator.new(of: of, start: start, finish: finish, relation: self)
         end
 
-        if arel.orders.present? || arel.taken.present?
-          act_on_order_or_limit_ignored(error_on_ignore)
+        if arel.orders.present?
+          act_on_ignored_order(error_on_ignore)
         end
 
-        relation = relation.reorder(batch_order).limit(of)
+        batch_limit = of
+        if limit_value
+          remaining   = limit_value
+          batch_limit = remaining if remaining < batch_limit
+        end
+
+        relation = relation.reorder(batch_order).limit(batch_limit)
         relation = apply_limits(relation, start, finish)
         batch_relation = relation
 
@@ -39,9 +45,22 @@ module CompositePrimaryKeys
 
           yield yielded_relation
 
-          break if ids.length < of
+          break if ids.length < batch_limit
+
+          if limit_value
+            remaining -= ids.length
+
+            if remaining == 0
+              # Saves a useless iteration when the limit is a multiple of the
+              # batch size.
+              break
+            elsif remaining < batch_limit
+              relation = relation.limit(remaining)
+            end
+          end
+
           # CPK
-          # batch_relation = relation.where(arel_attribute(primary_key).gt(primary_key_offset))
+          batch_relation = relation.where(arel_attribute(primary_key).gt(primary_key_offset))
           batch_relation = if composite?
             # CPK
             # Lexicographically select records

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 10
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 10.0.4
+  version: 10.0.5
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-17 00:00:00.000000000 Z
+date: 2018-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord