diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-03-18 19:58:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-18 19:58:42 -0400 |
| commit | 6e94127dd21271f3fcebc865c23974a75de20f3c (patch) | |
| tree | 7aa8745041f98818abda264227ab1dbe55d5b80b /railties/test/isolation | |
| parent | ded9a154241989cc65f4f38d7c9643f2cdf01a65 (diff) | |
| parent | 8f3066fccc3b80fa3bfaa2830858f61f046bd61a (diff) | |
| download | rails-6e94127dd21271f3fcebc865c23974a75de20f3c.tar.gz rails-6e94127dd21271f3fcebc865c23974a75de20f3c.tar.bz2 rails-6e94127dd21271f3fcebc865c23974a75de20f3c.zip | |
Merge pull request #35663 from eileencodes/fix-database-configuration-when-not-actually-a-three-tier
Fix database configuration when adding another config level
Diffstat (limited to 'railties/test/isolation')
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 14cdf1ab7c..3fcfaa9623 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -123,6 +123,8 @@ module TestHelpers adapter: sqlite3 pool: 5 timeout: 5000 + variables: + statement_timeout: 1000 development: primary: <<: *default |