SRE-xxx: Add env var to disable statement_timeout

Adds a `DISABLE_DATABASE_STATEMENT_TIMEOUT` env var to prevent enforcing
a `statement_timeout` in the DB config. The previous behaviour conflicts
with PGBouncer and cannot be disabled.

Author: John Carlyle-Clarke

CHANGELOG.md

@@ -1,8 +1,15 @@
+# v1.23.0 (2019-04-24)
+
+Features:
+
+- Adds a `DISABLE_DATABASE_STATEMENT_TIMEOUT` env var to prevent enforcing a `statement_timeout` in the DB config.
+  The previous behaviour conflicts with PGBouncer and cannot be disabled.
+
 # v1.22.0 (2018-08-29)
 
 Features:
 
- - Allows specifiying `BASE_NEW_RELIC_APP_NAME` instead of `NEW_RELIC_APP_NAME`, which reports to New Relic per Hopper service.
+ - Allows specifying `BASE_NEW_RELIC_APP_NAME` instead of `NEW_RELIC_APP_NAME`, which reports to New Relic per Hopper service.
 
 # v1.21.0 (2018-03-27)
 

lib/roo_on_rails/railties/database.rb

@@ -8,11 +8,13 @@ class Database < Rails::Railtie
 
             config = ActiveRecord::Base.configurations[Rails.env]
             config['variables'] ||= {}
-            config['variables']['statement_timeout'] = ENV.fetch('DATABASE_STATEMENT_TIMEOUT', 200)
+            disable_set_timeout = ['1', 'yes', 'true'].include?(ENV.fetch('DISABLE_DATABASE_STATEMENT_TIMEOUT', 'false').downcase)
+            if not disable_set_timeout
+              config['variables']['statement_timeout'] = ENV.fetch('DATABASE_STATEMENT_TIMEOUT', 200)
+            end
             if ENV.key?('DATABASE_REAPING_FREQUENCY')
               config['reaping_frequency'] = ENV['DATABASE_REAPING_FREQUENCY']
             end
-
             ActiveRecord::Base.establish_connection
           end
         end

lib/roo_on_rails/version.rb

@@ -1,3 +1,3 @@
 module RooOnRails
-  VERSION = '1.22.0'.freeze
+  VERSION = '1.23.0'.freeze
 end

roo_on_rails.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'routemaster-client'
   spec.add_runtime_dependency 'json-jwt', '~> 1.8'
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'bundler', '~> 2.0.1'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'thor', '~> 0.19'