diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-08-01 19:11:46 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-08-01 19:13:55 +0100 |
| commit | 0c527026308627652c42ed8a6f26a21d3bbc7a5b (patch) | |
| tree | 8efafdf41c335dfe39a13dcea712711b71b47a44 /activerecord/lib | |
| parent | 6764b7ba23ff42998f2b61ecc3435382bdbd1aeb (diff) | |
| download | rails-0c527026308627652c42ed8a6f26a21d3bbc7a5b.tar.gz rails-0c527026308627652c42ed8a6f26a21d3bbc7a5b.tar.bz2 rails-0c527026308627652c42ed8a6f26a21d3bbc7a5b.zip | |
Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."
This reverts commit a79bfa92e7bdc31b346d13ee5447d3fdac382bfb.
Conflicts:
activerecord/CHANGELOG.md
We shouldn't introducing deprecations in point releases.
It will be deprecated in 4.0 instead.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/collection_association.rb | 11 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb | 10 |
2 files changed, 0 insertions, 21 deletions
diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb index f67fe17260..35f9a3ae8e 100644 --- a/activerecord/lib/active_record/associations/builder/collection_association.rb +++ b/activerecord/lib/active_record/associations/builder/collection_association.rb @@ -1,5 +1,3 @@ -require 'active_support/deprecation' - module ActiveRecord::Associations::Builder class CollectionAssociation < Association #:nodoc: CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove] @@ -21,7 +19,6 @@ module ActiveRecord::Associations::Builder end def build - show_deprecation_warnings wrap_block_extension reflection = super CALLBACKS.each { |callback_name| define_callback(callback_name) } @@ -32,14 +29,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 - private def wrap_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 b997b2c3cf..0b634ab944 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 @@ -11,16 +11,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 - private def define_destroy_hook |