Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

the data structure used to store attribute aliases should not be exposed

  • Loading branch information...
commit d094aaad19ab0d79d0e74747ad1a7141f914b431 1 parent a444ea3
@tenderlove tenderlove authored
View
10 activemodel/lib/active_model/attribute_methods.rb
@@ -218,6 +218,16 @@ def alias_attribute(new_name, old_name)
end
end
+ # Is +new_name+ an alias?
+ def attribute_alias?(new_name)
+ attribute_aliases.key? new_name.to_s
+ end
+
+ # Returns the original name for the alias +name+
+ def attribute_alias(name)
+ attribute_aliases[name.to_s]
+ end
+
# Declares the attributes that should be prefixed and suffixed by
# ActiveModel::AttributeMethods.
#
View
4 activerecord/lib/active_record/relation/predicate_builder.rb
@@ -6,8 +6,8 @@ def self.build_from_hash(klass, attributes, default_table)
attributes.each do |column, value|
table = default_table
- if column.is_a?(Symbol) && klass.attribute_aliases.key?(column.to_s)
- column = klass.attribute_aliases[column.to_s]
+ if column.is_a?(Symbol) && klass.attribute_alias?(column)
+ column = klass.attribute_alias(column.to_s)
end
if value.is_a?(Hash)
Please sign in to comment.
Something went wrong with that request. Please try again.