diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-03-27 17:24:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-27 17:24:27 -0400 |
| commit | c1faca6333abe4b938b98fedc8d1f47b88209ecf (patch) | |
| tree | 6ae0cf29da8404bf063e9d6cf36bbf718867f32a /activerecord/test/cases/relation/merging_test.rb | |
| parent | 8c658a0ecc7f2b5fc015d424baf9edf6f3eb2b0b (diff) | |
| parent | ef6391d4537d9ff1ce46da786a1fccccd886e246 (diff) | |
| download | rails-c1faca6333abe4b938b98fedc8d1f47b88209ecf.tar.gz rails-c1faca6333abe4b938b98fedc8d1f47b88209ecf.tar.bz2 rails-c1faca6333abe4b938b98fedc8d1f47b88209ecf.zip | |
Merge pull request #27636 from mtsmfm/disable-referential-integrity-without-superuser-privilege-take-2
Use `SET CONSTRAINTS` for `disable_referential_integrity` without superuser privileges (take 2)
Diffstat (limited to 'activerecord/test/cases/relation/merging_test.rb')
| -rw-r--r-- | activerecord/test/cases/relation/merging_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb index 278dac8171..9e95149ede 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, :posts + fixtures :developers, :comments, :authors, :author_addresses, :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, :developers + fixtures :posts, :authors, :author_addresses, :developers test "merging where relations" do hello_by_bob = Post.where(body: "hello").joins(:author). |