activerecord-bitemporal 7.0.0 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9644dc51d17a2d86e13daa5982fab733cdab79fd1fda78fbe408412a90ccd337
-  data.tar.gz: f535c500ce4f4f738e6c09102d89a449476407956460c1e5b80d211adb4b66c9
+  metadata.gz: d9808dd4b2762d30fff3034bdfb311d3a01980806785d68cff6b9552d7bd2925
+  data.tar.gz: 9e7031bd39bd9e0841b029ec0540a77b06d2f6bcc54b2e6c992155191e06c326
 SHA512:
-  metadata.gz: d0f7ac0703dd57cd8a837f24adc5c0598cbb5b083a20266c20bd35ae4014a28ee6488ed48e3b30119f01b78c40c063deb7bcbe0f8c61280ef6b7a6bc60d5b3eb
-  data.tar.gz: ad4faf9f2c337bcdcefd8f18a1dadaa191c327a82a5e7391d7b15f06b15bfeff631115466da7fb690062b35cf5174bf8ad991dd3041800abf6063c840bd241ac
+  metadata.gz: 961e34ee22fce1303baed4c54822e33f43f49c6203108d6d03c562fed2baf3e1cede22fc6d5c0e7994cb538c9fa26d949356b31440f96dfb10459651d3211819
+  data.tar.gz: 73315ea3d3bdc29541cfdadb65b1530f1d2d1036704c5f110a2cedf7da7d7349cb2690b33dfeb5411437fb360be7aea13111765430d3f66e47dd078f376c5672

data/CHANGELOG.md

@@ -16,6 +16,61 @@
 
 ### Chores
 
