diff options
| author | Neeraj Singh <neerajdotname@gmail.com> | 2013-07-02 01:07:02 +0530 |
|---|---|---|
| committer | Neeraj Singh <neerajdotname@gmail.com> | 2013-07-02 06:22:25 +0530 |
| commit | a8c888cca93021b71c887f5d4a01936a9e28389f (patch) | |
| tree | ec780a2f36710e360199a151ecf6b593ae6c3f2c /activerecord/lib/active_record/associations/builder | |
| parent | 1144d5e4a1bab6520b0ff6ffa26e04aeabfb3bc7 (diff) | |
| download | rails-a8c888cca93021b71c887f5d4a01936a9e28389f.tar.gz rails-a8c888cca93021b71c887f5d4a01936a9e28389f.tar.bz2 rails-a8c888cca93021b71c887f5d4a01936a9e28389f.zip | |
Removed deprecated options for assocations
Deprecated options `delete_sql`, `insert_sql`, `finder_sql` and `counter_sql`
have been deleted.
Diffstat (limited to 'activerecord/lib/active_record/associations/builder')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/collection_association.rb | 9 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb | 10 |
2 files changed, 0 insertions, 19 deletions
diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb index 9c6690b721..c24432c863 100644 --- a/activerecord/lib/active_record/associations/builder/collection_association.rb +++ b/activerecord/lib/active_record/associations/builder/collection_association.rb @@ -20,7 +20,6 @@ module ActiveRecord::Associations::Builder end def build - show_deprecation_warnings wrap_block_extension reflection = super CALLBACKS.each { |callback_name| define_callback(callback_name) } @@ -31,14 +30,6 @@ module ActiveRecord::Associations::Builder true end - def show_deprecation_warnings - [:finder_sql, :counter_sql].each do |name| - if options.include? name - ActiveSupport::Deprecation.warn("The :#{name} association option is deprecated. Please find an alternative (such as using scopes).") - end - end - end - def wrap_block_extension if block_extension @extension_module = mod = Module.new(&block_extension) diff --git a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb index bdac02b5bf..2a0d16ad2c 100644 --- a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb +++ b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb @@ -14,16 +14,6 @@ module ActiveRecord::Associations::Builder reflection end - def show_deprecation_warnings - super - - [:delete_sql, :insert_sql].each do |name| - if options.include? name - ActiveSupport::Deprecation.warn("The :#{name} association option is deprecated. Please find an alternative (such as using has_many :through).") - end - end - end - def define_destroy_hook name = self.name model.send(:include, Module.new { |