bleib 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e1f9c38f0f6a8e80404b67b52fc01cc7d43c6d57d5baf6c383b0320e0c4c3d3
-  data.tar.gz: 3eafe905d3cd65ba687e45e6bdaa2b342be55941a398cdcedd9654ba2fcc38a2
+  metadata.gz: 5eadef287256311c458eb843251ee4198b0ced4054b8c7e1f2dfc111d0f8b17b
+  data.tar.gz: 1296fda907d66a50ef540c1ddba9a025b391868ce8c08dd65f76ea75030afda5
 SHA512:
-  metadata.gz: 2ff7f0d01d721a956b04872eeaabd2194f816ac8e97617388212818357b6398d1f727321b4c47b79ea0e1f7fe5f5f5c81752a3197264158b9dfd462be52788bf
-  data.tar.gz: 3e40efa8504edc316b56a99d9cacdeb629d0a5e4c42fbd0d08ae656452072bf079791d1c3eb7faae228ba532115990e3d2052fbc50e50cdc6778e8a9253b9836
+  metadata.gz: fd6af65972ed0ea6579bc53983fc1663905876f01d4b5c5ae4a6021abd91912b305a306375c15b7c275c548955472327f89cfc4925d3642036608d486d2dd54a
+  data.tar.gz: c5a157210fdb232ce1ce026f1644e20f58ddcba2857a2823bc83090ec1985dbe5921f3c57c613afa94d8b22536b6dfd6909e9237a93bac02185f7c166e615a13

data/lib/bleib/configuration.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require 'active_record/database_configurations'
+
 module Bleib
   class Configuration
     class UnsupportedAdapterException < Exception; end
@@ -11,6 +15,8 @@ module Bleib
 
     SUPPORTED_ADAPTERS = %w(postgresql postgis mysql2)
 
+    POOL_KEYS = %w(pool max_connections min_connections).freeze
+
     def self.from_environment
       check_database_interval = interval_or_default(
         ENV['BLEIB_CHECK_DATABASE_INTERVAL'],
@@ -39,9 +45,9 @@ module Bleib
                    check_migrations_interval: DEFAULT_CHECK_MIGRATIONS_INTERVAL)
       # To be 100% sure which connection the
       # active record pool creates, returns or removes.
-      only_one_connection = { 'pool' => 1 }
-
-      @database = database_configuration.merge(only_one_connection)
+      @database = database_configuration
+                  .reject { |key, _| POOL_KEYS.include?(key.to_s) }
+                  .merge(single_connection_key => 1)
 
       @check_database_interval = check_database_interval
       @check_migrations_interval = check_migrations_interval
@@ -63,6 +69,14 @@ module Bleib
 
     private
 
+    def single_connection_key
+      # Rails >= 8.1 renamed `pool` to `max_connections` and aborts when both are set.
+      hash_config = ActiveRecord::DatabaseConfigurations::HashConfig
+      return 'max_connections' if hash_config.method_defined?(:min_connections)
+
+      'pool'
+    end
+
     def self.interval_or_default(string, default)
       given = string.to_i
       given <= 0 ? default : given

data/lib/bleib/migrations.rb

@@ -67,8 +67,11 @@ module Bleib
 
     def check_wagon_migrations!
       paths = Wagons.all.flat_map(&:migrations_paths)
-      context = ActiveRecord::MigrationContext.new(paths, ActiveRecord::SchemaMigration)
-
+      context = if Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new('7.1.0')
+                  ActiveRecord::MigrationContext.new(paths, ActiveRecord::SchemaMigration)
+                else
+                  ActiveRecord::MigrationContext.new(paths)
+                end
       # we do not need the correct output, just the right exception
       # in this case, the output only considers the main-app migration, not the ones in wagons
       raise ActiveRecord::PendingMigrationError if context.needs_migration?

data/lib/bleib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bleib
-  VERSION = '0.0.15'
+  VERSION = '0.0.17'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bleib
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Puzzle ITC
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-19 00:00:00.000000000 Z
+date: 2026-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,7 +42,6 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/puzzle/bleib
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -58,8 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Use a rake task to wait on database and migrations.
 test_files: []