roo_on_rails 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1793f84c10a291804b1d7388cf98f5335bb2b65e983948b10bb37341dc46067d
-  data.tar.gz: c2e3632d75d7b58edf80f0c4091657b7012d5e8bb6e42aa764f8da922fd3f3a0
+  metadata.gz: 779360e44252a1b944aa8591e5a1996a7f461394fa8907ddf41428bb7212743d
+  data.tar.gz: f2a27f71b29dacf50739cabcdcd88cdfc89d37deeaf1bae8138a8ac929336c75
 SHA512:
-  metadata.gz: 69f25ad9734cb3ffc9b19af0a9b62a3a15e7b886e5f853d203205319e31098a9b6b6b517625f5082d3bdc0f002651007102a8a4ccbb452ccf47cf30e4fe27b8e
-  data.tar.gz: e08116946c5330dbcd17212d266703e97cbf4746d40ce45caa7f682d1ca3b76b7dcc50f1fc0b622822bf0a125e568955d68d5dd279da6b18cdb3212d503cbb74
+  metadata.gz: bac595bc2dbcfcabfb479edbf0278399ce3911868b2da02b88051533503ee3891660d28c057e3a2f5301386990effdd5ce649630bc357a4d01db3796af1a1646
+  data.tar.gz: 220e8c0bb4b9d1734a8850bdb573adeade6c5f7782be7cf9ed09e7010222f0f2196519a2fc6831585a8bdfb88fd864b60af37aa3d02008e0cc5ca0c28750d788

data/CHANGELOG.md

@@ -1,5 +1,9 @@
-# v2.2.0
+# v2.2.2
+- Drops Railtie::Database. STATEMENT_TIMEOUT no longer set by this gem.
+
+# v2.2.1
 - Drops ActiveRecord::Base.establish_connection from Railtie::Database.
+
 # v2.2.0
 
 Breaking changes:

data/lib/roo_on_rails/version.rb

@@ -1,3 +1,3 @@
 module RooOnRails
-  VERSION = '2.2.1'.freeze
+  VERSION = '2.2.2'.freeze
 end

data/lib/roo_on_rails.rb

@@ -6,7 +6,6 @@ end
 if defined?(Rails)
   require 'dotenv/rails-now'
   require 'roo_on_rails/railties/env'
-  require 'roo_on_rails/railties/database'
   require 'roo_on_rails/railties/http'
   require 'roo_on_rails/railties/sidekiq_integration'
   require 'roo_on_rails/railties/rake_tasks'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roo_on_rails
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Julien Letessier
@@ -461,7 +461,6 @@ files:
 - lib/roo_on_rails/papertrail_client.rb
 - lib/roo_on_rails/rack/populate_env_from_jwt.rb
 - lib/roo_on_rails/rack/safe_timeouts.rb
-- lib/roo_on_rails/railties/database.rb
 - lib/roo_on_rails/railties/env.rb
 - lib/roo_on_rails/railties/google_oauth.rb
 - lib/roo_on_rails/railties/http.rb

data/lib/roo_on_rails/railties/database.rb

@@ -1,49 +0,0 @@
-module RooOnRails
-  module Railties
-    class Database < Rails::Railtie
-      initializer 'roo_on_rails.database', after: 'active_record.initialize_database' do
-        ActiveSupport.on_load :active_record do
-          Rails.logger.debug('[roo_on_rails.database] loading')
-
-          if Gem::Version.new(Rails.version) >= Gem::Version.new('6.1')
-            configs = ActiveRecord::Base.configurations.configurations
-            old_url_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: 'primary')
-            new_config_hash = old_url_config.configuration_hash.deep_dup
-            new_config_hash[:variables] ||= {}
-            statement_timeout = ENV.fetch('DATABASE_STATEMENT_TIMEOUT', 200)
-            # Use -1 to disable setting the statement timeout
-            new_config_hash[:variables][:statement_timeout] = statement_timeout unless statement_timeout == '-1'
-            new_config_hash[:reaping_frequency] = ENV['DATABASE_REAPING_FREQUENCY'] if ENV.key?('DATABASE_REAPING_FREQUENCY')
-            if old_url_config.respond_to?(:url)
-              new_url_config = ActiveRecord::DatabaseConfigurations::UrlConfig.new(
-                old_url_config.env_name,
-                old_url_config.name,
-                old_url_config.url,
-                new_config_hash
-              )
-            else
-              new_url_config = ActiveRecord::DatabaseConfigurations::HashConfig.new(
-                old_url_config.env_name,
-                old_url_config.name,
-                new_config_hash
-              )
-            end
-            configs.delete(old_url_config)
-            configs << new_url_config
-          else
-            config = ActiveRecord::Base.configurations[Rails.env]
-            config['variables'] ||= {}
-            statement_timeout = ENV.fetch('DATABASE_STATEMENT_TIMEOUT', 200)
-            # Use -1 to disable setting the statement timeout
-            unless statement_timeout == '-1'
-              config['variables']['statement_timeout'] = statement_timeout
-            end
-            if ENV.key?('DATABASE_REAPING_FREQUENCY')
-              config['reaping_frequency'] = ENV['DATABASE_REAPING_FREQUENCY']
-            end
-          end
-        end
-      end
-    end
-  end
-end