where_row 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49b6375ef1230fc451f156e3ce4565f991902c00bc27393de9ca30ba272d51b5
-  data.tar.gz: 2b7c1a66897049cd5cc3128cabea0e6b7233f1d21f580a67e7e7642ecb63294b
+  metadata.gz: 563fa38bd6eacdc602cd365f11985ccfa9ea91d7c2f9720227a75a67e9b082d2
+  data.tar.gz: 6dcc2112211fb876d80b5c7451d8f6cf2ebf44b17f7afbc8491cfb92f9d4e70c
 SHA512:
-  metadata.gz: 944cb66569e749996721e649035fe7477a13f40321c82d330672e0006e22846edab4c17ca8cf97cf5f7ac0fac4aed5b68912226dc0a7f1daea1a5e28407f4200
-  data.tar.gz: 188cafecec296cbebde2f32f1c5eeadc06b90ab5e1bd0e220f14dda0db039b0d5fa0f659751f81d06ce729665fb1f910f591831b6adc8b59f75a071e526bad6c
+  metadata.gz: 3e1e3f1a9b1a33143aa7aef4cd68c5d3fbe8681261ded57398f938f4217d63e8089ff3b0dd7dba849da920add74cc184112c3809d6ae3d4bb679c9beac7cf1e3
+  data.tar.gz: 8f634e35ebdfb1e74d2762a93f63165b4c09a6d4d5679c2d38364dd02cbd6be398ba41f3095468135decb3d39e7684972419a6672655b9d546cab27d1748b448

data/README.md

@@ -6,47 +6,48 @@ Sometimes, the classic offset method to paginate results can be very inneficient
 
 Consider the following example, as it appears on [Use The Index Luke](https://use-the-index-luke.com/sql/partial-results/fetch-next-page)
 
+Suppose we want to have an infinite scrolling functionality for a collection of sales, ordered by the date the sale took place. Ordering just by sale_date will not suffice, since many sales can occur on the same date. Hence, we need to order by both the date and the id, to have a deterministic order. In SQL, this would look like this:
+
 ```SQL
 CREATE INDEX sl_dtid ON sales (sale_date, sale_id)
 
 SELECT *
   FROM sales
- WHERE (sale_date, sale_id) < (?, ?)
- ORDER BY sale_date DESC, sale_id DESC
- FETCH FIRST 10 ROWS ONLY
+WHERE (sale_date, sale_id) < (?, ?)
+ORDER BY sale_date DESC, sale_id DESC
+FETCH FIRST 10 ROWS ONLY
 ```
 
-The Row Value syntax is straigth not supported in Rails in any way. Furthermore, some databases still don't support this syntax as well, or
-maybe there is partial support (for example, the index is not properly utilized).
+The Row Value syntax is not supported in Rails directly. Furthermore, some databases still don't support this syntax as well, or maybe there is partial support (for example, the index is not properly utilized).
 
 Thankfully, the same results can be achieved with plain-old logical expressions and comparisons. The equivalent query would look like this:
 
 ```SQL
- SELECT *
+SELECT *
   FROM sales
- WHERE sale_date <= ?
- AND NOT (sale_date = ? AND sale_id >= ?)
- ORDER BY sale_date DESC, sale_id DESC
- FETCH FIRST 10 ROWS ONLY
+WHERE sale_date <= ?
+AND NOT (sale_date = ? AND sale_id >= ?)
+ORDER BY sale_date DESC, sale_id DESC
+FETCH FIRST 10 ROWS ONLY
 ```
 
-This is something that can be directly expressed in Rails/ One possible way is the following:
+This is something that can be directly expressed in Rails. One possible way is the following:
 
 ```ruby
-    Sales.
-        where(sale_date: (..date_offset)).
-        where.not(sale_date: date_offset, sale_id: (sale_id_offset..)).
-        order(sale_date: :desc, sale_id: :desc).
-        limit(10)
+Sales.
+  where(sale_date: (..date_offset)).
+  where.not(sale_date: date_offset, sale_id: (sale_id_offset..)).
+  order(sale_date: :desc, sale_id: :desc).
+  limit(10)
 ```
 
-However, the intent of this query is not clear at all when reading through this piece of code. Furthermore, if for any reason we need more than two columns, this will blow up pretty quickly. This gem allows us to generate this query/relation with a more explicit syntax.
+However, the intent of this query is not clear at all when reading through this piece of code. Furthermore, if for any reason we need more than two columns (maybe by the sale's client_id), this will blow up pretty quickly. This gem allows us to generate this query/relation with a more explicit syntax.
 
 ```ruby
-    Sales.
-        where_row(:sale_date, :sale_id).lt(date_offset, sale_id_offset).
-        order(sale_date: :desc, sale_id: :desc).
-        limit(10)
+Sales.
+  where_row(:sale_date, :sale_id).lt(date_offset, sale_id_offset).
+  order(sale_date: :desc, sale_id: :desc).
+  limit(10)
 ```
 
 ## Installation

data/lib/where_row/query_builder.rb

@@ -84,19 +84,22 @@ module WhereRow
 
     def build_comparison_predicate
       last_idx = keys.size - 1
-      reversed_op = REVERSE_OP_MAP[operator]
-      last_pred = build_predicate_for_key(relation, last_idx, reversed_op)
 
-      return last_pred if last_idx.zero?
+      if last_idx.zero?
+        return build_predicate(relation, keys[last_idx], values[last_idx], operator)
+      end
+
+      last_pred = build_predicate_for_key(relation, last_idx, operator)
 
-      first_keys_op = :lt if reversed_op == :lteq
-      first_keys_op = :gt if reversed_op == :gteq
-      first_keys_op ||= reversed_op
+      first_keys_op = :lt if operator == :lteq
+      first_keys_op = :gt if operator == :gteq
+      first_keys_op ||= operator
 
       (0...last_idx).
         map { |i| build_predicate_for_key(relation, i, first_keys_op) }.
         reduce(:and).
-        and(last_pred)
+        and(last_pred).
+        not
     end
 
     def build_predicate_for_key(relation, idx, op)

data/lib/where_row/version.rb

@@ -1,3 +1,3 @@
 module WhereRow
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_row
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Odysseas Doumas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-03 00:00:00.000000000 Z
+date: 2023-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord