diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-01 17:55:20 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-01 17:55:20 -0700 |
| commit | 11c2e80babdca378dc035d1529ea336004c72d75 (patch) | |
| tree | ef7a5f5f6bcaa472ff8beb4c458118849d71e6a5 /activerecord/lib | |
| parent | 6518f12b73546ee566ecef76f8d13da6f16272a0 (diff) | |
| parent | a8c888cca93021b71c887f5d4a01936a9e28389f (diff) | |
| download | rails-11c2e80babdca378dc035d1529ea336004c72d75.tar.gz rails-11c2e80babdca378dc035d1529ea336004c72d75.tar.bz2 rails-11c2e80babdca378dc035d1529ea336004c72d75.zip | |
Merge pull request #11222 from neerajdotname/removed-deprecation-for-sql
Removed deprecated options for assocations
Diffstat (limited to 'activerecord/lib')
| -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 { |