Batches with bitemporal query test

Author: lukaszreszke

contrib/ruby_event_store-sequel/lib/ruby_event_store/sequel/event_repository.rb

@@ -325,7 +325,7 @@ def read_from_global_stream(specification)
             )
         end
 
-        dataset = dataset.order(:created_at) if specification.time_sort_by_as_at?
+        dataset = dataset.order(::Sequel[:event_store_events][:created_at]) if specification.time_sort_by_as_at?
         dataset = dataset.order(::Sequel.lit(coalesced_date)) if specification.time_sort_by_as_of?
         dataset = dataset.limit(specification.limit) if specification.limit?
         dataset = dataset.order(::Sequel[:event_store_events][:id]) unless specification.time_sort_by
@@ -335,7 +335,7 @@ def read_from_global_stream(specification)
       end
 
       def coalesced_date
-        "COALESCE(event_store_events.valid_at, event_store_events.created_at)"
+        "COALESCE(`event_store_events`.`valid_at`, `event_store_events`.`created_at`)"
       end
 
       def time_comparison_field(specification)

contrib/ruby_event_store-sequel/spec/event_repository_spec.rb

@@ -155,6 +155,39 @@ module Sequel
       end
 
 
+      specify "with batches and bi-temporal queries use offset + limit" do
+        repository.append_to_stream(
+          [
+            SRecord.new(
+              event_id: e1 = SecureRandom.uuid,
+              timestamp: Time.new(2020, 1, 1),
+              valid_at: Time.new(2020, 1, 9)
+            ),
+            SRecord.new(
+              event_id: e2 = SecureRandom.uuid,
+              timestamp: Time.new(2020, 1, 3),
+              valid_at: Time.new(2020, 1, 6)
+            ),
+            SRecord.new(
+              event_id: e3 = SecureRandom.uuid,
+              timestamp: Time.new(2020, 1, 2),
+              valid_at: Time.new(2020, 1, 3)
+            )
+          ],
+          Stream.new("Dummy"),
+          ExpectedVersion.any
+        )
+
+        expect {
+          repository.read(specification.in_batches.as_at.result).to_a
+        }.to match_query(%r{
+          SELECT\s+(.*)\s+FROM\s+.event_store_events.\s+ORDER\s+BY\s+.event_store_events.\..created_at.\s+LIMIT.\d+\sOFFSET.\d+
+}x, 2)
+        expect {
+          repository.read(specification.in_batches.as_of.result).to_a
+        }.to match_query(/SELECT.*FROM .*event_store_events.* ORDER BY COALESCE.*event_store_events.*valid_at.*event_store_events.*created_at.*LIMIT \d+ OFFSET \d+/,
+                         2)
+      end
 
       private