ruby_event_store-active_record 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0104d3bbcbf407a2c08ab36e92eae47e0b77051ea1e86f88d9d0f3af8a6ad34d
-  data.tar.gz: 0f3f118e8f685735c6f50f1ab2c9d389f539ca3695507192136f4d279c8fec57
+  metadata.gz: bdabc01585e316bdc346af6b70751ff948c9d47e0cc10e08eabb0541f387fc68
+  data.tar.gz: 52a70e45996c0bedf4b7472fafaa1e3b655e126ce7c926ac6f0b0dc5314e55f1
 SHA512:
-  metadata.gz: 042f8d47fe357e87f643a1748f76b675f2ec098a7e105037b998f71e3192d28d801d6f67fd09c4e6902240f7841d882a2aaea58d0570cb87f5fcc9b35458e6c2
-  data.tar.gz: 48bbdf33832cbec83891c5466483e284029042a87b6809913ee5f2c89ae980a5006bf1285ba69c6f25bb8686f820a00542160ff49ca22a478634a5b83127a08b
+  metadata.gz: 82a515a643f3f8bbad68d88e691dc687057e7f66ae7ab4a34567433c169208c47b3fcdf8fb37a8521808600d680386833e28357fa55d850667284d071e7e2a12
+  data.tar.gz: 67c3a32693f03ed905f40ee74b3d31a57b08f12c326cbd5ca9de28e4a062693b76b3d17cd4499093e5d0f3f3f7359a5a3226a95f53306af4945a2a2a6a3e6508

data/lib/ruby_event_store/active_record/event_repository_reader.rb

@@ -163,20 +163,28 @@ module RubyEventStore
         )
       end
 
+      def time_comparison_field(specification)
+        if specification.time_sort_by_as_of?
+          "COALESCE(#{@event_klass.table_name}.valid_at, #{@event_klass.table_name}.created_at)"
+        else
+          "#{@event_klass.table_name}.created_at"
+        end
+      end
+
       def older_than_condition(specification)
-        ["#{@event_klass.table_name}.created_at < ?", specification.older_than]
+        ["#{time_comparison_field(specification)} < ?", specification.older_than]
       end
 
       def older_than_or_equal_condition(specification)
-        ["#{@event_klass.table_name}.created_at <= ?", specification.older_than_or_equal]
+        ["#{time_comparison_field(specification)} <= ?", specification.older_than_or_equal]
       end
 
       def newer_than_condition(specification)
-        ["#{@event_klass.table_name}.created_at > ?", specification.newer_than]
+        ["#{time_comparison_field(specification)} > ?", specification.newer_than]
       end
 
       def newer_than_or_equal_condition(specification)
-        ["#{@event_klass.table_name}.created_at >= ?", specification.newer_than_or_equal]
+        ["#{time_comparison_field(specification)} >= ?", specification.newer_than_or_equal]
       end
 
       def order(spec)

data/lib/ruby_event_store/active_record/version.rb

@@ -2,6 +2,6 @@
 
 module RubyEventStore
   module ActiveRecord
-    VERSION = "2.8.0"
+    VERSION = "2.8.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-active_record
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Arkency
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-13 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement