diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-07-03 03:05:43 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-07-03 03:05:43 -0700 |
| commit | b70dd49060ec675f0e97efaeaa7d5c0878897ea3 (patch) | |
| tree | 91587bb9dc582b11150b4a1ac53979e33d0aff04 /activerecord | |
| parent | 33c61e326525c0c46871de067eeb02ea1bc51da5 (diff) | |
| parent | 28d1d3f0fbbd8dd6c312ff69563c97bf58b5ccaa (diff) | |
| download | rails-b70dd49060ec675f0e97efaeaa7d5c0878897ea3.tar.gz rails-b70dd49060ec675f0e97efaeaa7d5c0878897ea3.tar.bz2 rails-b70dd49060ec675f0e97efaeaa7d5c0878897ea3.zip | |
Merge pull request #11264 from vipulnsward/deprecate_find_table_name
Remove deprecated `ActiveRecord::Fixtures.find_table_name`
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 162c42e2c9..f76246f7a3 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,8 @@ +* Remove deprecated `ActiveRecord::Fixtures.find_table_name` in favor of + `ActiveRecord::Fixtures.default_fixture_model_name`. + + *Vipul A M* + * Removed deprecated `columns_for_remove` from `SchemaStatements`. *Neeraj Singh* diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 70eda332b3..47d4f3637f 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -379,12 +379,6 @@ module ActiveRecord @@all_cached_fixtures = Hash.new { |h,k| h[k] = {} } - def self.find_table_name(fixture_set_name) # :nodoc: - ActiveSupport::Deprecation.warn( - "ActiveRecord::Fixtures.find_table_name is deprecated and shall be removed from future releases. Use ActiveRecord::Fixtures.default_fixture_model_name instead.") - default_fixture_model_name(fixture_set_name) - end - def self.default_fixture_model_name(fixture_set_name) # :nodoc: ActiveRecord::Base.pluralize_table_names ? fixture_set_name.singularize.camelize : |