activerecord 8.0.4.1 → 8.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee30110e52cd3bd4f909cb352ee8596e3b5cb68d54c5b8cfa5c9c8869948cf31
-  data.tar.gz: dcd4445608c0ba275efc4d27b40ff1cfe2a5ec524e3e598bfe4320f536fa65c2
+  metadata.gz: a5e7c94135bd121cb5e7f78c4a331b85c6194f8395990d23dd0c61d1b0352580
+  data.tar.gz: dfb1e24a973b115712e0fae86eac1ec943ef65f708a5dc9da5c4b3854b6c7ad8
 SHA512:
-  metadata.gz: 5f4f952ddcb6a5b159febbbfbb8333c5be580ac894afd835471d40825eab2ed22f0ed5867e557a14de59aeaa14d76115d6612757466a4dabb9dd5c2a99abc136
-  data.tar.gz: e3a113697afb306486510c7abf53fedb3cff8a4e67b7d237a98a3fbd29a8425fa5c82bbb2d19a036915c1e242a80c5a51cc69aa9e27a43e0bf171d0e0b4c8a9f
+  metadata.gz: c4422f02e0babd91a13fffb9e4d2fd6d5ea6604a3b6d7d7235ed707ef7c9c4d269e19d769bcb07cf561ab2a89e19f86b25783b6f26829343595ed7f7e9cffac0
+  data.tar.gz: c4229cc98bf1e7f86be5bbfb5f6aad339c4c4dbadf645084c7ead5d197bb5237d7dcd19fd404456c983885b813161f5007869c4de9963f1e5c81f4431d9bcf24

data/CHANGELOG.md

