activerecord-bitemporal 4.2.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97a21996b6ff931bf324653432cd481eac86731ee3de16445c98627987683639
-  data.tar.gz: 34178dcfc6e5fe4cbd1f01554499f075d1be90208f05cc2d39a0039941d03607
+  metadata.gz: 25ef613d84eda786e3d04e90aeb9cc95b68887a84863200aa0622be9e89c73ea
+  data.tar.gz: 63920865d4f8f27703b6ffeaf4e0c38d297ea4bff22bf01a3884136875b2ccde
 SHA512:
-  metadata.gz: da5f747f97ec3c16f14b65d592482b23cc8a0d8ba2d1c691dc98df8b5f84d5dfd8c92e8be67362f8b6be38b0bd584c2bfdd97f5169f9e4d91347a7286ad87770
-  data.tar.gz: 2a1b5d95ac36a751943a87adcb9231b81633f61139a6ca38ca3d34859a7e9a2f647ce204b549eda50efca9cc48245d7aff7c21499397d4ef673d1f4c02de84a4
+  metadata.gz: 6fbe2830897e6c3f70f29431f591e8fa9cd332ae260e23ef3c23b7afff7259819bc54b8bb9de38d26c07a96c1cd3e93af5f5b7b559d2814b61b3cabfb3dcb2a6
+  data.tar.gz: 3e45d6a45de435475388a77a534521049b603bddc5910046fc5b8f4c2577ad25e75387f397014374d94b4d3c515c4e4456ff76c4673952f06b497446166a7927

data/.circleci/config.yml

@@ -9,13 +9,14 @@ jobs:
         type: string
     docker:
       - image: ruby:<< parameters.ruby-version >>
+        environment:
+          BUNDLE_GEMFILE: gemfiles/<< parameters.gemfile >>.gemfile
       - image: cimg/postgres:11.16
     steps:
       - checkout
       - run: gem install bundler
       - run: bundle install
-      - run: bundle exec appraisal << parameters.gemfile >> bundle install
-      - run: bundle exec appraisal << parameters.gemfile >> rspec
+      - run: bundle exec rspec
 
 workflows:
   test:
@@ -24,16 +25,17 @@ workflows:
           matrix:
             parameters:
               ruby-version:
-                - '2.7'
                 - '3.0'
                 - '3.1'
+                - '3.2'
+                - '3.3'
               gemfile:
-                - rails-6.0
-                - rails-6.1
-                - rails-7.0
-                - rails-main
+                - rails_6.1
+                - rails_7.0
+                - rails_7.1
+                - rails_main
             exclude:
-              - ruby-version: '3.0'
-                gemfile: rails-6.0
-              - ruby-version: '3.1'
-                gemfile: rails-6.0
+              - ruby-version: '3.2'
+                gemfile: rails_6.1
+              - ruby-version: '3.3'
+                gemfile: rails_6.1

data/Appraisals

@@ -4,10 +4,6 @@ appraise "rails-main" do
   gem "rails", git: 'https://github.com/rails/rails.git', branch: "main"
 end
 
-appraise "rails-6.0" do
-  gem "rails", "~> 6.0.2"
-end
-
 appraise "rails-6.1" do
   gem "rails", "~> 6.1.0"
 end
@@ -15,3 +11,7 @@ end
 appraise "rails-7.0" do
   gem "rails", "~> 7.0.1"
 end
+
+appraise "rails-7.1" do
+  gem "rails", "~> 7.1.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,50 @@
 # Changelog
 
