diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-01-03 20:38:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 20:38:50 -0500 |
| commit | eeac6151a55cb7d5f799e1ae33aa64a839cbc3aa (patch) | |
| tree | 18637198355d17b3ed58ac855783f16ef488b01a /activerecord/test/cases/scoping | |
| parent | 5c40239d3104543e70508360d27584a3e4dc5baf (diff) | |
| parent | e75fcdf3feaca7fac44dde23ea3059399c0ff384 (diff) | |
| download | rails-eeac6151a55cb7d5f799e1ae33aa64a839cbc3aa.tar.gz rails-eeac6151a55cb7d5f799e1ae33aa64a839cbc3aa.tar.bz2 rails-eeac6151a55cb7d5f799e1ae33aa64a839cbc3aa.zip | |
Merge pull request #21233 from mtsmfm/disable-referential-integrity-without-superuser-privileges
Use `SET CONSTRAINTS` for `disable_referential_integrity` without superuser privileges
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 |