Skip to content

Commit 400ba78

Browse files
committed
Remove deprecated #insert_fixtures from the database adapters
1 parent 45b4d5f commit 400ba78

5 files changed

Lines changed: 5 additions & 43 deletions

File tree

activerecord/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* Remove deprecated `#insert_fixtures` from the database adapters.
2+
3+
*Rafael Mendonça França*
4+
15
* Remove deprecated `ActiveRecord::ConnectionAdapters::SQLite3Adapter#valid_alter_table_type?`.
26

37
*Rafael Mendonça França*

activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ def reset_sequence!(table, column, sequence = nil)
336336

337337
# Inserts the given fixture into the table. Overridden in adapters that require
338338
# something beyond a simple insert (eg. Oracle).
339-
# Most of adapters should implement `insert_fixtures` that leverages bulk SQL insert.
339+
# Most of adapters should implement `insert_fixtures_set` that leverages bulk SQL insert.
340340
# We keep this method to provide fallback
341341
# for databases like sqlite that do not support bulk inserts.
342342
def insert_fixture(fixture, table_name)
@@ -365,18 +365,6 @@ def insert_fixture(fixture, table_name)
365365
execute manager.to_sql, "Fixture Insert"
366366
end
367367

368-
# Inserts a set of fixtures into the table. Overridden in adapters that require
369-
# something beyond a simple insert (eg. Oracle).
370-
def insert_fixtures(fixtures, table_name)
371-
ActiveSupport::Deprecation.warn(<<-MSG.squish)
372-
`insert_fixtures` is deprecated and will be removed in the next version of Rails.
373-
Consider using `insert_fixtures_set` for performance improvement.
374-
MSG
375-
return if fixtures.empty?
376-
377-
execute(build_fixture_sql(fixtures, table_name), "Fixtures Insert")
378-
end
379-
380368
def insert_fixtures_set(fixture_set, tables_to_delete = [])
381369
fixture_inserts = fixture_set.map do |table_name, fixtures|
382370
next if fixtures.empty?

activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -378,14 +378,6 @@ def foreign_keys(table_name)
378378
end
379379
end
380380

381-
def insert_fixtures(rows, table_name)
382-
ActiveSupport::Deprecation.warn(<<-MSG.squish)
383-
`insert_fixtures` is deprecated and will be removed in the next version of Rails.
384-
Consider using `insert_fixtures_set` for performance improvement.
385-
MSG
386-
insert_fixtures_set(table_name => rows)
387-
end
388-
389381
def insert_fixtures_set(fixture_set, tables_to_delete = [])
390382
disable_referential_integrity do
391383
transaction(requires_new: true) do

activerecord/test/cases/adapters/postgresql/array_test.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,6 @@ def test_insert_fixture
226226
assert_equal(PgArray.last.tags, tag_values)
227227
end
228228

229-
def test_insert_fixtures
230-
tag_values = ["val1", "val2", "val3_with_'_multiple_quote_'_chars"]
231-
assert_deprecated do
232-
@connection.insert_fixtures([{ "tags" => tag_values }], "pg_arrays")
233-
end
234-
assert_equal(PgArray.last.tags, tag_values)
235-
end
236-
237229
def test_attribute_for_inspect_for_array_field
238230
record = PgArray.new { |a| a.ratings = (1..10).to_a }
239231
assert_equal("[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]", record.attribute_for_inspect(:ratings))

activerecord/test/cases/fixtures_test.rb

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -301,20 +301,6 @@ def test_auto_value_on_primary_key
301301
assert_equal fixtures, result.to_a
302302
end
303303

304-
def test_deprecated_insert_fixtures
305-
fixtures = [
306-
{ "name" => "first", "wheels_count" => 2 },
307-
{ "name" => "second", "wheels_count" => 3 }
308-
]
309-
conn = ActiveRecord::Base.connection
310-
conn.delete("DELETE FROM aircraft")
311-
assert_deprecated do
312-
conn.insert_fixtures(fixtures, "aircraft")
313-
end
314-
result = conn.select_all("SELECT name, wheels_count FROM aircraft ORDER BY id")
315-
assert_equal fixtures, result.to_a
316-
end
317-
318304
def test_broken_yaml_exception
319305
badyaml = Tempfile.new ["foo", ".yml"]
320306
badyaml.write "a: : "

0 commit comments

Comments
 (0)