sequel-batches 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e24dcc9f437a98a65709c2486c46e6e3ddbeb89a1d3298af245c4d20ae758492
-  data.tar.gz: 5d5670cc31a6afcf7cdee391dc889c9636e9a201fe1f68e01860df2174e462fd
+  metadata.gz: 75f26b2a799694f8ab7c27d9b2e9fdbf12990d92c3c9a5ba2117ec9c7815cb47
+  data.tar.gz: be0eb9ffc65170761b2000c20c2c8e628c8eacc2cfbf1cee7d4fbf54c0134760
 SHA512:
-  metadata.gz: 90f54e68d80fe0872415ab53b4d217c803eaf1d711e083bc518799475c805cd050d2a5605d42603b959fcde28ddfb5ef679344f46bd601677a31ab192bf4b4aa
-  data.tar.gz: a7f69e996cdedfec3b83160b15858fb090c970d2e33516fe53c2e64e1c2c5ed5d198241ea6836352cd1a3f260ebae8667b79bcd4847e6d08e4556c22a996a306
+  metadata.gz: 874d85e620b0d5cbe2a82700deff251edf004bca67a64e89ece8fca769abcbc5f117891d02767f0873634156de7680558cfeceee0abd917f7a762c8f5720c42c
+  data.tar.gz: 39ca7cd7e363ab3fe6d8d04ef7c73f140369f3e0e6a87c8d79605d6c80882c2bcbc0fb625ee8dccc8d297f20d5516c031b126c82cbcc38f3d291474ccbe226be

data/.rubocop.yml

@@ -5,5 +5,5 @@ AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.3
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false

data/README.md

@@ -4,22 +4,6 @@ This dataset extension provides the `#in_batches` method. The method splits data
 
 Note: currently only PostgreSQL database is supported.
 
-You can set the following options:
-
-### pk
-Overrides primary key of your dataset. This option is required in case your table doesn't have a real PK, otherwise you will get `Sequel::Extensions::Batches::MissingPKError`.
-
-Note that you have to provide columns that don't contain NULL values, otherwise this may not work as intended. You will receive `Sequel::Extensions::Batches::NullPKError` in case batch processing detects a NULL value on it's way, but it's not guaranteed since it doesn't check all the rows for performance reasons.
-
-### of
-Sets chunk size (1000 by default).
-
-### start
-A hash `{ [column]: <start_value> }` that represents frame start for batch processing. Note that you will get `Sequel::Extensions::Batches::InvalidPKError` in case you provide a hash with wrong keys (ordering matters as well).
-
-### finish
-Same as `start` but represents the frame end.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -67,6 +51,24 @@ Event.where(type: "login").in_batches(options) do |ds|
 end
 ```
 
+## Options
+
+You can set the following options:
+
+### pk
+Overrides primary key of your dataset. This option is required in case your table doesn't have a real PK, otherwise you will get `Sequel::Extensions::Batches::MissingPKError`.
+
+Note that you have to provide columns that don't contain NULL values, otherwise this may not work as intended. You will receive `Sequel::Extensions::Batches::NullPKError` in case batch processing detects a NULL value on it's way, but it's not guaranteed since it doesn't check all the rows for performance reasons.
+
+### of
+Sets chunk size (1000 by default).
+
+### start
+A hash `{ [column]: <start_value> }` that represents frame start for batch processing. Note that you will get `Sequel::Extensions::Batches::InvalidPKError` in case you provide a hash with wrong keys (ordering matters as well).
+
+### finish
+Same as `start` but represents the frame end.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/umbrellio/sequel-batches.

data/lib/sequel/extensions/batches/yielder.rb

@@ -26,7 +26,8 @@ module Sequel::Extensions::Batches
             base_ds
           end
 
-        current_instance = db.from(working_ds.limit(of)).select(*pk).order(*pk).last or break
+        working_ds_pk = working_ds.select(*qualified_pk).limit(of)
+        current_instance = db.from(working_ds_pk).select(*pk).order(*pk).last or break
         working_ds = working_ds.where(generate_conditions(current_instance.to_h, sign: :<=))
 
         yield working_ds
@@ -67,7 +68,7 @@ module Sequel::Extensions::Batches
       base_ds = base_ds.where(generate_conditions(check_pk(start), sign: :>=)) if start
       base_ds = base_ds.where(generate_conditions(check_pk(finish), sign: :<=)) if finish
 
-      pk_ds = db.from(base_ds).select(*pk).order(*pk)
+      pk_ds = db.from(base_ds.select(*qualified_pk)).select(*pk).order(*pk)
       actual_start = pk_ds.first
       actual_finish = pk_ds.last
 

data/sequel-batches.gemspec

@@ -5,8 +5,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name = "sequel-batches"
-  spec.version = "1.0.0"
-  spec.authors = ["fiscal-cliff", "umbrellio"]
+  spec.version = "1.0.1"
+  spec.authors = %w[fiscal-cliff umbrellio]
   spec.email = ["oss@umbrellio.biz"]
 
   spec.summary = "The extension mimics AR5 batches api"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-batches
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - fiscal-cliff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: The extension mimics AR5 batches api