activerecord 8.1.1 → 8.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7b18af13d6104f184766545f02331ab69f8adf68e94d279c1c5322e6dcae354
-  data.tar.gz: a68c959652dc4a661c9d86d26dcacfca0fb1c723d23f09ba5c67c744911a05b6
+  metadata.gz: 74f90753b3b77d22a985336d06901c0876965ae29376b3a6f0aa0ab2cff9a0e0
+  data.tar.gz: 8fd109977d7e47cd685e2b236b7bb4acd891e74e1a878e55b51cbabd436dda45
 SHA512:
-  metadata.gz: c86cf51a07c0a5da92cf811eba3743aa7bba1727bc2509348468614323d0ab6ff3200d5718e0b132f93b765c2961d050e068dd5d6e972a55510212cf7087ccd1
-  data.tar.gz: e7ee18efff038f1011d88c4ab137512618c73c2bc9e33132c101439fa921f05051f3dbe91ece48a7aa5e1daae081ec9af7af3536d57f4d862ccd5130de86d479
+  metadata.gz: 35a0e941325f4dea1f08370e583190628484f2e364285af6fd68179094cfab455e08e0bd3e34f94f102778a19377fcdc368a86c365b8e1cf7c0cbd1e303241d9
+  data.tar.gz: '0493ea886af6d96eaeadc88fa06d682597a3019b71fe9d3f13549761959c2f8e5a78921d4ef0ace1daf2b3005e14f95fd99dbd821ed67bac43aa634a99cb7540'

data/CHANGELOG.md

