diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-01-03 22:11:16 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-01-03 22:11:16 -0500 |
| commit | 127509c071b4f983f2beafc8766e990670a21215 (patch) | |
| tree | d8804c1343af0a30cb26d72c8d06150fbfd30b16 /activerecord/test/cases/relation | |
| parent | b6ffb5efcb694a9302453b8d2081f02090a90c62 (diff) | |
| download | rails-127509c071b4f983f2beafc8766e990670a21215.tar.gz rails-127509c071b4f983f2beafc8766e990670a21215.tar.bz2 rails-127509c071b4f983f2beafc8766e990670a21215.zip | |
Revert "Merge pull request #21233 from mtsmfm/disable-referential-integrity-without-superuser-privileges"
This reverts commit eeac6151a55cb7d5f799e1ae33aa64a839cbc3aa, reversing
changes made to 5c40239d3104543e70508360d27584a3e4dc5baf.
Reason: Broke the isolated tests.
https://travis-ci.org/rails/rails/builds/188721346
Diffstat (limited to 'activerecord/test/cases/relation')
| -rw-r--r-- | activerecord/test/cases/relation/merging_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/relation/where_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb index 9e95149ede..278dac8171 100644 --- a/activerecord/test/cases/relation/merging_test.rb +++ b/activerecord/test/cases/relation/merging_test.rb @@ -8,7 +8,7 @@ require "models/project" require "models/rating" class RelationMergingTest < ActiveRecord::TestCase - fixtures :developers, :comments, :authors, :author_addresses, :posts + fixtures :developers, :comments, :authors, :posts def test_relation_merging devs = Developer.where("salary >= 80000").merge(Developer.limit(2)).merge(Developer.order("id ASC").where("id < 3")) @@ -114,7 +114,7 @@ class RelationMergingTest < ActiveRecord::TestCase end class MergingDifferentRelationsTest < ActiveRecord::TestCase - fixtures :posts, :authors, :author_addresses, :developers + fixtures :posts, :authors, :developers test "merging where relations" do hello_by_bob = Post.where(body: "hello").joins(:author). diff --git a/activerecord/test/cases/relation/where_test.rb b/activerecord/test/cases/relation/where_test.rb index c7b2ac90fb..ed8ffddcf5 100644 --- a/activerecord/test/cases/relation/where_test.rb +++ b/activerecord/test/cases/relation/where_test.rb @@ -15,7 +15,7 @@ require "models/vertex" module ActiveRecord class WhereTest < ActiveRecord::TestCase - fixtures :posts, :edges, :authors, :author_addresses, :binaries, :essays, :cars, :treasures, :price_estimates + fixtures :posts, :edges, :authors, :binaries, :essays, :cars, :treasures, :price_estimates def test_where_copies_bind_params author = authors(:david) |