Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Do not in place modify what table_name returns

  • Loading branch information...
commit 7717fc375ee45d7cb1fa1672713ab8c883a833ef 1 parent 7222786
@spastorino spastorino authored
View
2  activemodel/lib/active_model/attribute_methods.rb
@@ -102,7 +102,7 @@ def define_attr_method(name, value=nil, &block)
sing.send :define_method, name, &block
else
value = value.to_s if value
- sing.send(:define_method, name) { value && value.dup }
+ sing.send(:define_method, name) { value }
end
end
View
11 activemodel/test/cases/attribute_methods_test.rb
@@ -9,10 +9,6 @@ class << self
define_method(:bar) do
'original bar'
end
-
- define_method(:zomg) do
- 'original zomg'
- end
end
def attributes
@@ -88,13 +84,6 @@ class AttributeMethodsTest < ActiveModel::TestCase
assert_equal "value of foo bar", ModelWithAttributesWithSpaces.new.send(:'foo bar')
end
- def test_defined_methods_always_return_duped_string
- ModelWithAttributes.define_attr_method(:zomg, 'lol')
- assert_equal 'lol', ModelWithAttributes.zomg
- ModelWithAttributes.zomg << 'bbq'
- assert_equal 'lol', ModelWithAttributes.zomg
- end
-
test '#define_attr_method generates attribute method' do
ModelWithAttributes.define_attr_method(:bar, 'bar')
View
2  activerecord/lib/active_record/base.rb
@@ -959,7 +959,7 @@ def compute_table_name
if parent < ActiveRecord::Base && !parent.abstract_class?
contained = parent.table_name
contained = contained.singularize if parent.pluralize_table_names
- contained << '_'
+ contained += '_'
end
"#{full_table_name_prefix}#{contained}#{undecorated_table_name(name)}#{table_name_suffix}"
else
Please sign in to comment.
Something went wrong with that request. Please try again.