From 7717fc375ee45d7cb1fa1672713ab8c883a833ef Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 18 Mar 2011 13:35:57 -0300
Subject: [PATCH] Do not in place modify what table_name returns

---
 activemodel/lib/active_model/attribute_methods.rb |  2 +-
 activemodel/test/cases/attribute_methods_test.rb  | 11 -----------
 activerecord/lib/active_record/base.rb            |  2 +-
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index 842974cdb02f6..3250c72716f9b 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/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
 
diff --git a/activemodel/test/cases/attribute_methods_test.rb b/activemodel/test/cases/attribute_methods_test.rb
index 50335933a50c9..ffcc6fa1e0c54 100644
--- a/activemodel/test/cases/attribute_methods_test.rb
+++ b/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')
 
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index c629275b69012..c4840645881b9 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/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