@@ -19,7 +19,8 @@ def test_sqlite3
1919 when Gem ::Requirement . new ( "~> 2.5.0" ) then "1.3.13"
2020 when Gem ::Requirement . new ( ">= 2.6" , "< 3.0" ) then "1.4.4"
2121 when Gem ::Requirement . new ( ">= 3.0" , "< 3.4" ) then "1.6.6"
22- when Gem ::Requirement . new ( ">= 3.4" , "< 4.1" ) then "1.7.3"
22+ when Gem ::Requirement . new ( ">= 3.4" , "< 4.0" ) then "1.7.3"
23+ when Gem ::Requirement . new ( ">= 4.0" , "< 4.1" ) then "2.8.1"
2324 end
2425
2526 with_gem_home do |env |
@@ -31,9 +32,10 @@ def test_sqlite3
3132 def test_mysql2
3233 ruby_version = Gem ::Version . new ( RUBY_VERSION )
3334 needs_bigdecimal = Gem ::Requirement . new ( ">= 3.4" ) . satisfied_by? ( ruby_version )
35+ bigdecimal_version = ruby_version >= Gem ::Version . new ( "4.0" ) ? "4.1.2" : "3.1.8"
3436
3537 with_gem_home do |env |
36- install_gem ( env , "bigdecimal" , "3.1.8" , false ) if needs_bigdecimal
38+ install_gem ( env , "bigdecimal" , bigdecimal_version , false ) if needs_bigdecimal
3739 install_gem ( env , "mysql2" , "0.5.7" , false )
3840 requirements = [ "-rmysql2" ]
3941 requirements . unshift ( "-rbigdecimal" ) if needs_bigdecimal
@@ -47,10 +49,11 @@ def test_pg
4749 needs_bigdecimal =
4850 Gem ::Requirement . new ( "< 1.2.0" ) . satisfied_by? ( Gem ::Version . new ( pg_version ) ) &&
4951 Gem ::Requirement . new ( ">= 3.4" ) . satisfied_by? ( ruby_version )
52+ bigdecimal_version = ruby_version >= Gem ::Version . new ( "4.0" ) ? "4.1.2" : "3.1.8"
5053
5154 with_gem_home do |env |
5255 # pg < 1.2.0 loads but does not declare bigdecimal.
53- install_gem ( env , "bigdecimal" , "3.1.8" , false ) if needs_bigdecimal
56+ install_gem ( env , "bigdecimal" , bigdecimal_version , false ) if needs_bigdecimal
5457 install_gem ( env , "pg" , pg_version , true )
5558 requirements = [ "-rpg" ]
5659 requirements . unshift ( "-rbigdecimal" ) if needs_bigdecimal
0 commit comments