diff options
author | Yves Senn <yves.senn@gmail.com> | 2014-07-16 10:06:55 +0200 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2014-07-16 10:06:55 +0200 |
commit | 3eca0621602a9f9dbc5e81f007db888d36813ed8 (patch) | |
tree | b621b02ef12656052af36f6eb265d3c8ecf858f5 /activerecord | |
parent | 6f15762fa601a5e3238888038684aae7446cfc16 (diff) | |
download | rails-3eca0621602a9f9dbc5e81f007db888d36813ed8.tar.gz rails-3eca0621602a9f9dbc5e81f007db888d36813ed8.tar.bz2 rails-3eca0621602a9f9dbc5e81f007db888d36813ed8.zip |
use foreign key DSL in our tests.
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb | 4 | ||||
-rw-r--r-- | activerecord/test/schema/schema.rb | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb b/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb index ec73ec35aa..9c49599d34 100644 --- a/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb +++ b/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb @@ -6,12 +6,12 @@ module ActiveRecord class SchemaMigrationsTest < ActiveRecord::TestCase def test_renaming_index_on_foreign_key connection.add_index "engines", "car_id" - connection.execute "ALTER TABLE engines ADD CONSTRAINT fk_engines_cars FOREIGN KEY (car_id) REFERENCES cars(id)" + connection.add_foreign_key :engines, :cars, name: "fk_engines_cars" connection.rename_index("engines", "index_engines_on_car_id", "idx_renamed") assert_equal ["idx_renamed"], connection.indexes("engines").map(&:name) ensure - connection.execute "ALTER TABLE engines DROP FOREIGN KEY fk_engines_cars" + connection.remove_foreign_key :engines, name: "fk_engines_cars" end def test_initializes_schema_migrations_for_encoding_utf8mb4 diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index 146190fc19..a8b21904ac 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -860,9 +860,8 @@ ActiveRecord::Schema.define do create_table :fk_test_has_pk, force: true, primary_key: "pk_id" do |t| end - execute "ALTER TABLE fk_test_has_fk ADD CONSTRAINT fk_name FOREIGN KEY (#{quote_column_name 'fk_id'}) REFERENCES #{quote_table_name 'fk_test_has_pk'} (#{quote_column_name 'pk_id'})" - - execute "ALTER TABLE lessons_students ADD CONSTRAINT student_id_fk FOREIGN KEY (#{quote_column_name 'student_id'}) REFERENCES #{quote_table_name 'students'} (#{quote_column_name 'id'})" + add_foreign_key :fk_test_has_fk, :fk_test_has_pk, column: "fk_id", name: "fk_name", primary_key: "pk_id" + add_foreign_key :lessons_students, :students end create_table :overloaded_types, force: true do |t| |