sequel-seek-pagination 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f9206a9a384b1cdf9e934dc6e414c7e31a7572b
-  data.tar.gz: e717fb468e5a8224e5c7cd48e1b40b91bffb318f
+  metadata.gz: e681598557874a5b7102fd630deef04e48dd08ec
+  data.tar.gz: 176755ad95e8e78978dac323661a9b9f55762a0d
 SHA512:
-  metadata.gz: e358d7edefd328fa41a0378f52f25c4c3e05b98b0da49a74742241a2f487ef8eb383dd615f67c678a4b8ed54c11e4d6e917baa3560a6787ac7d4cd835430c16d
-  data.tar.gz: 96b6e87a78cd4c93113d385f53ec37062f56fc031e1e563ca6f0b0fd67b4c95e1432a35f3dd4bc49b272470091179dc428c17b76b8b11da37e072e05e5275f22
+  metadata.gz: 4581a836e385d1f061b984fbc14a94d7225d3010d67efb8b1e169f76ff80445044ec1d727bfe28c38761272e68629b1023cea8f683bf87be9c86d42c1bcca124
+  data.tar.gz: 7c191afc86655d078da0d2c49b2aab2b6bbb42f21af9558c3ada83a8053ad45f60e3c4e39a2eeb8f251f4e0b9c952b1aacc01fc66c701fb0e7afbcf2de91dc5a

data/lib/sequel/extensions/seek_pagination/version.rb

@@ -1,5 +1,5 @@
 module Sequel
   module SeekPagination
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/lib/sequel/extensions/seek_pagination.rb

@@ -26,16 +26,21 @@ module Sequel
           raise Error, "passed the wrong number of values in the :#{from ? 'from' : 'after'} option to seek_paginate"
         end
       elsif pk = from_pk || after_pk
-        # Need to load the values to order from for that pk from the DB, so we
-        # need to fetch the actual expressions being ordered by.
-        expressions = order.map { |o| Sequel::SQL::OrderedExpression === o ? o.expression : o }
+        target_ds = where(model.qualified_primary_key_hash(pk))
 
+        # Need to load the values to order from for that pk from the DB, so we
+        # need to fetch the actual expressions being ordered by. Also,
         # Dataset#get won't like it if we pass it expressions that aren't
-        # simple columns, so give it aliases for everything.
+        # simple columns, so we need to give it aliases for everything.
         al = :a
-        gettable = expressions.map.with_index{|s,i| Sequel.as(s, (al = al.next))}
+        gettable = order.map do |o, i|
+          expression = Sequel::SQL::OrderedExpression === o ? o.expression : o
+          Sequel.as(expression, (al = al.next))
+        end
 
-        values = where(model.qualified_primary_key_hash(pk)).get(gettable)
+        unless values = target_ds.get(gettable)
+          raise NoMatchingRow.new(target_ds)
+        end
       end
 
       if values

data/spec/seek_pagination_spec.rb

@@ -211,5 +211,10 @@ class SeekPaginationSpec < Minitest::Spec
       assert_equal %(SELECT * FROM "seek" WHERE (("not_nullable_1", "not_nullable_2", "id") > (1, 2, 3)) ORDER BY "not_nullable_1", "not_nullable_2", "id" LIMIT 5),
         SeekModel.order(:not_nullable_1, :not_nullable_2, :id).seek_paginate(5, after: [1, 2, 3]).sql
     end
+
+    it "should raise an error when passed a pk for a record that doesn't exist in the dataset" do
+      assert_raises(Sequel::NoMatchingRow) { SeekModel.order(:id).seek_paginate(5, after_pk: -45) }
+      assert_raises(Sequel::NoMatchingRow) { SeekModel.order(:id).seek_paginate(5, from_pk:  -45) }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-seek-pagination
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Hanks