aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/model_schema.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2012-10-19 18:08:51 +0100
committerJon Leighton <j@jonathanleighton.com>2012-10-19 18:12:54 +0100
commit83846838252397b3781eed165ca301e05db39293 (patch)
tree871c8e6734e82a1d2d6ce9122c5870b80d9f9cfc /activerecord/lib/active_record/model_schema.rb
parent18e979eea3844a9d293a547528d40ffde198b719 (diff)
downloadrails-83846838252397b3781eed165ca301e05db39293.tar.gz
rails-83846838252397b3781eed165ca301e05db39293.tar.bz2
rails-83846838252397b3781eed165ca301e05db39293.zip
Get rid of the ActiveRecord::Model::DeprecationProxy thing.
I think it's going to be too much pain to try to transition the :active_record load hook from executing against Base to executing against Model. For example, after Model is included in Base, and modules included in Model will no longer get added to the ancestors of Base. So plugins which wish to be compatible with both Model and Base should use the :active_record_model load hook which executes *before* Base gets loaded. In general, ActiveRecord::Model is an advanced feature at the moment and probably most people will continue to inherit from ActiveRecord::Base for the time being.
Diffstat (limited to 'activerecord/lib/active_record/model_schema.rb')
-rw-r--r--activerecord/lib/active_record/model_schema.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb
index 99de16cd33..93bd21d7e9 100644
--- a/activerecord/lib/active_record/model_schema.rb
+++ b/activerecord/lib/active_record/model_schema.rb
@@ -1,6 +1,6 @@
module ActiveRecord
- ActiveSupport.on_load(:active_record_config) do
+ ActiveSupport.on_load(:active_record_model) do
mattr_accessor :primary_key_prefix_type, instance_accessor: false
mattr_accessor :table_name_prefix, instance_accessor: false