activerecord 7.2.0.rc1 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e66951e81d8026bf99151e2232bd66141817a39c499a94f6fd00a7238514135e
-  data.tar.gz: 765f9e290a5a1b2a99062ac2d333bea4b5aa7a7817b19f3efb4f90745c00295b
+  metadata.gz: 4b72f5d48ed3098cb5d20e0f33ed2b082cccdb963338accb19f89c982a790ff1
+  data.tar.gz: 313c950f13b265ab63f2b5882f8fe9b20642e4f8702f1862f55abd030862a450
 SHA512:
-  metadata.gz: 6484ebe413014457c436ecf1cd7162acfd0d5915d4a976bbedc690be225f4061861b49898012d1d4fb372d4c07fd7aca655043958aa553e5add8ef6d84bf2994
-  data.tar.gz: f795c8dfe5aaea82a264d718d6e8bd3fa9ffd4f93353c766651026eeda903293b80b345ef95f18ce18ac61ba0517f69b9234ff24692cee2b0ce71affdc8a9202
+  metadata.gz: 99f658cc51d0fc5d92b0869e6479f7569a6ffb74c075c514abefa2af4e248a9a3bfda7e01a4270c09c2aca91b99b01337939b1b40bc727a8c556d3aa47e90e99
+  data.tar.gz: 95a70341ef2dde997393b143c2beb7d25c74494f76159a888c591978c229e6c9de567183fbc4824290bd466bca3ea50e6f323c00596971af10eb53f21c3eb906

data/CHANGELOG.md

@@ -1,4 +1,46 @@
-## Rails 7.2.0.rc1 (August 06, 2024) ##
+## Rails 7.2.1 (August 22, 2024) ##
+
+*   Fix detection for `enum` columns with parallelized tests and PostgreSQL.
+
+    *Rafael Mendonça França*
+
+*   Allow to eager load nested nil associations.
+
+    *fatkodima*
+
+*   Fix swallowing ignore order warning when batching using `BatchEnumerator`.
+
+    *fatkodima*
+
+*   Fix memory bloat on the connection pool when using the Fiber `IsolatedExecutionState`.
+
+    *Jean Boussier*
+
+*   Restore inferred association class with the same modularized name.
+
+    *Justin Ko*
+
+*   Fix `ActiveRecord::Base.inspect` to properly explain how to load schema information.
+
+    *Jean Boussier*
+
+*   Check invalid `enum` options for the new syntax.
+
+    The options using `_` prefix in the old syntax are invalid in the new syntax.
+
+    *Rafael Mendonça França*
+
+*   Fix `ActiveRecord::Encryption::EncryptedAttributeType#type` to return
+    actual cast type.
+
+    *Vasiliy Ermolovich*
+
+*   Fix `create_table` with `:auto_increment` option for MySQL adapter.
+
+    *fatkodima*
+
+
+## Rails 7.2.0 (August 09, 2024) ##
 
 *   Handle commas in Sqlite3 default function definitions.
 
@@ -15,8 +57,6 @@
 
     *Xavier Noria*
 
-## Rails 7.2.0.beta3 (July 11, 2024) ##
-
 *   Add condensed `#inspect` for `ConnectionPool`, `AbstractAdapter`, and
     `DatabaseConfig`.
 
@@ -40,9 +80,6 @@
 
     *Jay Ang*
 
-
-## Rails 7.2.0.beta2 (June 04, 2024) ##
-
 *   The payload of `sql.active_record` Active Support notifications now has the current transaction in the `:transaction` key.
 
     *Xavier Noria*
@@ -55,9 +92,6 @@
 
     *Xavier Noria*
 
-
-## Rails 7.2.0.beta1 (May 29, 2024) ##
-
 *   Fix inference of association model on nested models with the same demodularized name.
 
     E.g. with the following setup:

data/lib/active_record/associations/join_dependency.rb

@@ -61,7 +61,7 @@ module ActiveRecord
         when Hash
           associations.each do |k, v|
             cache = hash[k] ||= {}
-            walk_tree v, cache
+            walk_tree v, cache if v
           end
         else
           raise ConfigurationError, associations.inspect

data/lib/active_record/attributes.rb

@@ -25,15 +25,17 @@ module ActiveRecord
       # column which this will persist to.
       #
       # +cast_type+ A symbol such as +:string+ or +:integer+, or a type object
-      # to be used for this attribute. See the examples below for more
-      # information about providing custom type objects.
+      # to be used for this attribute. If this parameter is not passed, the previously
+      # defined type (if any) will be used.
+      # Otherwise, the type will be ActiveModel::Type::Value.
+      # See the examples below for more information about providing custom type objects.
       #
       # ==== Options
       #
       # The following options are accepted:
       #
       # +default+ The default value to use when no value is provided. If this option
