activerecord 7.1.5.2 → 7.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fa4b2f9126403d6fc22dad885f81b45f0e00f9158dfbb8c0e509d212745afa4
-  data.tar.gz: 70e8039696ed0d7b39086eff706ef31b180a7a182b823861c7ef12795fb06c67
+  metadata.gz: f3204f7f0cb9d1d71ab7642643724921e6c942f4f7c99beeae9ac49342f70ed7
+  data.tar.gz: 47c12eb7710323f64881e54ac05b70cbf6e365f7559c52579c295e6c35b2b547
 SHA512:
-  metadata.gz: c42494b0b6a24a72010025f85a9df63a992538bc99da20a72a5312402d3b722e2275d990a4cbcbad30c44002d466b95e662e0b9e7860d6e282cb837a64e096ba
-  data.tar.gz: b94f5d2573c1af08bd3a461a5ac0bab68e9b340f8e9e0885f682798018196ab8dd05ccea8c3ce0cf9d778910751e2e205d08d048e0b4f50f6c0c91eaa40e863b
+  metadata.gz: d2807f2124023b0b00d632ad9dc46c5eabd404e35fd7f75a46eb285f9875455c7444b9c059c437fef31bcc3d6694779e19cffa69ce5be81139af959ca86c8490
+  data.tar.gz: ea070b99aaacc7b369b8daed1256cae97f6d81f452698900c8fa25dc3f243af1900599b457b7461b2d544ff00b69e1b9b850bcf02e40b73e7581cf1abce8796f

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+## Rails 7.1.6 (October 28, 2025) ##
+
+*   Gracefully handle `Timeout.timeout` firing during connection configuration.
+
+    Use of `Timeout.timeout` could result in improperly initialized database connection.
+
+    This could lead to a partially configured connection being used, resulting in various exceptions,
+    the most common being with the PostgreSQLAdapter raising `undefined method `key?' for nil`
+    or `TypeError: wrong argument type nil (expected PG::TypeMap)`.
+
+    *Jean Boussier*
+
+*   Fix error handling during connection configuration.
+
+    Active Record wasn't properly handling errors during the connection configuration phase.
+    This could lead to a partially configured connection being used, resulting in various exceptions,
+    the most common being with the PostgreSQLAdapter raising `undefined method `key?' for nil`
+    or `TypeError: wrong argument type nil (expected PG::TypeMap)`.
+
+    *Jean Boussier*
+
+*   Fix prepared statements on mysql2 adapter.
+
+    *Jean Boussier*
+
+*   Fix a race condition in `ActiveRecord::Base#method_missing` when lazily defining attributes.
+
+    If multiple thread were concurrently triggering attribute definition on the same model,
+    it could result in a `NoMethodError` being raised.
+
+    *Jean Boussier*
+
+
 ## Rails 7.1.5.2 (August 13, 2025) ##
 
 *   Call inspect on ids in RecordNotFound error
@@ -6,6 +39,7 @@
 
     *Gannon McGibbon*, *John Hawthorn*
 
+
 ## Rails 7.1.5.1 (December 10, 2024) ##
 
 *   No changes.

data/lib/active_record/attribute_methods.rb

@@ -138,6 +138,7 @@ module ActiveRecord
           super(attribute_names)
           @attribute_methods_generated = true
         end
+
         true
       end
 
@@ -480,23 +481,27 @@ module ActiveRecord
       end
 
       def method_missing(name, ...)
-        unless self.class.attribute_methods_generated?
-          if self.class.method_defined?(name)
-            # The method is explicitly defined in the model, but calls a generated
-            # method with super. So we must resume the call chain at the right setp.
-            last_method = method(name)
-            last_method = last_method.super_method while last_method.super_method
-            self.class.define_attribute_methods
-            if last_method.super_method
-              return last_method.super_method.call(...)
-            end
-          elsif self.class.define_attribute_methods | self.class.generate_alias_attributes
-            # Some attribute methods weren't generated yet, we retry the call
-            return public_send(name, ...)
-          end
+        # We can't know whether some method was defined or not because
+        # multiple thread might be concurrently be in this code path.
+        # So the first one would define the methods and the others would
+        # appear to already have them.
+        self.class.define_attribute_methods
+
+        # So in all cases we must behave as if the method was just defined.
+        method = begin
+          self.class.public_instance_method(name)
+        rescue NameError
+          nil
         end
 
-        super
+        # The method might be explicitly defined in the model, but call a generated
+        # method with super. So we must resume the call chain at the right step.
+        method = method.super_method while method && !method.owner.is_a?(GeneratedAttributeMethods)
+        if method
+          method.bind_call(self, ...)
+        else
+          super
+        end
       end
 
       def attribute_method?(attr_name)

data/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -690,7 +690,7 @@ module ActiveRecord
 
           reset_transaction(restore: restore_transactions) do
             clear_cache!(new_connection: true)
-            configure_connection
+            attempt_configure_connection
           end
         rescue => original_exception
           translated_exception = translate_exception_class(original_exception, nil, nil)
@@ -742,7 +742,7 @@ module ActiveRecord
       def reset!
         clear_cache!(new_connection: true)
         reset_transaction
-        configure_connection
+        attempt_configure_connection
       end
 
       # Removes the connection from the pool and disconnect it.
@@ -778,7 +778,7 @@ module ActiveRecord
             if @unconfigured_connection
               @raw_connection = @unconfigured_connection
               @unconfigured_connection = nil
-              configure_connection
+              attempt_configure_connection
               @verified = true
               return
             end
@@ -1225,6 +1225,13 @@ module ActiveRecord
         def configure_connection
         end
 
+        def attempt_configure_connection
+          configure_connection
+        rescue Exception # Need to handle things such as Timeout::ExitException
+          disconnect!
+          raise
+        end
+
         def default_prepared_statements
           true
         end

data/lib/active_record/connection_adapters/mysql/quoting.rb

@@ -78,7 +78,13 @@ module ActiveRecord
             else
               value.getlocal
             end
-          when Date, Time
+          when Time
+            if default_timezone == :utc
+              value.utc? ? value : value.getutc
+            else
+              value.utc? ? value.getlocal : value
+            end
+          when Date
             value
           else
             super

data/lib/active_record/gem_version.rb

@@ -9,8 +9,8 @@ module ActiveRecord
   module VERSION
     MAJOR = 7
     MINOR = 1
-    TINY  = 5
-    PRE   = "2"
+    TINY  = 6
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 7.1.5.2
+  version: 7.1.6
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.5.2
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.5.2
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.5.2
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.5.2
+        version: 7.1.6
 - !ruby/object:Gem::Dependency
   name: timeout
   requirement: !ruby/object:Gem::Requirement
@@ -469,10 +469,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.1.5.2/activerecord/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.1.5.2/
+  changelog_uri: https://github.com/rails/rails/blob/v7.1.6/activerecord/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.1.6/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.1.5.2/activerecord
+  source_code_uri: https://github.com/rails/rails/tree/v7.1.6/activerecord
   rubygems_mfa_required: 'true'
 rdoc_options:
 - "--main"