diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 10:49:49 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 11:58:44 -0300 |
| commit | ede8c199a85cfbb6457d5630ec1e285e5ec49313 (patch) | |
| tree | acc9d918f9b85ffde8f12200cb949939339cdaeb | |
| parent | 9013e28e52eba3a6ffcede26f85df48d264b8951 (diff) | |
| download | rails-ede8c199a85cfbb6457d5630ec1e285e5ec49313.tar.gz rails-ede8c199a85cfbb6457d5630ec1e285e5ec49313.tar.bz2 rails-ede8c199a85cfbb6457d5630ec1e285e5ec49313.zip | |
Remove deprecated `Reflection#source_macro`
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/reflection.rb | 19 |
2 files changed, 4 insertions, 19 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 0f2da1d287..c27bffdfe7 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* Remove deprecated `Reflection#source_macro`. + + *Rafael Mendonça França* + * Remove deprecated `symbolized_base_class` and `symbolized_sti_name`. *Rafael Mendonça França* diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index 7696ef13c7..66f2b6b768 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -153,15 +153,6 @@ module ActiveRecord JoinKeys.new(foreign_key, active_record_primary_key) end - def source_macro - ActiveSupport::Deprecation.warn(<<-MSG.squish) - ActiveRecord::Base.source_macro is deprecated and will be removed - without replacement. - MSG - - macro - end - def constraints scope_chain.flatten end @@ -763,16 +754,6 @@ module ActiveRecord source_reflection.join_keys(association_klass) end - # The macro used by the source association - def source_macro - ActiveSupport::Deprecation.warn(<<-MSG.squish) - ActiveRecord::Base.source_macro is deprecated and will be removed - without replacement. - MSG - - source_reflection.source_macro - end - # A through association is nested if there would be more than one join table def nested? chain.length > 2 |