-      # is not passed, the previous default value (if any) will be used.
+      # is not passed, the previously defined default value (if any) on the superclass or in the schema will be used.
       # Otherwise, the default will be +nil+.
       #
       # +array+ (PostgreSQL only) specifies that the type should be an array (see the

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

@@ -118,6 +118,27 @@ module ActiveRecord
     # * private methods that require being called in a +synchronize+ blocks
     #   are now explicitly documented
     class ConnectionPool
+      class WeakThreadKeyMap # :nodoc:
+        # FIXME: On 3.3 we could use ObjectSpace::WeakKeyMap
+        # but it currently cause GC crashes: https://github.com/byroot/rails/pull/3
+        def initialize
+          @map = {}
+        end
+
+        def clear
+          @map.clear
+        end
+
+        def [](key)
+          @map[key]
+        end
+
+        def []=(key, value)
+          @map.select! { |c, _| c.alive? }
+          @map[key] = value
+        end
+      end
+
       class Lease # :nodoc:
         attr_accessor :connection, :sticky
 
@@ -145,48 +166,9 @@ module ActiveRecord
       end
 
       class LeaseRegistry # :nodoc:
-        if ObjectSpace.const_defined?(:WeakKeyMap) # RUBY_VERSION >= 3.3
-          WeakKeyMap = ::ObjectSpace::WeakKeyMap # :nodoc:
-        else
-          class WeakKeyMap # :nodoc:
-            def initialize
-              @map = ObjectSpace::WeakMap.new
-              @values = nil
-              @size = 0
-            end
-
-            alias_method :clear, :initialize
-
-            def [](key)
-              prune if @map.size != @size
-              @map[key]
-            end
-
-            def []=(key, value)
-              @map[key] = value
-              prune if @map.size != @size
-              value
-            end
-
-            def delete(key)
-              if value = self[key]
-                self[key] = nil
-                prune
-              end
-              value
-            end
-
-            private
-              def prune(force = false)
-                @values = @map.values
-                @size = @map.size
-              end
-          end
-        end
-
         def initialize
           @mutex = Mutex.new
-          @map = WeakKeyMap.new
+          @map = WeakThreadKeyMap.new
         end
 
         def [](context)
@@ -197,7 +179,7 @@ module ActiveRecord
 
         def clear
           @mutex.synchronize do
-            @map = WeakKeyMap.new
+            @map.clear
           end
         end
       end
@@ -630,8 +612,6 @@ module ActiveRecord
             remove conn
           end
         end
-
-        prune_thread_cache
       end
 
       # Disconnect all connections that have been idle for at least

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "concurrent/map"
+require "concurrent/atomic/atomic_fixnum"
 
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
@@ -35,7 +36,9 @@ module ActiveRecord
         alias_method :enabled?, :enabled
         alias_method :dirties?, :dirties
 
-        def initialize(max_size)
+        def initialize(version, max_size)
+          @version = version
+          @current_version = version.value
           @map = {}
           @max_size = max_size
           @enabled = false
@@ -43,14 +46,17 @@ module ActiveRecord
         end
 
         def size
+          check_version
           @map.size
         end
 
         def empty?
+          check_version
           @map.empty?
         end
 
         def [](key)
+          check_version
           return unless @enabled
 
           if entry = @map.delete(key)
@@ -59,6 +65,8 @@ module ActiveRecord
         end
 
         def compute_if_absent(key)
+          check_version
+
           return yield unless @enabled
 
           if entry = @map.delete(key)
@@ -76,12 +84,40 @@ module ActiveRecord
           @map.clear
           self
         end
+
+        private
+          def check_version
+            if @current_version != @version.value
+              @map.clear
+              @current_version = @version.value
+            end
+          end
+      end
+
+      class QueryCacheRegistry # :nodoc:
+        def initialize
+          @mutex = Mutex.new
+          @map = ConnectionPool::WeakThreadKeyMap.new
+        end
+
+        def compute_if_absent(context)
+          @map[context] || @mutex.synchronize do
+            @map[context] ||= yield
+          end
+        end
+
+        def clear
+          @map.synchronize do
+            @map.clear
+          end
+        end
       end
 
       module ConnectionPoolConfiguration # :nodoc:
         def initialize(...)
           super
-          @thread_query_caches = Concurrent::Map.new(initial_capacity: @size)
+          @query_cache_version = Concurrent::AtomicFixnum.new
+          @thread_query_caches = QueryCacheRegistry.new
           @query_cache_max_size = \
             case query_cache = db_config&.query_cache
             when 0, false
