diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-07-05 11:50:55 -0700 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-07-05 11:50:55 -0700 |
| commit | 6787507883972bc3acb83c105fb753a8ca69fd1e (patch) | |
| tree | 44fd8c8885327b2dee129f7ffa81930a9a806501 /activerecord | |
| parent | 5780b9618e76c3c9e16e40de5171516bc2918c26 (diff) | |
| download | rails-6787507883972bc3acb83c105fb753a8ca69fd1e.tar.gz rails-6787507883972bc3acb83c105fb753a8ca69fd1e.tar.bz2 rails-6787507883972bc3acb83c105fb753a8ca69fd1e.zip | |
Re-enable foriegn key tests on MySQL
This reverts commit e84799d, e31104c and e6ca8e2
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/associations/belongs_to_associations_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/schema/schema.rb | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb index 4238681905..c9bdfb88ae 100644 --- a/activerecord/test/cases/associations/belongs_to_associations_test.rb +++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb @@ -936,7 +936,6 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase end end -unless current_adapter?(:MysqlAdapter, :Mysql2Adapter) class BelongsToWithForeignKeyTest < ActiveRecord::TestCase def test_destroy_linked_models address = AuthorAddress.create! @@ -945,4 +944,3 @@ class BelongsToWithForeignKeyTest < ActiveRecord::TestCase author.destroy! end end -end diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index 7dbb29d9b0..932c9ba5d9 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -84,9 +84,7 @@ ActiveRecord::Schema.define do create_table :author_addresses, force: true do |t| end - unless current_adapter?(:MysqlAdapter, :Mysql2Adapter) - add_foreign_key :authors, :author_addresses - end + add_foreign_key :authors, :author_addresses create_table :author_favorites, force: true do |t| t.column :author_id, :integer |