diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-08-01 19:15:23 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-08-01 19:46:31 +0100 |
| commit | 7f3b475608d7c0b7faadd7c1430797e91b644a35 (patch) | |
| tree | dc5b9dad935693f059284fcc1f1e39f9928113a6 /activerecord/lib/active_record/associations/builder | |
| parent | fb08039cb21134ae51739255486c2f08bd0c3028 (diff) | |
| download | rails-7f3b475608d7c0b7faadd7c1430797e91b644a35.tar.gz rails-7f3b475608d7c0b7faadd7c1430797e91b644a35.tar.bz2 rails-7f3b475608d7c0b7faadd7c1430797e91b644a35.zip | |
Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."
This reverts commit 3803fcce26b837c0117f7d278b83c366dc4ed370.
Conflicts:
activerecord/CHANGELOG.md
It will be deprecated only in 4.0, and removed properly in 4.1.
Diffstat (limited to 'activerecord/lib/active_record/associations/builder')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/collection_association.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb index b28d6a746c..af81af4ad2 100644 --- a/activerecord/lib/active_record/associations/builder/collection_association.rb +++ b/activerecord/lib/active_record/associations/builder/collection_association.rb @@ -3,7 +3,7 @@ module ActiveRecord::Associations::Builder CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove] def valid_options - super + [:table_name, :before_add, :after_add, :before_remove, :after_remove] + super + [:table_name, :finder_sql, :counter_sql, :before_add, :after_add, :before_remove, :after_remove] end attr_reader :block_extension, :extension_module 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 a30e2dab26..7f79ef25f2 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 @@ -5,7 +5,7 @@ module ActiveRecord::Associations::Builder end def valid_options - super + [:join_table, :association_foreign_key] + super + [:join_table, :association_foreign_key, :delete_sql, :insert_sql] end def build |