Skip to content

Commit 9b5a57d

Browse files
committed
don't add arel or uses if there is no arel or uses
This simplifies the method calls
1 parent 8d484bd commit 9b5a57d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/active_record/virtual_attributes.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ def load_schema!
103103

104104
def define_virtual_attribute(name, cast_type, uses: nil, arel: nil)
105105
attribute_types[name.to_s] = cast_type
106-
define_virtual_include(name, uses) if uses
107-
define_virtual_arel(name, arel) if arel
106+
define_virtual_include(name, uses)
107+
define_virtual_arel(name, arel)
108108
end
109109
end
110110
end

lib/active_record/virtual_attributes/virtual_arel.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def arel_for_virtual_attribute(column_name, table) # :nodoc:
111111
private
112112

113113
def define_virtual_arel(name, arel) # :nodoc:
114-
self._virtual_arel = _virtual_arel.merge(name.to_s => arel)
114+
self._virtual_arel = _virtual_arel.merge(name.to_s => arel) unless arel.nil?
115115
end
116116
end
117117
end

lib/active_record/virtual_attributes/virtual_includes.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def virtual_includes(name)
2525
private
2626

2727
def define_virtual_include(name, uses)
28-
self._virtual_includes = _virtual_includes.merge(name.to_s => uses)
28+
self._virtual_includes = _virtual_includes.merge(name.to_s => uses) unless uses.nil?
2929
end
3030
end
3131
end

0 commit comments

Comments
 (0)