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/scoping | |
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/scoping')
-rw-r--r-- | activerecord/test/cases/scoping/relation_scoping_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/scoping/relation_scoping_test.rb b/activerecord/test/cases/scoping/relation_scoping_test.rb index a1ae57fdbb..3fbff7664b 100644 --- a/activerecord/test/cases/scoping/relation_scoping_test.rb +++ b/activerecord/test/cases/scoping/relation_scoping_test.rb @@ -10,7 +10,7 @@ require "models/person" require "models/reference" class RelationScopingTest < ActiveRecord::TestCase - fixtures :authors, :developers, :projects, :comments, :posts, :developers_projects + fixtures :authors, :author_addresses, :developers, :projects, :comments, :posts, :developers_projects setup do developers(:david) @@ -238,7 +238,7 @@ class RelationScopingTest < ActiveRecord::TestCase end class NestedRelationScopingTest < ActiveRecord::TestCase - fixtures :authors, :developers, :projects, :comments, :posts + fixtures :authors, :author_addresses, :developers, :projects, :comments, :posts def test_merge_options Developer.where("salary = 80000").scoping do |