aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/fixtures.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-11-03 21:38:19 +0900
committerRyuta Kamizono <kamipo@gmail.com>2018-11-03 21:38:19 +0900
commit1812240f1ac28ef8e2e399d38548255328580b52 (patch)
tree98a62c2ae0b102bbec4763b1fd11db2ae48af35d /activerecord/lib/active_record/fixtures.rb
parent19f0f140746bfae588f145fcd89df1c8f6df3910 (diff)
downloadrails-1812240f1ac28ef8e2e399d38548255328580b52.tar.gz
rails-1812240f1ac28ef8e2e399d38548255328580b52.tar.bz2
rails-1812240f1ac28ef8e2e399d38548255328580b52.zip
Don't pass unused `connection` to `FixtureSet.new`
The `@connection` is no longer used since ee5ab22. Originally the `@connection` was useless because it is only used in `timestamp_column_names`, which is only used if `model_class` is given. If `model_class` is given, the `@connection` is always `model_class.connection`.
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
-rw-r--r--activerecord/lib/active_record/fixtures.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index b090c76a38..1dead09073 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -577,9 +577,8 @@ module ActiveRecord
fixtures_map = {}
fixture_sets = fixture_files.map do |fixture_set_name|
klass = class_names[fixture_set_name]
- conn = klass&.connection || connection
fixtures_map[fixture_set_name] = new( # ActiveRecord::FixtureSet.new
- conn,
+ nil,
fixture_set_name,
klass,
::File.join(fixtures_directory, fixture_set_name)
@@ -621,7 +620,7 @@ module ActiveRecord
attr_reader :table_name, :name, :fixtures, :model_class, :config
- def initialize(connection, name, class_name, path, config = ActiveRecord::Base)
+ def initialize(_, name, class_name, path, config = ActiveRecord::Base)
@name = name
@path = path
@config = config
@@ -630,8 +629,6 @@ module ActiveRecord
@fixtures = read_fixture_files(path)
- @connection = connection
-
@table_name = (model_class.respond_to?(:table_name) ?
model_class.table_name :
self.class.default_fixture_table_name(name, config))