+## 7.0.2
+
+### Breaking Changes
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+- [Fix Relation#load to return self instead of an Array #267](https://github.com/kufu/activerecord-bitemporal/pull/267)
+
+### Chores
+
+- [Bump actions/checkout from 6.0.3 to 7.0.0 #266](https://github.com/kufu/activerecord-bitemporal/pull/266)
+- [Bump ruby/setup-ruby from 1.313.0 to 1.314.0 #265](https://github.com/kufu/activerecord-bitemporal/pull/265)
+- [Bump rubygems/release-gem from 1.3.0 to 1.4.0 #264](https://github.com/kufu/activerecord-bitemporal/pull/264)
+- [Bump ruby/setup-ruby from 1.310.0 to 1.313.0 #263](https://github.com/kufu/activerecord-bitemporal/pull/263)
+- [Bump rubygems/release-gem from 1.2.0 to 1.3.0 #262](https://github.com/kufu/activerecord-bitemporal/pull/262)
+- [Bump actions/checkout from 6.0.2 to 6.0.3 #261](https://github.com/kufu/activerecord-bitemporal/pull/261)
+- [Bump ruby/setup-ruby from 1.308.0 to 1.310.0 #260](https://github.com/kufu/activerecord-bitemporal/pull/260)
+- [Bump ruby/setup-ruby from 1.306.0 to 1.308.0 #259](https://github.com/kufu/activerecord-bitemporal/pull/259)
+- [Increase Dependabot cooldown to 7 days #258](https://github.com/kufu/activerecord-bitemporal/pull/258)
+- [Bump ruby/setup-ruby from 1.305.0 to 1.306.0 #257](https://github.com/kufu/activerecord-bitemporal/pull/257)
+- [Bump ruby/setup-ruby from 1.302.0 to 1.305.0 #256](https://github.com/kufu/activerecord-bitemporal/pull/256)
+- [Bump ruby/setup-ruby from 1.301.0 to 1.302.0 #255](https://github.com/kufu/activerecord-bitemporal/pull/255)
+
+## 7.0.1
+
+### Breaking Changes
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+- [Use bitemporal_id as primary key for Rails 8+ excluding/without #252](https://github.com/kufu/activerecord-bitemporal/pull/252)
+- [Use bitemporal_id as primary key for Rails 8+ AR::Batches #251](https://github.com/kufu/activerecord-bitemporal/pull/251)
+
+### Chores
+
+- [Bump ruby/setup-ruby from 1.299.0 to 1.300.0 #253](https://github.com/kufu/activerecord-bitemporal/pull/253)
+- [Bump rubygems/release-gem from 1.1.2 to 1.2.0 #250](https://github.com/kufu/activerecord-bitemporal/pull/250)
+- [Bump ruby/setup-ruby from 1.295.0 to 1.299.0 #249](https://github.com/kufu/activerecord-bitemporal/pull/249)
+- [Bump ruby/setup-ruby from 1.288.0 to 1.295.0 #248](https://github.com/kufu/activerecord-bitemporal/pull/248)
+
 ## 7.0.0
 
 ### Breaking Changes
@@ -270,9 +325,11 @@
 ## 4.1.0
 
 ### Added
+
 - [add label option #127](https://github.com/kufu/activerecord-bitemporal/pull/127)
 
 ### Changed
+
 - [Support for inverse_of of Rails 6.1 or higher #130](https://github.com/kufu/activerecord-bitemporal/pull/130)
 
 ### Deprecated
@@ -296,13 +353,13 @@
   ```rb
   class Employee < ActiveRecord::Base
     include ActiveRecord::Bitemporal
-  
+
     after_bitemporal_create :log_create
     after_bitemporal_update :log_update
     after_bitemporal_destroy :log_destroy
-  
+
     private
-    
+
     def log_create
       puts "employee created"
     end
@@ -315,7 +372,7 @@
       puts "employee destroyed"
     end
   end
-  
+
   employee = Employee.create!(...) # => "employee created"
   employee.update!(...) # => "employee updated"
   employee.destroy! # => "employee destroyed"
@@ -335,10 +392,10 @@
 
 ### Fixed
 
-
 ## 3.0.0
 
 ### Breaking Changes
+
 - [Assign updated bitemporal times to the receiver after update/destroy](https://github.com/kufu/activerecord-bitemporal/pull/118)
 
 ### Added
@@ -356,6 +413,7 @@
 ### Breaking Changes
 
 ### Added
+
 - [Add `InstanceMethods#swapped_id_previously_was`](https://github.com/kufu/activerecord-bitemporal/pull/114)
 
 ### Changed
@@ -371,6 +429,7 @@
 ### Breaking Changes
 
 ### Added
+
 - [replace postgres docker image](https://github.com/kufu/activerecord-bitemporal/pull/103)
 - [use Matrix Jobs in CircleCI](https://github.com/kufu/activerecord-bitemporal/pull/107)
 - [Add support changing swapped_id, when called #destroy](https://github.com/kufu/activerecord-bitemporal/pull/110)
@@ -388,6 +447,7 @@
 ### Breaking Changes
 
 ### Added
+
 - [Update valid_to after #update](https://github.com/kufu/activerecord-bitemporal/pull/105)
 - [Add GitHub Actions workflow to release to RubyGems.org](https://github.com/kufu/activerecord-bitemporal/pull/104)
 - [migrate Scheduled workflows in CircleCI](https://github.com/kufu/activerecord-bitemporal/pull/106)
@@ -403,11 +463,13 @@
 ## 2.0.0
 
 ### Breaking Changes
+
 - [[Proposal] Changed valid_in to exclude valid_from = to and valid_to = from. by osyo-manga · Pull Request #95](https://github.com/kufu/activerecord-bitemporal/pull/95)
 
 ### Added
 
 ### Changed
+
 - [[Proposal] Add range argument to .valid_allin. by Dooor · Pull Request #98](https://github.com/kufu/activerecord-bitemporal/pull/98)
 
 ### Deprecated
@@ -415,6 +477,7 @@
 ### Removed
 
 ### Fixed
+
 - [Fix JOIN query does not have valid_from / valid_to when using .or. by osyo-manga · Pull Request #99](https://github.com/kufu/activerecord-bitemporal/pull/99)
 - [Fix typo in README.md by Naoya9922 · Pull Request #101](https://github.com/kufu/activerecord-bitemporal/pull/101)
 

data/lib/activerecord-bitemporal/bitemporal.rb

@@ -159,6 +159,19 @@ module ActiveRecord
 
       if ActiveRecord.version >= Gem::Version.new("8.0.0")
         use_bitemporal_id_as_primary_key :ids
+
+        # Ensure that AR::Batches
+        # (https://github.com/rails/rails/blob/v8.0.5/activerecord/lib/active_record/relation/batches.rb)
+        # works with `bitemporal_id` as the primary key in Rails 8+.
+        use_bitemporal_id_as_primary_key :find_each
+        use_bitemporal_id_as_primary_key :find_in_batches
+        use_bitemporal_id_as_primary_key :in_batches
+
+        # Ensure that `#excluding` and `#without`
+        # (https://github.com/rails/rails/blob/v8.0.5/activerecord/lib/active_record/relation/query_methods.rb#L1548-L1591)
+        # work with `bitemporal_id` as the primary key in Rails 8+.
+        use_bitemporal_id_as_primary_key :excluding
+        use_bitemporal_id_as_primary_key :without
       end
 
       def build_arel(*)
@@ -171,9 +184,9 @@ module ActiveRecord
         return super if loaded?
 
         # このタイミングで先読みしているアソシエーションが読み込まれるので時間を固定
-        records = ActiveRecord::Bitemporal.with_bitemporal_option(**bitemporal_option) { super }
+        relation = ActiveRecord::Bitemporal.with_bitemporal_option(**bitemporal_option) { super }
 
-        return records if records.empty?
+        return relation if relation.empty?
 
         valid_datetime_ = valid_datetime
         if ActiveRecord::Bitemporal.valid_datetime.nil? && (bitemporal_value[:with_valid_datetime].nil? || bitemporal_value[:with_valid_datetime] == :default_scope || valid_datetime_.nil?)
@@ -185,12 +198,14 @@ module ActiveRecord
           transaction_datetime_ = nil
         end
 
-        return records if valid_datetime_.nil? && transaction_datetime_.nil?
+        return relation if valid_datetime_.nil? && transaction_datetime_.nil?
 
-        records.each do |record|
+        relation.each do |record|
           record.send(:bitemporal_option_storage)[:valid_datetime] = valid_datetime_ if valid_datetime_
           record.send(:bitemporal_option_storage)[:transaction_datetime] = transaction_datetime_ if transaction_datetime_
         end
+
+        relation
       end
 
       # Use original primary_key for Active Record 8.0+ as much as possible

data/lib/activerecord-bitemporal/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Bitemporal
-    VERSION = "7.0.0"
+    VERSION = "7.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bitemporal
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.2
 platform: ruby
 authors:
 - SmartHR
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.7
+rubygems_version: 4.0.15
 specification_version: 4
 summary: BiTemporal Data Model for ActiveRecord
 test_files: []