Skip to content

replace_virtual_field condenses returning includes #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jrafanie merged 2 commits into from
Jul 31, 2024
Merged

replace_virtual_field condenses returning includes #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
153a10f
sample with double array
kbrock Jul 30, 2024
a1d7249
replace_virtual_field condenses returning includes
kbrock Jul 30, 2024
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
38 changes: 26 additions & 12 deletions lib/active_record/virtual_attributes/virtual_fields.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,20 @@ def virtual_field?(name)
end

def replace_virtual_fields(associations)
return associations if associations.blank?
return nil if associations.blank?
Comment thread
jrafanie marked this conversation as resolved.

case associations
when String, Symbol
virtual_field?(associations) ? replace_virtual_fields(virtual_includes(associations)) : associations.to_sym
when Array
associations.collect { |association| replace_virtual_fields(association) }.compact
when Hash
replace_virtual_field_hash(associations)
else
associations
end
ret =
case associations
when String, Symbol
virtual_field?(associations) ? replace_virtual_fields(virtual_includes(associations)) : associations.to_sym
when Array
associations.filter_map { |association| replace_virtual_fields(association) }
when Hash
replace_virtual_field_hash(associations)
else
associations
end
simplify_includes(ret)
end

def replace_virtual_field_hash(associations)
Expand Down Expand Up @@ -98,6 +100,18 @@ def merge_includes(hash1, hash2)
merge_includes(include_to_hash(v1), v2)
end
end

# @param [Hash|Array|Symbol|nil]
def simplify_includes(ret)
case ret
when Hash
ret.size <= 1 && ret.values.first.blank? ? ret.keys.first : ret
when Array
ret.size <= 1 ? ret.first : ret
else
ret
end
end
end
end
end
Expand Down Expand Up @@ -267,7 +281,7 @@ def arel_column(field, &block)
end

def construct_join_dependency(associations, join_type) # :nodoc:
associations = klass.replace_virtual_fields(associations)
associations = klass.replace_virtual_fields(associations) || {}
super
end
})
Expand Down
44 changes: 22 additions & 22 deletions spec/virtual_attributes_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@
it ".replace_virtual_fields" do
expect(TestClass.replace_virtual_fields(:vcol1)).to be_nil
expect(TestClass.replace_virtual_fields(:ref1)).to eq(:ref1)
expect(TestClass.replace_virtual_fields([:vcol1])).to eq([])
expect(TestClass.replace_virtual_fields([:vcol1, :ref1])).to eq([:ref1])
expect(TestClass.replace_virtual_fields(:vcol1 => {})).to eq({})
expect(TestClass.replace_virtual_fields(:vcol1 => {}, :ref1 => {})).to eq(:ref1 => {})
expect(TestClass.replace_virtual_fields([:vcol1].freeze)).to be_nil
expect(TestClass.replace_virtual_fields([:vcol1, :ref1].freeze)).to eq(:ref1)
expect(TestClass.replace_virtual_fields({:vcol1 => {}}.freeze)).to be_nil
expect(TestClass.replace_virtual_fields({:vcol1 => {}, :ref1 => {}}.freeze)).to eq(:ref1)
end
end
end
Expand Down Expand Up @@ -158,15 +158,15 @@
end

