diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-11-03 22:35:23 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-11-03 22:35:23 +0900 |
| commit | 06ef4c3fa874f6dc166bce06d8158d9c5af78195 (patch) | |
| tree | 1d1c7a0c94eb297a473ba0ea30cff943b4451675 /activerecord/lib/active_record/fixtures.rb | |
| parent | 1812240f1ac28ef8e2e399d38548255328580b52 (diff) | |
| download | rails-06ef4c3fa874f6dc166bce06d8158d9c5af78195.tar.gz rails-06ef4c3fa874f6dc166bce06d8158d9c5af78195.tar.bz2 rails-06ef4c3fa874f6dc166bce06d8158d9c5af78195.zip | |
Don't pass useless `table_name` to `ModelMetadata.new`
The `model_metadata` is only used if `model_class` is given.
If `model_class` is given, the `table_name` is always
`model_class.table_name`.
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 1dead09073..1248ed00c5 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -629,9 +629,7 @@ module ActiveRecord @fixtures = read_fixture_files(path) - @table_name = (model_class.respond_to?(:table_name) ? - model_class.table_name : - self.class.default_fixture_table_name(name, config)) + @table_name = model_class&.table_name || self.class.default_fixture_table_name(name, config) end def [](x) |