+## 5.0.0
+
+### Breaking Changed
+
+- [CI against Ruby 3.2, 3.3, Drop Ruby 2.7 and Rails 6.0 #150](https://github.com/kufu/activerecord-bitemporal/pull/150)
+
+### Added
+
+- [Support date type of valid time #149](https://github.com/kufu/activerecord-bitemporal/pull/149)
+- [Add support Rails 7.1 #151](https://github.com/kufu/activerecord-bitemporal/pull/151)
+- [Add Persistence#bitemporal_at and ActiveRecord::Bitemporal.bitemporal_at #152](https://github.com/kufu/activerecord-bitemporal/pull/152)
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+- [Fix deleted time order between associations #154](https://github.com/kufu/activerecord-bitemporal/pull/154)
+
+### Chores
+
+- [Don't use appraisal in CI #145](https://github.com/kufu/activerecord-bitemporal/pull/145)
+- [Remove code for Active Record 6.0 #153](https://github.com/kufu/activerecord-bitemporal/pull/153)
+
+## 4.3.0
+
+### Added
+
+- [Add `previously_force_updated?` #142](https://github.com/kufu/activerecord-bitemporal/pull/142)
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Chores
+
+- [Remove unneeded spec for Rails 5.x #143](https://github.com/kufu/activerecord-bitemporal/pull/143)
+
 ## 4.2.0
 
 ### Added

data/activerecord-bitemporal.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Enable ActiveRecord models to be handled as BiTemporal Data Model.}
   spec.homepage      = "https://github.com/kufu/activerecord-bitemporal"
   spec.license       = "Apache 2.0"
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 6.0"
+  spec.add_dependency "activerecord", ">= 6.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 13.0"

data/gemfiles/{rails_6.0.gemfile → rails_7.1.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "rails", "~> 6.0.2"
+gem "rails", "~> 7.1.0"
 
 gemspec path: "../"

data/lib/activerecord-bitemporal/bitemporal.rb

@@ -68,6 +68,10 @@ module ActiveRecord
           bitemporal_option[:valid_datetime]&.in_time_zone
         end
 
+        def valid_date
+          valid_datetime&.to_date
+        end
+
         def ignore_valid_datetime(&block)
           with_bitemporal_option(ignore_valid_datetime: true, valid_datetime: nil, &block)
         end
@@ -88,6 +92,14 @@ module ActiveRecord
           with_bitemporal_option(ignore_transaction_datetime: true, transaction_datetime: nil, &block)
         end
 
+        def bitemporal_at(datetime, &block)
+          transaction_at(datetime) { valid_at(datetime, &block) }
+        end
+
+        def bitemporal_at!(datetime, &block)
+          transaction_at!(datetime) { valid_at!(datetime, &block) }
+        end
+
         def merge_by(option)
           option_ = option.dup
           if bitemporal_option_storage[:force_valid_datetime]
@@ -224,6 +236,10 @@ module ActiveRecord
           with_bitemporal_option(transaction_datetime: datetime, &block)
         end
 
+        def bitemporal_at(datetime, &block)
+          transaction_at(datetime) { valid_at(datetime, &block) }
+        end
+
         def bitemporal_option_merge_with_association!(other)
           bitemporal_option_merge!(other)
 
@@ -238,6 +254,10 @@ module ActiveRecord
           bitemporal_option[:valid_datetime]&.in_time_zone
         end
 
+        def valid_date
+          valid_datetime&.to_date
+        end
+
         def transaction_datetime
           bitemporal_option[:transaction_datetime]&.in_time_zone
         end
@@ -277,12 +297,13 @@ module ActiveRecord
         end
 
         refine ActiveRecord::Base do
-          # MEMO: Do not copy `swapped_id`
+          # MEMO: Do not copy bitemporal internal status
           def dup(*)
             super.tap { |itself|
               itself.instance_exec do
                 @_swapped_id_previously_was = nil
                 @_swapped_id = nil
+                @previously_force_updated = false
               end unless itself.frozen?
             }
           end
@@ -320,6 +341,7 @@ module ActiveRecord
           before_instance&.save_without_bitemporal_callbacks!(validate: false)
           # NOTE: after_instance always exists
           after_instance.save_without_bitemporal_callbacks!(validate: false)
+          @previously_force_updated = self.force_update?
 
           # update 後に新しく生成したインスタンスのデータを移行する
           @_swapped_id_previously_was = swapped_id
@@ -334,17 +356,19 @@ module ActiveRecord
         end || false
       end
 
-      def destroy(force_delete: false, operated_at: Time.current)
+      def destroy(force_delete: false, operated_at: nil)
         return super() if force_delete
 
-        target_datetime = valid_datetime || operated_at
-
-        duplicated_instance = self.class.find_at_time(target_datetime, self.id).dup
-
         ActiveRecord::Base.transaction(requires_new: true, joinable: false) do
           @destroyed = false
           _run_destroy_callbacks {
+            operated_at ||= Time.current
+            target_datetime = valid_datetime || operated_at
+
+            duplicated_instance = self.class.find_at_time(target_datetime, self.id).dup
+
             @destroyed = update_transaction_to(operated_at)
+            @previously_force_updated = force_update?
 
             # force_update の場合は削除時の状態の履歴を残さない
             unless force_update?
@@ -372,6 +396,18 @@ module ActiveRecord
         false
       end
 
+      if Gem::Version.new("7.1.0") <= ActiveRecord.version
+        # MEMO: Since Rails 7.1 #_find_record refers to a record with find_by!(@primary_key => id)
+        #       But if @primary_key is "id", it can't refer to the intended record, so we hack it to refer to the record based on self.class.bitemporal_id_key
+        #       see: https://github.com/rails/rails/blob/v7.1.0/activerecord/lib/active_record/persistence.rb#L1152-#L1171
+        def _find_record(*)
+          tmp_primary_key, @primary_key = @primary_key, self.class.bitemporal_id_key
+          super
+        ensure
+          @primary_key = tmp_primary_key
+        end
+      end
+
       module ::ActiveRecord::Persistence
         # MEMO: Must be override ActiveRecord::Persistence#reload
         alias_method :active_record_bitemporal_original_reload, :reload unless method_defined? :active_record_bitemporal_original_reload
@@ -397,9 +433,10 @@ module ActiveRecord
             # NOTE: Hook to copying swapped_id
             @_swapped_id_previously_was = nil
             @_swapped_id = fresh_object.swapped_id
+            @previously_force_updated = false
             self
           end
-        elsif Gem::Version.new("6.1.0") <= ActiveRecord.version
+        else
           def reload(options = nil)
             return active_record_bitemporal_original_reload(options) unless self.class.bi_temporal_model?
 
@@ -420,28 +457,7 @@ module ActiveRecord
             # NOTE: Hook to copying swapped_id
             @_swapped_id_previously_was = nil
             @_swapped_id = fresh_object.swapped_id
-            self
-          end
-        else
-          def reload(options = nil)
-            return active_record_bitemporal_original_reload(options) unless self.class.bi_temporal_model?
-
-            self.class.connection.clear_query_cache
-
-            fresh_object =
-              ActiveRecord::Bitemporal.with_bitemporal_option(**bitemporal_option) {
-                if options && options[:lock]
-                  self.class.unscoped { self.class.lock(options[:lock]).bitemporal_default_scope.find(id) }
-                else
-                  self.class.unscoped { self.class.bitemporal_default_scope.find(id) }
-                end
-              }
-
-            @attributes = fresh_object.instance_variable_get("@attributes")
-            @new_record = false
-            # NOTE: Hook to copying swapped_id
-            @_swapped_id_previously_was = nil
-            @_swapped_id = fresh_object.swapped_id
+            @previously_force_updated = false
             self
           end
         end
@@ -573,10 +589,13 @@ module ActiveRecord
         valid_from = record.valid_from if record.force_update?
 
         valid_to = record.valid_to.yield_self { |valid_to|
+          # NOTE: `cover?` may give incorrect results, when the time zone is not UTC and `valid_from` is date type
+          #   Therefore, cast to type of `valid_from`
+          record_valid_time = finder_class.type_for_attribute(:valid_from).cast(record.valid_datetime)
           # レコードを更新する時に valid_datetime が valid_from ~ valid_to の範囲外だった場合、
           #   一番近い未来の履歴レコードを参照して更新する
           # という仕様があるため、それを考慮して valid_to を設定する
-          if (record.valid_datetime && (record.valid_from..record.valid_to).cover?(record.valid_datetime)) == false && (record.persisted?)
+          if (record_valid_time && (record.valid_from..record.valid_to).cover?(record_valid_time)) == false && (record.persisted?)
             finder_class.ignore_valid_datetime.where(bitemporal_id: record.bitemporal_id).valid_from_gt(target_datetime).order(valid_from: :asc).first.valid_from
           else
             valid_to

data/lib/activerecord-bitemporal/scope.rb

@@ -47,26 +47,9 @@ module ActiveRecord::Bitemporal
           end
         }
 
-        def each_operatable_node_6_0(nodes = predicates, &block)
+        def each_operatable_node(nodes = predicates, &block)
           if block
             each_operatable_node(nodes).each(&block)
-          else
-            Enumerator.new { |y|
-              Array(nodes).each { |node|
-                case node
-                when Arel::Nodes::LessThan, Arel::Nodes::LessThanOrEqual, Arel::Nodes::GreaterThan, Arel::Nodes::GreaterThanOrEqual
-                  y << node if node && node.left.respond_to?(:relation)
-                when Arel::Nodes::Grouping
-                  each_operatable_node(node.expr) { |node| y << node }
-                end
-              }
-            }
-          end
-        end
-
-        def each_operatable_node_6_1(nodes = predicates, &block)
-          if block
-            each_operatable_node_6_1(nodes).each(&block)
           else
             Enumerator.new { |y|
               Array(nodes).each { |node|
@@ -74,26 +57,18 @@ module ActiveRecord::Bitemporal
                 when Arel::Nodes::LessThan, Arel::Nodes::LessThanOrEqual, Arel::Nodes::GreaterThan, Arel::Nodes::GreaterThanOrEqual
                   y << node if node && node.left.respond_to?(:relation)
                 when Arel::Nodes::And
-                  each_operatable_node_6_1(node.children) { |node| y << node }
+                  each_operatable_node(node.children) { |node| y << node }
                 when Arel::Nodes::Binary
-                  each_operatable_node_6_1(node.left) { |node| y << node }
-                  each_operatable_node_6_1(node.right) { |node| y << node }
+                  each_operatable_node(node.left) { |node| y << node }
+                  each_operatable_node(node.right) { |node| y << node }
                 when Arel::Nodes::Unary
-                  each_operatable_node_6_1(node.expr) { |node| y << node }
+                  each_operatable_node(node.expr) { |node| y << node }
                 end
               }
             }
           end
         end
 
-        def each_operatable_node(nodes = predicates, &block)
-          if Gem::Version.new("6.1.0") <= ActiveRecord.version
-            each_operatable_node_6_1(nodes, &block)
-          else
-            each_operatable_node_6_0(nodes, &block)
-          end
-        end
-
         def bitemporal_query_hash(*names)
           each_operatable_node
             .select { |node| names.include? node.left.name.to_s }
@@ -126,31 +101,6 @@ module ActiveRecord::Bitemporal
       end
     }
 
-    if ActiveRecord.version < Gem::Version.new("6.1.0")
-      class WhereClauseWithCheckTable < ActiveRecord::Relation::WhereClause
-        using NodeBitemporalInclude
-
-        def bitemporal_include?(column)
-          !!predicates.grep(::Arel::Nodes::Node).find do |node|
-            node.bitemporal_include?(column)
-          end
-        end
-
-        private
-
-        def except_predicates(columns)
-          columns = Array(columns)
-          predicates.reject do |node|
-            ::Arel::Nodes::Node === node && node.bitemporal_include?(*columns)
-          end
-        end
-      end
-
-      def where_clause
-        WhereClauseWithCheckTable.new(super.send(:predicates))
-      end
-    end
-
     module MergeWithExceptBitemporalDefaultScope
       using BitemporalChecker
       def merge(other)
@@ -166,6 +116,10 @@ module ActiveRecord::Bitemporal
       bitemporal_clause[:valid_datetime]&.in_time_zone
     end
 
+    def valid_date
+      valid_datetime&.to_date
+    end
+
     def transaction_datetime
       bitemporal_clause[:transaction_datetime]&.in_time_zone
     end
@@ -239,118 +193,80 @@ module ActiveRecord::Bitemporal
         end
       }
 
-      if ActiveRecord.version < Gem::Version.new("6.1.0")
-        module ActiveRecordRelationScope
-          refine ::ActiveRecord::Relation do
-            %i(valid_from valid_to transaction_from transaction_to).each { |column|
-              module_eval <<-STR, __FILE__, __LINE__ + 1
-                def _ignore_#{column}
-                  unscope(where: "\#{table.name}.#{column}")
-                    .tap { |relation| relation.merge!(bitemporal_value[:through].unscoped._ignore_#{column}) if bitemporal_value[:through] }
-                end
-
-                def _except_#{column}
-                  return self unless where_clause.bitemporal_include?("\#{table.name}.#{column}")
-                  all._ignore_#{column}.tap { |relation|
-                    relation.unscope_values.delete({ where: "\#{table.name}.#{column}" })
-                  }
-                end
-              STR
-
-              [
-                :lt,    # column <  datetime
-                :lteq,  # column <= datetime
-                :gt,    # column >  datetime
-                :gteq   # column >= datetime
-              ].each { |op|
-                module_eval <<-STR, __FILE__, __LINE__ + 1
-                  def _#{column}_#{op}(datetime, without_ignore: false)
-                    target_datetime = datetime&.in_time_zone || Time.current
-                    relation = self.tap { |relation| break relation._ignore_#{column} unless without_ignore }
-                    relation.bitemporal_where_bind!(:#{column}, :#{op}, target_datetime)
-                      .tap { |relation| relation.merge!(bitemporal_value[:through].unscoped._#{column}_#{op}(target_datetime)) if bitemporal_value[:through] }
-                  end
-                STR
-              }
-            }
-          end
-        end
-      else
-        module ActiveRecordRelationScope
-          module EqualAttributeName
-            refine ::Object do
-              def equal_attribute_name(*)
-                false
-              end
+      module ActiveRecordRelationScope
+        module EqualAttributeName
+          refine ::Object do
+            def equal_attribute_name(*)
+              false
             end
-            refine ::Hash do
-              def equal_attribute_name(other)
-                self[:where].equal_attribute_name(other)
-              end
+          end
+          refine ::Hash do
+            def equal_attribute_name(other)
+              self[:where].equal_attribute_name(other)
             end
-            refine ::Array do
-              def equal_attribute_name(other)
-                first.equal_attribute_name(other)
-              end
+          end
+          refine ::Array do
+            def equal_attribute_name(other)
+              first.equal_attribute_name(other)
             end
-            refine ::String do
-              def equal_attribute_name(other)
-                self == other.to_s
-              end
+          end
+          refine ::String do
+            def equal_attribute_name(other)
+              self == other.to_s
             end
-            refine ::Symbol do
-              def equal_attribute_name(other)
-                self.to_s == other.to_s
-              end
+          end
+          refine ::Symbol do
+            def equal_attribute_name(other)
+              self.to_s == other.to_s
             end
-            refine ::Arel::Attributes::Attribute do
-              def equal_attribute_name(other)
-                "#{relation.name}.#{name}" == other.to_s
-              end
+          end
+          refine ::Arel::Attributes::Attribute do
+            def equal_attribute_name(other)
+              "#{relation.name}.#{name}" == other.to_s
             end
           end
+        end
 
-          refine ::ActiveRecord::Relation do
-            using EqualAttributeName
-            using NodeBitemporalInclude
+        refine ::ActiveRecord::Relation do
+          using EqualAttributeName
+          using NodeBitemporalInclude
 
-            def bitemporal_rewhere_bind(attr_name, operator, value, table = self.table)
-              rewhere(table[attr_name].public_send(operator, predicate_builder.build_bind_attribute(attr_name, value)))
-            end
+          def bitemporal_rewhere_bind(attr_name, operator, value, table = self.table)
+            rewhere(table[attr_name].public_send(operator, predicate_builder.build_bind_attribute(attr_name, value)))
+          end
 
-            %i(valid_from valid_to transaction_from transaction_to).each { |column|
-              module_eval <<-STR, __FILE__, __LINE__ + 1
-                def _ignore_#{column}
-                  unscope(where: :"\#{table.name}.#{column}")
-                    .tap { |relation| relation.unscope!(where: bitemporal_value[:through].arel_table["#{column}"]) if bitemporal_value[:through] }
-                end
+          %i(valid_from valid_to transaction_from transaction_to).each { |column|
+            module_eval <<-STR, __FILE__, __LINE__ + 1
+              def _ignore_#{column}
+                unscope(where: :"\#{table.name}.#{column}")
+                  .tap { |relation| relation.unscope!(where: bitemporal_value[:through].arel_table["#{column}"]) if bitemporal_value[:through] }
+              end
 
-                def _except_#{column}
-                  return self unless where_clause.send(:predicates).find { |node|
-                    node.bitemporal_include?("\#{table.name}.#{column}")
-                  }
-                  _ignore_#{column}.tap { |relation|
-                    relation.unscope_values.reject! { |query| query.equal_attribute_name("\#{table.name}.#{column}") }
-                  }
+              def _except_#{column}
+                return self unless where_clause.send(:predicates).find { |node|
+                  node.bitemporal_include?("\#{table.name}.#{column}")
+                }
+                _ignore_#{column}.tap { |relation|
+                  relation.unscope_values.reject! { |query| query.equal_attribute_name("\#{table.name}.#{column}") }
+                }
+              end
+            STR
+
+            [
+              :lt,    # column <  datetime
+              :lteq,  # column <= datetime
+              :gt,    # column >  datetime
+              :gteq   # column >= datetime
+            ].each { |op|
+              module_eval <<-STR, __FILE__, __LINE__ + 1
+                def _#{column}_#{op}(datetime,**)
+                  target_datetime = datetime&.in_time_zone || Time.current
+                  bitemporal_rewhere_bind("#{column}", :#{op}, target_datetime)
+                    .tap { |relation| break relation.bitemporal_rewhere_bind("#{column}", :#{op}, target_datetime, bitemporal_value[:through].arel_table) if bitemporal_value[:through] }
                 end
               STR
-
-              [
-                :lt,    # column <  datetime
-                :lteq,  # column <= datetime
-                :gt,    # column >  datetime
-                :gteq   # column >= datetime
-              ].each { |op|
-                module_eval <<-STR, __FILE__, __LINE__ + 1
-                  def _#{column}_#{op}(datetime,**)
-                    target_datetime = datetime&.in_time_zone || Time.current
-                    bitemporal_rewhere_bind("#{column}", :#{op}, target_datetime)
-                      .tap { |relation| break relation.bitemporal_rewhere_bind("#{column}", :#{op}, target_datetime, bitemporal_value[:through].arel_table) if bitemporal_value[:through] }
-                  end
-                STR
-              }
             }
-          end
+          }
         end
       end
       using ActiveRecordRelationScope

data/lib/activerecord-bitemporal/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Bitemporal
-    VERSION = "4.2.0"
+    VERSION = "5.0.0"
   end
 end

data/lib/activerecord-bitemporal/visualizer.rb

@@ -49,7 +49,8 @@ module ActiveRecord::Bitemporal
         prev_valid_times.each do |valid_time|
           headers.print('|', line: line, column: columns[valid_time])
         end
-        headers.print("| #{valid_time.strftime('%F %T.%3N')}", line: line, column: columns[valid_time])
+        valid_time_str = valid_time.kind_of?(Date) ? valid_time.strftime('%F') : valid_time.strftime('%F %T.%3N')
+        headers.print("| #{valid_time_str}", line: line, column: columns[valid_time])
         prev_valid_times << valid_time
       end
   
@@ -92,13 +93,14 @@ module ActiveRecord::Bitemporal
         end
       end
 
+      valid_label = valid_times[0].kind_of?(Date) ? 'valid_date' : 'valid_datetime'
       transaction_label = 'transaction_datetime'
       right_margin = time_length + 1 - transaction_label.size
 
       label = if right_margin >= 0
-        "#{transaction_label + ' ' * right_margin}| valid_datetime"
+        "#{transaction_label + ' ' * right_margin}| #{valid_label}"
       else
-        "#{transaction_label[0...right_margin]}| valid_datetime"
+        "#{transaction_label[0...right_margin]}| #{valid_label}"
       end
 
       "#{label}\n#{headers.to_s}\n#{body.to_s}"

data/lib/activerecord-bitemporal.rb

@@ -104,6 +104,10 @@ module ActiveRecord::Bitemporal::Bitemporalize
       swapped_id.presence || super
     end
 
+    def previously_force_updated?
+      @previously_force_updated
+    end
+
     def valid_from_cannot_be_greater_equal_than_valid_to
       if valid_from && valid_to && valid_from >= valid_to
         errors.add(:valid_from, "can't be greater equal than valid_to")
@@ -141,10 +145,12 @@ module ActiveRecord::Bitemporal::Bitemporalize
       # MEMO: #update_columns is not call #_update_row (and validations, callbacks)
       update_columns(bitemporal_id_key => swapped_id) unless send(bitemporal_id_key)
       swap_id!(without_clear_changes_information: true)
+      @previously_force_updated = false
     end
 
     after_find do
       self.swap_id! if self.send(bitemporal_id_key).present?
+      @previously_force_updated = false
     end
 
     # Callback hook to `validates :xxx, uniqueness: true`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bitemporal
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 5.0.0
 platform: ruby
 authors:
 - SmartHR
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2024-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -159,9 +159,9 @@ files:
 - bin/console
 - bin/setup
 - docker-compose.yml
-- gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
 - gemfiles/rails_main.gemfile
 - lib/activerecord-bitemporal.rb
 - lib/activerecord-bitemporal/bitemporal.rb
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="