it ".replace_virtual_fields" do
expect(test_sub_class.replace_virtual_fields(:vcol1)).to be_nil
expect(test_sub_class.replace_virtual_fields(:vcolsub1)).to be_nil
expect(test_sub_class.replace_virtual_fields(:vcol1)).to be_nil
expect(test_sub_class.replace_virtual_fields(:vcolsub1)).to be_nil
expect(test_sub_class.replace_virtual_fields(:ref1)).to eq(:ref1)
expect(test_sub_class.replace_virtual_fields([:vcol1])).to eq([])
expect(test_sub_class.replace_virtual_fields([:vcolsub1])).to eq([])
expect(test_sub_class.replace_virtual_fields([:vcolsub1, :vcol1, :ref1])).to eq([:ref1])
expect(test_sub_class.replace_virtual_fields(:vcol1 => {})).to eq({})
expect(test_sub_class.replace_virtual_fields(:vcolsub1 => {})).to eq({})
expect(test_sub_class.replace_virtual_fields(:vcolsub1 => {}, :vcol1 => {}, :ref1 => {})).to eq(:ref1 => {})
expect(test_sub_class.replace_virtual_fields([:vcol1].freeze)).to be_nil
expect(test_sub_class.replace_virtual_fields([:vcolsub1].freeze)).to be_nil
expect(test_sub_class.replace_virtual_fields([:vcolsub1, :vcol1, :ref1].freeze)).to eq(:ref1)
expect(test_sub_class.replace_virtual_fields({:vcol1 => {}}.freeze)).to be_nil
expect(test_sub_class.replace_virtual_fields({:vcolsub1 => {}}.freeze)).to be_nil
expect(test_sub_class.replace_virtual_fields({:vcolsub1 => {}, :vcol1 => {}, :ref1 => {}}.freeze)).to eq(:ref1)
end
end
end
Expand Down Expand Up @@ -341,10 +341,10 @@ def hosts
it ".replace_virtual_fields" do
expect(TestClass.replace_virtual_fields(:vref1)).to be_nil
expect(TestClass.replace_virtual_fields(:ref1)).to eq(:ref1)
expect(TestClass.replace_virtual_fields([:vref1])).to eq([])
expect(TestClass.replace_virtual_fields([:vref1, :ref1])).to eq([:ref1])
expect(TestClass.replace_virtual_fields(:vref1 => {})).to eq({})
expect(TestClass.replace_virtual_fields(:vref1 => {}, :ref1 => {})).to eq(:ref1 => {})
expect(TestClass.replace_virtual_fields([:vref1].freeze)).to be_nil
expect(TestClass.replace_virtual_fields([:vref1, :ref1].freeze)).to eq(:ref1)
expect(TestClass.replace_virtual_fields({:vref1 => {}}.freeze)).to be_nil
expect(TestClass.replace_virtual_fields({:vref1 => {}, :ref1 => {}}.freeze)).to eq(:ref1)
end
end
end
Expand Down Expand Up @@ -377,12 +377,12 @@ def hosts
expect(test_sub_class.replace_virtual_fields(:vref1)).to be_nil
expect(test_sub_class.replace_virtual_fields(:vrefsub1)).to be_nil
expect(test_sub_class.replace_virtual_fields(:ref1)).to eq(:ref1)
expect(test_sub_class.replace_virtual_fields([:vref1])).to eq([])
expect(test_sub_class.replace_virtual_fields([:vrefsub1])).to eq([])
expect(test_sub_class.replace_virtual_fields([:vrefsub1, :vref1, :ref1])).to eq([:ref1])
expect(test_sub_class.replace_virtual_fields(:vref1 => {})).to eq({})
expect(test_sub_class.replace_virtual_fields(:vrefsub1 => {})).to eq({})
expect(test_sub_class.replace_virtual_fields(:vrefsub1 => {}, :vref1 => {}, :ref1 => {})).to eq(:ref1 => {})
expect(test_sub_class.replace_virtual_fields([:vref1].freeze)).to be_nil
expect(test_sub_class.replace_virtual_fields([:vrefsub1].freeze)).to be_nil
expect(test_sub_class.replace_virtual_fields([:vrefsub1, :vref1, :ref1].freeze)).to eq(:ref1)
expect(test_sub_class.replace_virtual_fields({:vref1 => {}}.freeze)).to be_nil
expect(test_sub_class.replace_virtual_fields({:vrefsub1 => {}}.freeze)).to be_nil
expect(test_sub_class.replace_virtual_fields({:vrefsub1 => {}, :vref1 => {}, :ref1 => {}}.freeze)).to eq(:ref1)
end
end
end
Expand Down
13 changes: 9 additions & 4 deletions spec/virtual_includes_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,22 +524,27 @@
expect(Author.replace_virtual_fields([:book_with_most_bookmarks, :books])).to eq([{:books => :bookmarks}, :books])
expect(Author.replace_virtual_fields(["book_with_most_bookmarks", "books"])).to eq([{:books => :bookmarks}, :books])
expect(Author.replace_virtual_fields([{:book_with_most_bookmarks => {}}, :books])).to eq([{:books => :bookmarks}, :books])
expect(Author.replace_virtual_fields([{:book_with_most_bookmarks => {}}, {:books => {}}])).to eq([{:books => :bookmarks}, {:books => {}}])
expect(Author.replace_virtual_fields([{:book_with_most_bookmarks => {}}, {:books => {}}])).to eq([{:books => :bookmarks}, :books])
end

it "handles hash form of delegates" do
expect(Book.replace_virtual_fields([{:author_name => {}}, {:author_name2 => {}}])).to eq([{:author => {}}, {:author => {}}])
expect(Book.replace_virtual_fields([{:author_name => {}}, {:author_name2 => {}}])).to eq([:author, :author])
end

it "handles non-'includes' virtual_attributes" do
expect(Author.replace_virtual_fields(:nick_or_name)).to eq(nil)
expect(Author.replace_virtual_fields([:nick_or_name])).to eq([])
expect(Author.replace_virtual_fields(:nick_or_name => {})).to eq({})
expect(Author.replace_virtual_fields([:nick_or_name])).to eq(nil)
expect(Author.replace_virtual_fields(:nick_or_name => {})).to eq(nil)
end

it "handles deep includes with va indirect uses(:uses => :books => :bookmarks)" do
expect(Author.replace_virtual_fields(:famous_co_authors => {})).to eq({:books => {:bookmarks => {}, :co_authors => {}}})
end

it "handles arrays" do
value = Author.includes(:named_books).includes_values
expect(Author.replace_virtual_fields(value)).to eq(:books)
end
end

def preloaded(records, associations, preload_scope = nil)
Expand Down