@@ -141,25 +177,16 @@ module ActiveRecord
             # With transactional fixtures, and especially systems test
             # another thread may use the same connection, but with a different
             # query cache. So we must clear them all.
-            @thread_query_caches.each_value(&:clear)
-          else
-            query_cache.clear
+            @query_cache_version.increment
           end
+          query_cache.clear
         end
 
         def query_cache
           @thread_query_caches.compute_if_absent(ActiveSupport::IsolatedExecutionState.context) do
-            Store.new(@query_cache_max_size)
+            Store.new(@query_cache_version, @query_cache_max_size)
           end
         end
-
-        private
-          def prune_thread_cache
-            dead_threads = @thread_query_caches.keys.reject(&:alive?)
-            dead_threads.each do |dead_thread|
-              @thread_query_caches.delete(dead_thread)
-            end
-          end
       end
 
       attr_accessor :query_cache

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

@@ -161,7 +161,7 @@ module ActiveRecord
           end
 
           def valid_primary_key_options
-            super + [:unsigned]
+            super + [:unsigned, :auto_increment]
           end
 
           def create_table_definition(name, **options)

data/lib/active_record/core.rb

@@ -353,8 +353,8 @@ module ActiveRecord
           super
         elsif abstract_class?
           "#{super}(abstract)"
-        elsif !connected?
-          "#{super} (call '#{super}.lease_connection' to establish a connection)"
+        elsif !schema_loaded? && !connected?
+          "#{super} (call '#{super}.load_schema' to load schema informations)"
         elsif table_exists?
           attr_list = attribute_types.map { |name, type| "#{name}: #{type.type}" } * ", "
           "#{super}(#{attr_list})"

data/lib/active_record/encryption/encryptable_record.rb

@@ -123,7 +123,7 @@ module ActiveRecord
             end)
           end
 
-          def load_schema!
+          def load_schema! # :nodoc:
             super
 
             add_length_validation_for_encrypted_columns if ActiveRecord::Encryption.config.validate_column_size

data/lib/active_record/encryption/encrypted_attribute_type.rb

@@ -7,13 +7,13 @@ module ActiveRecord
     # This is the central piece that connects the encryption system with +encrypts+ declarations in the
     # model classes. Whenever you declare an attribute as encrypted, it configures an +EncryptedAttributeType+
     # for that attribute.
-    class EncryptedAttributeType < ::ActiveRecord::Type::Text
+    class EncryptedAttributeType < ::ActiveModel::Type::Value
       include ActiveModel::Type::Helpers::Mutable
 
       attr_reader :scheme, :cast_type
 
       delegate :key_provider, :downcase?, :deterministic?, :previous_schemes, :with_context, :fixed?, to: :scheme
-      delegate :accessor, to: :cast_type
+      delegate :accessor, :type, to: :cast_type
 
       # === Options
       #

data/lib/active_record/encryption/encryptor.rb

@@ -46,7 +46,7 @@ module ActiveRecord
         serialize_message build_encrypted_message(clear_text, key_provider: key_provider, cipher_options: cipher_options)
       end
 
-      # Decrypts a +clean_text+ and returns the result as clean text
+      # Decrypts an +encrypted_text+ and returns the result as clean text
       #
       # === Options
       #

data/lib/active_record/enum.rb

@@ -167,6 +167,15 @@ module ActiveRecord
       base.class_attribute(:defined_enums, instance_writer: false, default: {})
     end
 
+    def load_schema! # :nodoc:
+      defined_enums.each_key do |name|
+        unless columns_hash.key?(resolve_attribute_name(name))
+          raise "Unknown enum attribute '#{name}' for #{self.name}. Enums must be" \
+            " backed by a database column."
+        end
+      end
+    end
+
     class EnumType < Type::Value # :nodoc:
       delegate :type, to: :subtype
 
@@ -240,6 +249,7 @@ module ActiveRecord
 
       def _enum(name, values, prefix: nil, suffix: nil, scopes: true, instance_methods: true, validate: false, **options)
         assert_valid_enum_definition_values(values)
+        assert_valid_enum_options(options)
         # statuses = { }
         enum_values = ActiveSupport::HashWithIndifferentAccess.new
         name = name.to_s
@@ -254,13 +264,7 @@ module ActiveRecord
 
         attribute(name, **options)
 