@@ -1,3 +1,73 @@
+## Rails 8.1.2 (January 08, 2026) ##
+
+*   Fix counting cached queries in `ActiveRecord::RuntimeRegistry`.
+
+    *fatkodima*
+
+*   Fix merging relations with arel equality predicates with null relations.
+
+    *fatkodima*
+
+*   Fix SQLite3 schema dump for non-autoincrement integer primary keys.
+
+    Previously, `schema.rb` should incorrectly restore that table with an auto incrementing
+    primary key.
+
+    *Chris Hasiński*
+
+*   Fix PostgreSQL `schema_search_path` not being reapplied after `reset!` or `reconnect!`.
+
+    The `schema_search_path` configured in `database.yml` is now correctly
+    reapplied instead of falling back to PostgreSQL defaults.
+
+    *Tobias Egli*
+
+*   Restore the ability of enum to be foats.
+
+    ```ruby
+    enum :rating, { low: 0.0, medium: 0.5, high: 1.0 },
+    ```
+
+    In Rails 8.1.0, enum values are eagerly validated, and floats weren't expected.
+
+    *Said Kaldybaev*
+
+*   Ensure batched preloaded associations accounts for klass when grouping to avoid issues with STI.
+
+    *zzak*, *Stjepan Hadjic*
+
+*   Fix `ActiveRecord::SoleRecordExceeded#record` to return the relation.
+
+    This was the case until Rails 7.2, but starting from 8.0 it
+    started mistakenly returning the model class.
+
+    *Jean Boussier*
+
+*   Improve PostgreSQLAdapter resilience to Timeout.timeout.
+
+    Better handle asynchronous exceptions being thrown inside
+    the `reconnect!` method.
+
+    This may fixes some deep errors such as:
+
+    ```
+    undefined method `key?' for nil:NilClass (NoMethodError)
+              if !type_map.key?(oid)
+    ```
+
+    *Jean Boussier*
+
+*   Fix structured events for Active Record was not being emitted.
+
+    *Yuji Yaginuma*
+
+*   Fix `eager_load` when loading `has_many` assocations with composite primary keys.
+
+    This would result in some records being loaded multiple times.
+
+    *Martin-Alexander*
+
+
 ## Rails 8.1.1 (October 28, 2025) ##
 
 *   No changes.

data/lib/active_record/associations/join_dependency.rb

@@ -103,7 +103,7 @@ module ActiveRecord
       end
 
       def instantiate(result_set, strict_loading_value, &block)
-        primary_key = aliases.column_alias(join_root, join_root.primary_key)
+        primary_key = Array(join_root.primary_key).map { |column| aliases.column_alias(join_root, column) }
 
         seen = Hash.new { |i, parent|
           i[parent] = Hash.new { |j, child_class|
@@ -141,7 +141,7 @@ module ActiveRecord
 
         message_bus.instrument("instantiation.active_record", payload) do
           result_set.each { |row_hash|
-            parent_key = primary_key ? row_hash[primary_key] : row_hash
+            parent_key = primary_key.empty? ? row_hash : row_hash.values_at(*primary_key)
             parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases, column_types, &block)
             construct(parent, join_root, row_hash, seen, model_cache, strict_loading_value)
           }

data/lib/active_record/associations/preloader/batch.rb

@@ -38,7 +38,13 @@ module ActiveRecord
           attr_reader :loaders
 
           def group_and_load_similar(loaders)
-            loaders.grep_v(ThroughAssociation).group_by(&:loader_query).each_pair do |query, similar_loaders|
+            non_through = loaders.grep_v(ThroughAssociation)
+
+            grouped = non_through.group_by do |loader|
+              [loader.loader_query, loader.klass]
+            end
+
+            grouped.each do |(query, _klass), similar_loaders|
               query.load_records_in_batch(similar_loaders)
             end
           end

data/lib/active_record/associations.rb

@@ -1030,9 +1030,9 @@ module ActiveRecord
       # associated records themselves, you can always do something along the lines of
       # <tt>person.tasks.each(&:destroy)</tt>.
       #
-      # == Deprecated Associations
+      # == Deprecated \Associations
       #
-      # Associations can be marked as deprecated by passing <tt>deprecated: true</tt>:
+      # \Associations can be marked as deprecated by passing <tt>deprecated: true</tt>:
       #
       #     has_many :posts, deprecated: true
       #

data/lib/active_record/base.rb

@@ -6,6 +6,7 @@ require "active_support/descendants_tracker"
 require "active_support/time"
 require "active_support/core_ext/class/subclasses"
 require "active_record/log_subscriber"
+require "active_record/structured_event_subscriber"
 require "active_record/relation/delegation"
 require "active_record/attributes"
 require "active_record/type_caster"

data/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -713,37 +713,36 @@ module ActiveRecord
         deadline = retry_deadline && Process.clock_gettime(Process::CLOCK_MONOTONIC) + retry_deadline
 
         @lock.synchronize do
-          @allow_preconnect = false
+          attempt_configure_connection do
+            @allow_preconnect = false
 
-          reconnect
+            reconnect
 
-          enable_lazy_transactions!
-          @raw_connection_dirty = false
-          @last_activity = @connected_since = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          @verified = true
-          @allow_preconnect = true
-
-          reset_transaction(restore: restore_transactions) do
-            clear_cache!(new_connection: true)
-            attempt_configure_connection
-          end
-        rescue => original_exception
-          translated_exception = translate_exception_class(original_exception, nil, nil)
-          retry_deadline_exceeded = deadline && deadline < Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            enable_lazy_transactions!
+            @raw_connection_dirty = false
+            @last_activity = @connected_since = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            @verified = true
+            @allow_preconnect = true
+
+            reset_transaction(restore: restore_transactions) do
+              clear_cache!(new_connection: true)
+              configure_connection
+            end
+          rescue => original_exception
+            translated_exception = translate_exception_class(original_exception, nil, nil)
+            retry_deadline_exceeded = deadline && deadline < Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
-          if !retry_deadline_exceeded && retries_available > 0
-            retries_available -= 1
+            if !retry_deadline_exceeded && retries_available > 0
+              retries_available -= 1
 
-            if retryable_connection_error?(translated_exception)
-              backoff(connection_retries - retries_available)
-              retry
+              if retryable_connection_error?(translated_exception)
+                backoff(connection_retries - retries_available)
+                retry
+              end
             end
-          end
-
-          @last_activity = nil
-          @verified = false
 
-          raise translated_exception
+            raise translated_exception
+          end
         end
       end
 
@@ -755,6 +754,8 @@ module ActiveRecord
           reset_transaction
           @raw_connection_dirty = false
           @connected_since = nil
+          @last_activity = nil
+          @verified = false
         end
       end
 
@@ -777,9 +778,11 @@ module ActiveRecord
       # should call super immediately after resetting the connection (and while
       # still holding @lock).
       def reset!
-        clear_cache!(new_connection: true)
-        reset_transaction
-        attempt_configure_connection
+        attempt_configure_connection do
+          clear_cache!(new_connection: true)
+          reset_transaction
+          configure_connection
+        end
       end
 
       # Removes the connection from the pool and disconnect it.
@@ -813,12 +816,14 @@ module ActiveRecord
         unless active?
           @lock.synchronize do
             if @unconfigured_connection
-              @raw_connection = @unconfigured_connection
-              @unconfigured_connection = nil
-              attempt_configure_connection
-              @last_activity = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-              @verified = true
-              @allow_preconnect = true
+              attempt_configure_connection do
+                @raw_connection = @unconfigured_connection
+                @unconfigured_connection = nil
+                configure_connection
+                @last_activity = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+                @verified = true
+                @allow_preconnect = true
+              end
               return
             end
 
@@ -1282,7 +1287,7 @@ module ActiveRecord
         end
 
         def attempt_configure_connection
-          configure_connection
+          yield
         rescue Exception # Need to handle things such as Timeout::ExitException
           disconnect!
           raise

data/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -395,6 +395,11 @@ module ActiveRecord
         end
       end
 
+      def clear_cache!(new_connection: false)
+        super
+        @schema_search_path = nil if new_connection
+      end
+
       # Disconnects from the database if already connected. Otherwise, this
       # method does nothing.
       def disconnect!
@@ -1009,6 +1014,8 @@ module ActiveRecord
           add_pg_encoders
           add_pg_decoders
 
+          schema_search_path # populate cache
+
           reload_type_map
         end
 

data/lib/active_record/connection_adapters/sqlite3/schema_dumper.rb

@@ -19,11 +19,23 @@ module ActiveRecord
           end
 
           def default_primary_key?(column)
-            schema_type(column) == :integer
+            schema_type(column) == :integer && primary_key_has_autoincrement?
           end
 
           def explicit_primary_key_default?(column)
-            column.bigint?
+            column.bigint? || (column.type == :integer && !primary_key_has_autoincrement?)
+          end
+
+          def primary_key_has_autoincrement?
+            return false unless table_name
+
+            table_sql = @connection.query_value(<<~SQL, "SCHEMA")
+              SELECT sql FROM sqlite_master WHERE name = #{@connection.quote(table_name)} AND type = 'table'
+              UNION ALL
+              SELECT sql FROM sqlite_temp_master WHERE name = #{@connection.quote(table_name)} AND type = 'table'
+            SQL
+
+            table_sql.to_s.match?(/\bAUTOINCREMENT\b/i)
           end
 
           def prepare_column_options(column)

data/lib/active_record/enum.rb

@@ -349,10 +349,10 @@ module ActiveRecord
 
           values.each_value do |value|
             case value
-            when String, Integer, true, false, nil
+            when String, Integer, Float, true, false, nil
               # noop
             else
-              raise ArgumentError, "Enum values #{values} must be only booleans, integers, symbols or strings, got: #{value.class}"
+              raise ArgumentError, "Enum values #{values} must be only booleans, integers, floats, symbols or strings, got: #{value.class}"
             end
           end
 

data/lib/active_record/gem_version.rb

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

data/lib/active_record/relation/finder_methods.rb

@@ -148,7 +148,7 @@ module ActiveRecord
       elsif undesired.nil?
         found
       else
-        raise ActiveRecord::SoleRecordExceeded.new(model)
+        raise ActiveRecord::SoleRecordExceeded.new(self)
       end
     end
 

data/lib/active_record/relation/where_clause.rb

@@ -182,7 +182,7 @@ module ActiveRecord
           non_attrs = columns.extract! { |node| node.is_a?(Arel::Predications) }
 
           predicates.reject do |node|
-            if !non_attrs.empty? && node.equality? && node.left.is_a?(Arel::Predications)
+            if !non_attrs.empty? && equality_node?(node) && node.left.is_a?(Arel::Predications)
               non_attrs.include?(node.left)
             end || Arel.fetch_attribute(node) do |attr|
               attrs.include?(attr) || columns.include?(attr.name.to_s)

data/lib/active_record/relation.rb

@@ -1022,7 +1022,7 @@ module ActiveRecord
     #
     #   Post.where(person_id: 5).where(category: ['Something', 'Else']).delete_all
     #
-    # Both calls delete the affected posts all at once with a single DELETE statement.
+    # This call deletes the affected posts all at once with a single DELETE statement.
     # If you need to destroy dependent associations or call your <tt>before_*</tt> or
     # +after_destroy+ callbacks, use the #destroy_all method instead.
     #

data/lib/active_record/runtime_registry.rb

@@ -33,6 +33,7 @@ module ActiveRecord
       record(
         payload[:name],
         (finish - start) * 1_000.0,
+        cached: payload[:cached],
         async: payload[:async],
         lock_wait: payload[:lock_wait],
       )

data/lib/active_record/schema_dumper.rb

@@ -232,8 +232,8 @@ module ActiveRecord
       def indexes(table, stream)
         if (indexes = @connection.indexes(table)).any?
           add_index_statements = indexes.map do |index|
-            table_name = remove_prefix_and_suffix(index.table).inspect
-            "  add_index #{([relation_name(table_name)] + index_parts(index)).join(', ')}"
+            table_name = remove_prefix_and_suffix(index.table)
+            "  add_index #{([relation_name(table_name).inspect] + index_parts(index)).join(', ')}"
           end
 
           stream.puts add_index_statements.sort.join("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.1.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.1
+        version: 8.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.1
+        version: 8.1.2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.1
+        version: 8.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.1
+        version: 8.1.2
 - !ruby/object:Gem::Dependency
   name: timeout
   requirement: !ruby/object:Gem::Requirement
@@ -478,10 +478,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v8.1.1/activerecord/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v8.1.1/
+  changelog_uri: https://github.com/rails/rails/blob/v8.1.2/activerecord/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v8.1.2/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v8.1.1/activerecord
+  source_code_uri: https://github.com/rails/rails/tree/v8.1.2/activerecord
   rubygems_mfa_required: 'true'
 rdoc_options:
 - "--main"
@@ -499,7 +499,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).
 test_files: []