diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-01-18 12:30:47 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-01-18 12:30:47 +0000 |
| commit | 5937bd02dee112646469848d7fe8a8bfcef5b4c1 (patch) | |
| tree | 9406b572ea9d9fadcfabca94084834e1188f8c25 /activerecord/lib/active_record | |
| parent | 5f759ff063b8ed054cdde0ed4f3593ef89fe59b7 (diff) | |
| download | rails-5937bd02dee112646469848d7fe8a8bfcef5b4c1.tar.gz rails-5937bd02dee112646469848d7fe8a8bfcef5b4c1.tar.bz2 rails-5937bd02dee112646469848d7fe8a8bfcef5b4c1.zip | |
Undeprecate the :extend option
Suggested by @dhh.
It doesn't affect the generated SQL, so seems reasonable to continue to
allow it as an association option.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_scope.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/collection_association.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb index 1303822868..300f67959d 100644 --- a/activerecord/lib/active_record/associations/association_scope.rb +++ b/activerecord/lib/active_record/associations/association_scope.rb @@ -16,6 +16,7 @@ module ActiveRecord def scope scope = klass.unscoped scope.merge! eval_scope(klass, reflection.scope) if reflection.scope + scope.extending! Array(options[:extend]) add_constraints(scope) end diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb index fcdfc1e150..fdead16761 100644 --- a/activerecord/lib/active_record/associations/builder/collection_association.rb +++ b/activerecord/lib/active_record/associations/builder/collection_association.rb @@ -6,7 +6,8 @@ module ActiveRecord::Associations::Builder CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove] def valid_options - super + [:table_name, :finder_sql, :counter_sql, :before_add, :after_add, :before_remove, :after_remove] + super + [:table_name, :finder_sql, :counter_sql, :before_add, + :after_add, :before_remove, :after_remove, :extend] end attr_reader :block_extension, :extension_module |