-        decorate_attributes([name]) do |_name, subtype|
-          if subtype == ActiveModel::Type.default_value
-            raise "Undeclared attribute type for enum '#{name}' in #{self.name}. Enums must be" \
-              " backed by a database column or declared with an explicit type" \
-              " via `attribute`."
-          end
-
+        decorate_attributes([name]) do |name, subtype|
           subtype = subtype.subtype if EnumType === subtype
           EnumType.new(name, enum_values, subtype, raise_on_invalid_values: !validate)
         end
@@ -370,6 +374,13 @@ module ActiveRecord
         end
       end
 
+      def assert_valid_enum_options(options)
+        invalid_keys = options.keys & %i[_prefix _suffix _scopes _default _instance_methods]
+        unless invalid_keys.empty?
+          raise ArgumentError, "invalid option(s): #{invalid_keys.map(&:inspect).join(", ")}. Valid options are: :prefix, :suffix, :scopes, :default, :instance_methods, and :validate."
+        end
+      end
+
       ENUM_CONFLICT_MESSAGE = \
         "You tried to define an enum named \"%{enum}\" on the model \"%{klass}\", but " \
         "this will generate a %{type} method \"%{method}\", which is already defined " \

data/lib/active_record/gem_version.rb

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

data/lib/active_record/model_schema.rb

@@ -531,7 +531,9 @@ module ActiveRecord
         initialize_find_by_cache
       end
 
-      def load_schema # :nodoc:
+      # Load the model's schema information either from the schema cache
+      # or directly from the database.
+      def load_schema
         return if schema_loaded?
         @load_schema_monitor.synchronize do
           return if schema_loaded?
@@ -592,6 +594,8 @@ module ActiveRecord
           columns_hash = schema_cache.columns_hash(table_name)
           columns_hash = columns_hash.except(*ignored_columns) unless ignored_columns.empty?
           @columns_hash = columns_hash.freeze
+
+          super
         end
 
         # Guesses the table name, but does not decorate it with prefix and suffix information.

data/lib/active_record/reflection.rb

@@ -428,15 +428,19 @@ module ActiveRecord
       # a new association object. Use +build_association+ or +create_association+
       # instead. This allows plugins to hook into association object creation.
       def klass
-        @klass ||= compute_class(compute_name(class_name))
+        @klass ||= _klass(class_name)
       end
 
-      def compute_class(name)
-        name.constantize
+      def _klass(class_name) # :nodoc:
+        if active_record.name.demodulize == class_name
+          return compute_class("::#{class_name}") rescue NameError
+        end
+
+        compute_class(class_name)
       end
 
-      def compute_name(name) # :nodoc:
-        active_record.name.demodulize == name ? "::#{name}" : name
+      def compute_class(name)
+        name.constantize
       end
 
       # Returns +true+ if +self+ and +other_aggregation+ have the same +name+ attribute, +active_record+ attribute,
@@ -986,7 +990,7 @@ module ActiveRecord
       end
 
       def klass
-        @klass ||= delegate_reflection.compute_class(compute_name(class_name))
+        @klass ||= delegate_reflection._klass(class_name)
       end
 
       # Returns the source of the through reflection. It checks both a singularized

data/lib/active_record/relation/batches.rb

@@ -241,14 +241,14 @@ module ActiveRecord
         raise ArgumentError, ":order must be :asc or :desc or an array consisting of :asc or :desc, got #{order.inspect}"
       end
 
-      unless block
-        return BatchEnumerator.new(of: of, start: start, finish: finish, relation: self, order: order, use_ranges: use_ranges)
-      end
-
       if arel.orders.present?
         act_on_ignored_order(error_on_ignore)
       end
 
+      unless block
+        return BatchEnumerator.new(of: of, start: start, finish: finish, relation: self, order: order, use_ranges: use_ranges)
+      end
+
       batch_limit = of
 
       if limit_value

data/lib/active_record/scoping/named.rb

@@ -190,6 +190,7 @@ module ActiveRecord
 
         private
           def singleton_method_added(name)
+            super
             generate_relation_method(name) if Kernel.respond_to?(name) && !ActiveRecord::Relation.method_defined?(name)
           end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 7.2.0.rc1
+  version: 7.2.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.0.rc1
+        version: 7.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.0.rc1
+        version: 7.2.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.0.rc1
+        version: 7.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.0.rc1
+        version: 7.2.1
 - !ruby/object:Gem::Dependency
   name: timeout
   requirement: !ruby/object:Gem::Requirement
@@ -476,10 +476,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.2.0.rc1/activerecord/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.2.0.rc1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.2.1/activerecord/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.2.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.2.0.rc1/activerecord
+  source_code_uri: https://github.com/rails/rails/tree/v7.2.1/activerecord
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: