From 6955d864ceb0ba994ef4fb4c5e866463f247944b Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Wed, 11 Jun 2014 08:23:17 +0200 Subject: fk: rename `dependent` to `on_delete` --- .../test/cases/migration/foreign_key_test.rb | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'activerecord/test') diff --git a/activerecord/test/cases/migration/foreign_key_test.rb b/activerecord/test/cases/migration/foreign_key_test.rb index a43f7e48c8..f391e9ef41 100644 --- a/activerecord/test/cases/migration/foreign_key_test.rb +++ b/activerecord/test/cases/migration/foreign_key_test.rb @@ -91,8 +91,8 @@ module ActiveRecord end end - def test_add_dependent_restrict_foreign_key - @connection.add_foreign_key :astronauts, :rockets, column: "rocket_id", dependent: :restrict + def test_add_on_delete_restrict_foreign_key + @connection.add_foreign_key :astronauts, :rockets, column: "rocket_id", on_delete: :restrict foreign_keys = @connection.foreign_keys("astronauts") assert_equal 1, foreign_keys.size @@ -100,30 +100,30 @@ module ActiveRecord fk = foreign_keys.first if current_adapter?(:MysqlAdapter, :Mysql2Adapter) # ON DELETE RESTRICT is the default on MySQL - assert_equal nil, fk.dependent + assert_equal nil, fk.on_delete else - assert_equal :restrict, fk.dependent + assert_equal :restrict, fk.on_delete end end - def test_add_dependent_delete_foreign_key - @connection.add_foreign_key :astronauts, :rockets, column: "rocket_id", dependent: :delete + def test_add_on_delete_cascade_foreign_key + @connection.add_foreign_key :astronauts, :rockets, column: "rocket_id", on_delete: :cascade foreign_keys = @connection.foreign_keys("astronauts") assert_equal 1, foreign_keys.size fk = foreign_keys.first - assert_equal :delete, fk.dependent + assert_equal :cascade, fk.on_delete end - def test_add_dependent_nullify_foreign_key - @connection.add_foreign_key :astronauts, :rockets, column: "rocket_id", dependent: :nullify + def test_add_on_delete_nullify_foreign_key + @connection.add_foreign_key :astronauts, :rockets, column: "rocket_id", on_delete: :nullify foreign_keys = @connection.foreign_keys("astronauts") assert_equal 1, foreign_keys.size fk = foreign_keys.first - assert_equal :nullify, fk.dependent + assert_equal :nullify, fk.on_delete end def test_remove_foreign_key_inferes_column @@ -155,11 +155,11 @@ module ActiveRecord assert_match %r{\s+add_foreign_key "fk_test_has_fk", "fk_test_has_pk", column: "fk_id", primary_key: "id", name: "fk_name"$}, output end - def test_schema_dumping_dependent_option - @connection.add_foreign_key :astronauts, :rockets, column: "rocket_id", dependent: :nullify + def test_schema_dumping_on_delete_option + @connection.add_foreign_key :astronauts, :rockets, column: "rocket_id", on_delete: :nullify output = dump_table_schema "astronauts" - assert_match %r{\s+add_foreign_key "astronauts",.+dependent: :nullify$}, output + assert_match %r{\s+add_foreign_key "astronauts",.+on_delete: :nullify$}, output end class CreateCitiesAndHousesMigration < ActiveRecord::Migration -- cgit v1.2.3