@@ -1,3 +1,94 @@
+## Rails 8.0.5 (March 24, 2026) ##
+
+*   Fix `insert_all` and `upsert_all` log message when called on anonymous classes.
+
+    *Gabriel Sobrinho*
+
+*   Respect `ActiveRecord::SchemaDumper.ignore_tables` when dumping SQLite virtual tables.
+
+    *Hans Schnedlitz*
+
+*   Restore previous instrumenter after `execute_or_skip`
+
+    `FutureResult#execute_or_skip` replaces the thread's instrumenter with an
+    `EventBuffer` to collect events published during async query execution.
+    If the global async executor is saturated and the `caller_runs` fallback
+    executes the task on the calling thread, we need to make sure the previous
+    instrumenter is restored or the stale `EventBuffer` would stay in place and
+    permanently swallow all subsequent `sql.active_record` notifications on
+    that thread.
+
+    *Rosa Gutierrez*
+
+*   Fix Ruby 4.0 delegator warning when calling inspect on ActiveRecord::Type::Serialized.
+
+    *Hammad Khan*
+
+*   Fix support for table names containing hyphens.
+
+    *Evgeniy Demin*
+
+*   Fix column deduplication for SQLite3 and PostgreSQL virtual (generated) columns.
+
+    `Column#==` and `Column#hash` now account for `virtual?` so that the
+    `Deduplicable` registry does not treat a generated column and a regular
+    column with the same name and type as identical. Previously, if a
+    generated column was registered first, a regular column on a different
+    table could be deduplicated to the generated instance, silently
+    excluding it from INSERT/UPDATE statements.
+
+    *Jay Huber*
+
+*   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*
+
+*   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 `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.0.4.1 (March 23, 2026) ##
 
 *   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/connection_adapters/abstract/connection_pool.rb

@@ -120,7 +120,7 @@ module ActiveRecord
     class ConnectionPool
       # Prior to 3.3.5, WeakKeyMap had a use after free bug
       # https://bugs.ruby-lang.org/issues/20688
-      if ObjectSpace.const_defined?(:WeakKeyMap) && RUBY_VERSION >= "3.3.5"
+      if ObjectSpace.const_defined?(:WeakKeyMap) && Gem::Version.new(RUBY_VERSION) >= "3.3.5"
         WeakThreadKeyMap = ObjectSpace::WeakKeyMap
       else
         class WeakThreadKeyMap # :nodoc:
@@ -463,7 +463,7 @@ module ActiveRecord
               end
               conn.disconnect!
             end
-            @connections = []
+            @connections = @pinned_connection ? [@pinned_connection] : []
             @leases.clear
             @available.clear
           end

data/lib/active_record/connection_adapters/abstract/database_statements.rb

@@ -738,7 +738,7 @@ module ActiveRecord
         end
 
         def extract_table_ref_from_insert_sql(sql)
-          if sql =~ /into\s("[A-Za-z0-9_."\[\]\s]+"|[A-Za-z0-9_."\[\]]+)\s*/im
+          if sql =~ /into\s("[-A-Za-z0-9_."\[\]\s]+"|[A-Za-z0-9_."\[\]]+)\s*/im
             $1.delete('"').strip
           end
         end

data/lib/active_record/connection_adapters/abstract/schema_statements.rb

@@ -1560,11 +1560,11 @@ module ActiveRecord
         non_combinable_operations = []
 
         operations.each do |command, args|
-          table, arguments = args.shift, args
+          args.shift # remove table_name
           method = :"#{command}_for_alter"
 
           if respond_to?(method, true)
-            sqls, procs = Array(send(method, table, *arguments)).partition { |v| v.is_a?(String) }
+            sqls, procs = Array(send(method, table_name, *args)).partition { |v| v.is_a?(String) }
             sql_fragments.concat(sqls)
             non_combinable_operations.concat(procs)
           else
@@ -1572,7 +1572,7 @@ module ActiveRecord
             non_combinable_operations.each(&:call)
             sql_fragments = []
             non_combinable_operations = []
-            send(command, table, *arguments)
+            send(command, table_name, *args)
           end
         end
 

data/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -666,34 +666,33 @@ module ActiveRecord
         deadline = retry_deadline && Process.clock_gettime(Process::CLOCK_MONOTONIC) + retry_deadline
 
         @lock.synchronize do
-          reconnect
+          attempt_configure_connection do
+            reconnect
 
-          enable_lazy_transactions!
-          @raw_connection_dirty = false
-          @last_activity = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          @verified = true
+            enable_lazy_transactions!
+            @raw_connection_dirty = false
+            @last_activity = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            @verified = 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)
+            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
 
@@ -701,6 +700,8 @@ module ActiveRecord
       # method does nothing.
       def disconnect!
         @lock.synchronize do
+          @last_activity = nil
+          @verified = false
           clear_cache!(new_connection: true)
           reset_transaction
           @raw_connection_dirty = false
@@ -726,9 +727,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.
@@ -762,11 +765,13 @@ 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
+              attempt_configure_connection do
+                @raw_connection = @unconfigured_connection
+                @unconfigured_connection = nil
+                configure_connection
+                @last_activity = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+                @verified = true
+              end
               return
             end
 
@@ -1216,7 +1221,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/column.rb

@@ -65,7 +65,8 @@ module ActiveRecord
           other.is_a?(Column) &&
             super &&
             identity? == other.identity? &&
-            serial? == other.serial?
+            serial? == other.serial? &&
+            virtual? == other.virtual?
         end
         alias :eql? :==
 
@@ -73,7 +74,8 @@ module ActiveRecord
           Column.hash ^
             super.hash ^
             identity?.hash ^
-            serial?.hash
+            serial?.hash ^
+            virtual?.hash
         end
       end
     end

data/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -381,6 +381,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!
@@ -993,6 +998,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/column.rb

@@ -46,7 +46,9 @@ module ActiveRecord
         def ==(other)
           other.is_a?(Column) &&
             super &&
-            auto_increment? == other.auto_increment?
+            auto_increment? == other.auto_increment? &&
+            rowid == other.rowid &&
+            generated_type == other.generated_type
         end
         alias :eql? :==
 
@@ -54,8 +56,12 @@ module ActiveRecord
           Column.hash ^
             super.hash ^
             auto_increment?.hash ^
-            rowid.hash
+            rowid.hash ^
+            virtual?.hash
         end
+
+        protected
+          attr_reader :generated_type
       end
     end
   end

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

@@ -6,7 +6,7 @@ module ActiveRecord
       class SchemaDumper < ConnectionAdapters::SchemaDumper # :nodoc:
         private
           def virtual_tables(stream)
-            virtual_tables = @connection.virtual_tables
+            virtual_tables = @connection.virtual_tables.reject { |name, _| ignored?(name) }
             if virtual_tables.any?
               stream.puts
               stream.puts "  # Virtual tables defined in this database."
@@ -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/connection_adapters/sqlite3_adapter.rb

@@ -291,7 +291,7 @@ module ActiveRecord
         exec_query "DROP INDEX #{quote_column_name(index_name)}"
       end
 
-      VIRTUAL_TABLE_REGEX = /USING\s+(\w+)\s*\((.+)\)/i
+      VIRTUAL_TABLE_REGEX = /USING\s+(\w+)\s*\((.*)\)/i
 
       # Returns a list of defined virtual tables
       def virtual_tables

data/lib/active_record/future_result.rb

@@ -105,6 +105,7 @@ module ActiveRecord
 
         @pool.with_connection do |connection|
           return unless @mutex.try_lock
+          previous_instrumenter = ActiveSupport::IsolatedExecutionState[:active_record_instrumenter]
           begin
             if pending?
               @event_buffer = EventBuffer.new(self, @instrumenter)
@@ -113,6 +114,7 @@ module ActiveRecord
               execute_query(connection, async: true)
             end
           ensure
+            ActiveSupport::IsolatedExecutionState[:active_record_instrumenter] = previous_instrumenter
             @mutex.unlock
           end
         end

data/lib/active_record/gem_version.rb

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

data/lib/active_record/insert_all.rb

@@ -39,7 +39,7 @@ module ActiveRecord
       @returning = (connection.supports_insert_returning? ? primary_keys : false) if @returning.nil?
       @returning = false if @returning == []
 
-      @unique_by = find_unique_index_for(@unique_by)
+      @unique_by = find_unique_index_for(@unique_by) if @on_duplicate != :raise
 
       configure_on_duplicate_update_logic
       ensure_valid_options_for_connection!
@@ -48,7 +48,7 @@ module ActiveRecord
     def execute
       return ActiveRecord::Result.empty if inserts.empty?
 
-      message = +"#{model} "
+      message = +"#{model.name} "
       message << "Bulk " if inserts.many?
       message << (on_duplicate == :update ? "Upsert" : "Insert")
       connection.exec_insert_all to_sql, message

data/lib/active_record/migration/command_recorder.rb

@@ -139,7 +139,7 @@ module ActiveRecord
           recorder.reverting = @reverting
           yield recorder.delegate.update_table_definition(table_name, recorder)
           commands = recorder.commands
-          @commands << [:change_table, [table_name], -> t { bulk_change_table(table_name, commands) }]
+          @commands << [:change_table, [table_name], -> t { bulk_change_table(t.name, commands.reverse) }]
         else
           yield delegate.update_table_definition(table_name, self)
         end

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/predicate_builder/array_handler.rb

@@ -31,7 +31,9 @@ module ActiveRecord
           values_predicate
         else
           array_predicates = ranges.map! { |range| predicate_builder.build(attribute, range) }
-          array_predicates.inject(values_predicate, &:or)
+          values_predicate.or(
+            Arel::Nodes::Grouping.new Arel::Nodes::Or.new(array_predicates)
+          )
         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

@@ -1010,7 +1010,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/type/serialized.rb

@@ -58,6 +58,11 @@ module ActiveRecord
       end
 
       private
+        # Prevent Ruby 4.0 "delegator does not forward private method" warning.
+        # Kernel#inspect calls instance_variables_to_inspect which, without this,
+        # triggers Delegator#respond_to_missing? for a private method.
+        define_method(:instance_variables_to_inspect, Kernel.instance_method(:instance_variables))
+
         def default_value?(value)
           value == coder.load(nil)
         end

data/lib/arel/predications.rb

@@ -231,9 +231,7 @@ module Arel # :nodoc: all
     private
       def grouping_any(method_id, others, *extras)
         nodes = others.map { |expr| send(method_id, expr, *extras) }
-        Nodes::Grouping.new nodes.inject { |memo, node|
-          Nodes::Or.new([memo, node])
-        }
+        Nodes::Grouping.new Nodes::Or.new(nodes)
       end
 
       def grouping_all(method_id, others, *extras)

metadata

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