From bab1f910c7399fcfe9f031a1ce3a1f36bf5fd277 Mon Sep 17 00:00:00 2001 From: Phil Smith Date: Sat, 10 Apr 2010 19:30:50 -0700 Subject: table_name_prefix and table_name_suffix are class_attributes instead of cattr_accessors. [#4230] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- activerecord/lib/active_record/base.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index d544c48a4c..002af07112 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -3,6 +3,7 @@ require 'set' require 'active_support/benchmarkable' require 'active_support/dependencies' require 'active_support/time' +require 'active_support/core_ext/class/attribute' require 'active_support/core_ext/class/attribute_accessors' require 'active_support/core_ext/class/delegating_attributes' require 'active_support/core_ext/class/inheritable_attributes' @@ -341,15 +342,15 @@ module ActiveRecord #:nodoc: # # If you are organising your models within modules you can add a prefix to the models within a namespace by defining # a singleton method in the parent module called table_name_prefix which returns your chosen prefix. - cattr_accessor :table_name_prefix, :instance_writer => false - @@table_name_prefix = "" + class_attribute :table_name_prefix, :instance_writer => false + self.table_name_prefix = "" ## # :singleton-method: # Works like +table_name_prefix+, but appends instead of prepends (set to "_basecamp" gives "projects_basecamp", # "people_basecamp"). By default, the suffix is the empty string. - cattr_accessor :table_name_suffix, :instance_writer => false - @@table_name_suffix = "" + class_attribute :table_name_suffix, :instance_writer => false + self.table_name_suffix = "" ## # :singleton-method: -- cgit v1.2.3