Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/activerecord-bitemporal/bitemporal.rb
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@ def load
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?)
Expand All @@ -198,12 +198,14 @@ def load
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
Expand Down
44 changes: 44 additions & 0 deletions spec/activerecord-bitemporal/relation/load_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# frozen_string_literal: true

require 'spec_helper'

RSpec.describe ActiveRecord::Bitemporal::Relation do
describe "#load" do
let!(:employees) { Employee.create!([{ name: "Jane" }, { name: "Tom" }]) }

context "on relation" do
it "returns self" do
relation = Employee.all
expect(relation.load).to equal relation
end
end

context "on loaded relation" do
it "returns self" do
relation = Employee.all.load
expect(relation.load).to equal relation
end
end

context "with valid_at" do
it "returns self" do
relation = Employee.valid_at(Time.current)
expect(relation.load).to equal relation
end
end

context "with transaction_at" do
it "returns self" do
relation = Employee.transaction_at(Time.current)
expect(relation.load).to equal relation
end
end

context "on empty relation" do
it "returns self" do
relation = Employee.where(name: "Not Found").valid_at(Time.current)
expect(relation.load).to equal relation
end
end
end
end